From dc14418ace7d83172afc74753302a2610437dec8 Mon Sep 17 00:00:00 2001 From: satoqz Date: Tue, 25 Apr 2023 16:25:28 +0200 Subject: [PATCH 01/62] add "PK FK" constraint to sql_table --- d2graph/d2graph.go | 7 +++++-- d2target/sqltable.go | 2 ++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/d2graph/d2graph.go b/d2graph/d2graph.go index f80a35b21..98973e554 100644 --- a/d2graph/d2graph.go +++ b/d2graph/d2graph.go @@ -1024,8 +1024,11 @@ func (obj *Object) GetDefaultSize(mtexts []*d2target.MText, ruler *textmeasure.R } maxTypeWidth = go2.Max(maxTypeWidth, typeDims.Width) - if c.Constraint != "" { - // covers UNQ constraint with padding + if c.Constraint == "primary_key_foreign_key" { + // covers "PK FK" constraint with padding + constraintWidth = 80 + } else if c.Constraint != "" && constraintWidth == 0 { + // covers remaining constraints with "UNQ" being the largest constraintWidth = 60 } } diff --git a/d2target/sqltable.go b/d2target/sqltable.go index 6ffbddf05..a10821a99 100644 --- a/d2target/sqltable.go +++ b/d2target/sqltable.go @@ -46,6 +46,8 @@ func (c SQLColumn) ConstraintAbbr() string { return "PK" case "foreign_key": return "FK" + case "primary_key_foreign_key": + return "PK FK" case "unique": return "UNQ" default: From fd8eee721914a6c53bdf60214b60b1a4b82b825c Mon Sep 17 00:00:00 2001 From: satoqz Date: Mon, 1 May 2023 13:59:57 +0200 Subject: [PATCH 02/62] implement compiler changes --- d2compiler/compile.go | 44 +- d2compiler/compile_test.go | 18 +- d2graph/d2graph.go | 10 +- .../sketch.exp.svg | 160 ++--- .../d2sketch/testdata/opacity/sketch.exp.svg | 560 ++++++++--------- .../testdata/opacity_dark/sketch.exp.svg | 560 ++++++++--------- .../testdata/sql_tables/sketch.exp.svg | 154 ++--- .../testdata/sql_tables_dark/sketch.exp.svg | 154 ++--- .../testdata/opacity/dark_theme.exp.svg | 560 ++++++++--------- .../testdata/sql_tables/dark_theme.exp.svg | 152 ++--- d2target/sqltable.go | 38 +- .../TestCLI_E2E/internal_linked_pdf.exp.pdf | Bin 79993 -> 79993 bytes .../patterns/real-lines/dagre/board.exp.json | 20 +- .../patterns/real-lines/dagre/sketch.exp.svg | 166 ++--- .../dagre/board.exp.json | 2 +- .../dagre/sketch.exp.svg | 158 ++--- .../elk/board.exp.json | 2 +- .../elk/sketch.exp.svg | 158 ++--- .../sql_table_overflow/dagre/board.exp.json | 12 +- .../sql_table_overflow/dagre/sketch.exp.svg | 152 ++--- .../sql_table_overflow/elk/board.exp.json | 12 +- .../sql_table_overflow/elk/sketch.exp.svg | 152 ++--- .../dagre/board.exp.json | 10 +- .../dagre/sketch.exp.svg | 166 ++--- .../elk/board.exp.json | 10 +- .../elk/sketch.exp.svg | 166 ++--- .../stable/array-classes/dagre/board.exp.json | 8 + .../stable/array-classes/dagre/sketch.exp.svg | 152 ++--- .../stable/array-classes/elk/board.exp.json | 8 + .../stable/array-classes/elk/sketch.exp.svg | 152 ++--- .../dagre/board.exp.json | 14 +- .../dagre/sketch.exp.svg | 158 ++--- .../elk/board.exp.json | 14 +- .../elk/sketch.exp.svg | 158 ++--- .../stable/ent2d2_basic/dagre/board.exp.json | 50 +- .../stable/ent2d2_basic/dagre/sketch.exp.svg | 158 ++--- .../stable/ent2d2_basic/elk/board.exp.json | 50 +- .../stable/ent2d2_basic/elk/sketch.exp.svg | 158 ++--- .../stable/ent2d2_right/dagre/board.exp.json | 50 +- .../stable/ent2d2_right/dagre/sketch.exp.svg | 158 ++--- .../stable/ent2d2_right/elk/board.exp.json | 50 +- .../stable/ent2d2_right/elk/sketch.exp.svg | 158 ++--- .../dagre/board.exp.json | 4 +- .../dagre/sketch.exp.svg | 172 +++--- .../elk/board.exp.json | 4 +- .../elk/sketch.exp.svg | 172 +++--- .../dagre/board.exp.json | 8 +- .../dagre/sketch.exp.svg | 158 ++--- .../elk/board.exp.json | 8 +- .../elk/sketch.exp.svg | 158 ++--- .../dagre/board.exp.json | 4 +- .../dagre/sketch.exp.svg | 154 ++--- .../elk/board.exp.json | 4 +- .../elk/sketch.exp.svg | 154 ++--- .../stable/sql_tables/dagre/board.exp.json | 34 +- .../stable/sql_tables/dagre/sketch.exp.svg | 152 ++--- .../stable/sql_tables/elk/board.exp.json | 34 +- .../stable/sql_tables/elk/sketch.exp.svg | 152 ++--- .../unnamed_only_height/dagre/board.exp.json | 10 +- .../unnamed_only_height/dagre/sketch.exp.svg | 166 ++--- .../unnamed_only_height/elk/board.exp.json | 10 +- .../unnamed_only_height/elk/sketch.exp.svg | 166 ++--- .../unnamed_only_width/dagre/board.exp.json | 10 +- .../unnamed_only_width/dagre/sketch.exp.svg | 166 ++--- .../unnamed_only_width/elk/board.exp.json | 10 +- .../unnamed_only_width/elk/sketch.exp.svg | 166 ++--- .../dagre/board.exp.json | 10 +- .../dagre/sketch.exp.svg | 572 +++++++++--------- .../elk/board.exp.json | 10 +- .../elk/sketch.exp.svg | 572 +++++++++--------- .../themes/terminal/dagre/board.exp.json | 10 +- .../themes/terminal/dagre/sketch.exp.svg | 566 ++++++++--------- .../themes/terminal/elk/board.exp.json | 10 +- .../themes/terminal/elk/sketch.exp.svg | 566 ++++++++--------- .../dagre/board.exp.json | 10 +- .../dagre/sketch.exp.svg | 566 ++++++++--------- .../shape_set_width_height/elk/board.exp.json | 10 +- .../shape_set_width_height/elk/sketch.exp.svg | 566 ++++++++--------- .../TestCompile/array-classes.exp.json | 28 +- .../TestCompile/basic_icon.exp.json | 8 +- .../TestCompile/basic_sequence.exp.json | 8 +- .../TestCompile/basic_shape.exp.json | 8 +- .../TestCompile/basic_style.exp.json | 8 +- .../TestCompile/class-shape-class.exp.json | 8 +- .../TestCompile/class_paren.exp.json | 8 +- .../TestCompile/class_style.exp.json | 8 +- .../d2compiler/TestCompile/classes.exp.json | 20 +- .../TestCompile/constraint_label.exp.json | 10 +- .../TestCompile/default_direction.exp.json | 8 +- .../TestCompile/dimension_with_style.exp.json | 8 +- .../dimensions_on_containers.exp.json | 40 +- .../dimensions_on_nonimage.exp.json | 8 +- testdata/d2compiler/TestCompile/edge.exp.json | 16 +- .../edge_arrowhead_fields.exp.json | 24 +- .../edge_arrowhead_primary.exp.json | 20 +- .../TestCompile/edge_chain.exp.json | 24 +- .../TestCompile/edge_chain_map.exp.json | 24 +- .../TestCompile/edge_column_index.exp.json | 24 +- .../TestCompile/edge_exclusive_style.exp.json | 16 +- .../TestCompile/edge_flat_arrowhead.exp.json | 20 +- .../edge_flat_label_arrowhead.exp.json | 20 +- .../TestCompile/edge_index.exp.json | 16 +- .../TestCompile/edge_index_map.exp.json | 16 +- .../TestCompile/edge_index_nested.exp.json | 20 +- .../edge_index_nested_cross_scope.exp.json | 20 +- .../edge_key_group_flat_nested.exp.json | 20 +- ..._key_group_flat_nested_underscore.exp.json | 20 +- ..._group_map_flat_nested_underscore.exp.json | 20 +- ...e_key_group_map_nested_underscore.exp.json | 20 +- .../TestCompile/edge_label_map.exp.json | 16 +- .../d2compiler/TestCompile/edge_map.exp.json | 16 +- .../TestCompile/edge_map_arrowhead.exp.json | 20 +- .../TestCompile/edge_map_group_flat.exp.json | 16 +- .../edge_map_group_semiflat.exp.json | 16 +- .../TestCompile/edge_map_nested.exp.json | 16 +- .../TestCompile/edge_map_nested_flat.exp.json | 16 +- .../TestCompile/edge_mixed_arrowhead.exp.json | 24 +- .../edge_non_shape_arrowhead.exp.json | 20 +- .../edge_semiflat_arrowhead.exp.json | 20 +- .../TestCompile/escaped_id.exp.json | 8 +- .../TestCompile/fill-pattern.exp.json | 8 +- testdata/d2compiler/TestCompile/grid.exp.json | 8 +- .../TestCompile/image_style.exp.json | 8 +- .../link-board-key-nested.exp.json | 20 +- .../TestCompile/link-board-mixed.exp.json | 32 +- .../TestCompile/link-board-nested.exp.json | 20 +- .../TestCompile/link-board-ok.exp.json | 16 +- .../link-board-underscore.exp.json | 28 +- .../TestCompile/missing-class.exp.json | 8 +- .../TestCompile/near_constant.exp.json | 8 +- .../TestCompile/nested_sql.exp.json | 16 +- .../nil_scope_obj_regression.exp.json | 12 +- testdata/d2compiler/TestCompile/null.exp.json | 8 +- .../d2compiler/TestCompile/path_link.exp.json | 8 +- .../d2compiler/TestCompile/positions.exp.json | 8 +- .../TestCompile/reordered-classes.exp.json | 8 +- .../reserved_icon_near_style.exp.json | 12 +- .../TestCompile/root_direction.exp.json | 4 +- .../TestCompile/root_sequence.exp.json | 4 +- .../TestCompile/self-referencing.exp.json | 12 +- .../TestCompile/sequence-timestamp.exp.json | 28 +- .../TestCompile/sequence_container.exp.json | 40 +- .../TestCompile/sequence_container_2.exp.json | 40 +- .../sequence_grouped_note.exp.json | 20 +- .../TestCompile/sequence_scoping.exp.json | 44 +- .../TestCompile/set_direction.exp.json | 8 +- .../single_dimension_on_circle.exp.json | 8 +- .../TestCompile/sql-constraints.exp.json | 372 ++++++++++++ .../TestCompile/sql-regression.exp.json | 18 +- .../d2compiler/TestCompile/sql_paren.exp.json | 12 +- .../TestCompile/stroke-width.exp.json | 8 +- .../table_connection_attr.exp.json | 20 +- .../TestCompile/table_style.exp.json | 10 +- .../TestCompile/table_style_map.exp.json | 10 +- .../TestCompile/text-transform.exp.json | 16 +- .../underscore_connection.exp.json | 24 +- .../TestCompile/underscore_edge.exp.json | 16 +- .../underscore_edge_chain.exp.json | 24 +- .../underscore_edge_existing.exp.json | 24 +- .../underscore_edge_index.exp.json | 20 +- .../underscore_edge_nested.exp.json | 20 +- .../underscore_parent_create.exp.json | 12 +- .../underscore_parent_not_root.exp.json | 16 +- .../underscore_parent_preference_1.exp.json | 12 +- .../underscore_parent_preference_2.exp.json | 12 +- .../underscore_parent_squared.exp.json | 16 +- .../underscore_unresolved_obj.exp.json | 12 +- .../TestCompile/unescaped_id_cr.exp.json | 8 +- .../d2compiler/TestCompile/url_link.exp.json | 8 +- ..._and_not_url_tooltip_concurrently.exp.json | 8 +- .../TestCompile/url_tooltip.exp.json | 8 +- .../TestCompile/wrong_column_index.exp.json | 44 +- .../TestCompile2/boards/isFolderOnly.exp.json | 36 +- .../TestCompile2/boards/recursive.exp.json | 52 +- .../TestCompile2/boards/root.exp.json | 24 +- .../boards/scenarios_edge_index.exp.json | 32 +- testdata/d2oracle/TestCreate/base.exp.json | 8 +- .../d2oracle/TestCreate/container.exp.json | 12 +- .../TestCreate/container_edge.exp.json | 20 +- .../TestCreate/container_edge_label.exp.json | 20 +- testdata/d2oracle/TestCreate/edge.exp.json | 16 +- .../d2oracle/TestCreate/edge_nested.exp.json | 20 +- .../d2oracle/TestCreate/edge_scope.exp.json | 20 +- .../TestCreate/edge_scope_flat.exp.json | 20 +- .../TestCreate/edge_scope_nested.exp.json | 24 +- .../d2oracle/TestCreate/edge_unique.exp.json | 40 +- testdata/d2oracle/TestCreate/gen_key.exp.json | 12 +- .../d2oracle/TestCreate/gen_key_n.exp.json | 60 +- .../TestCreate/gen_key_nested.exp.json | 24 +- .../TestCreate/gen_key_scope.exp.json | 24 +- .../TestCreate/gen_key_suffix.exp.json | 12 +- .../TestCreate/make_scope_multiline.exp.json | 12 +- .../make_scope_multiline_spacing_1.exp.json | 20 +- .../make_scope_multiline_spacing_2.exp.json | 20 +- testdata/d2oracle/TestCreate/nested.exp.json | 16 +- testdata/d2oracle/TestCreate/scope.exp.json | 20 +- .../d2oracle/TestDelete/arrowhead.exp.json | 16 +- .../TestDelete/arrowhead_label.exp.json | 20 +- .../TestDelete/arrowhead_map.exp.json | 16 +- .../TestDelete/arrowhead_shape.exp.json | 16 +- .../TestDelete/breakup_arrowhead.exp.json | 8 +- testdata/d2oracle/TestDelete/chaos_1.exp.json | 24 +- .../d2oracle/TestDelete/children.exp.json | 20 +- .../TestDelete/children_conflicts.exp.json | 12 +- .../children_edge_conflicts.exp.json | 20 +- .../children_edges_flat_conflicts.exp.json | 32 +- .../children_flat_conflicts.exp.json | 12 +- .../children_multiple_conflicts.exp.json | 24 +- .../children_nested_conflicts.exp.json | 16 +- ...ldren_nested_referenced_conflicts.exp.json | 16 +- .../children_no_self_conflict.exp.json | 8 +- .../TestDelete/children_order.exp.json | 20 +- .../children_referenced_conflicts.exp.json | 12 +- .../TestDelete/children_scope.exp.json | 28 +- .../d2oracle/TestDelete/class_refs.exp.json | 4 +- .../TestDelete/conflicts_generated.exp.json | 20 +- .../conflicts_generated_continued.exp.json | 16 +- .../TestDelete/container_near.exp.json | 16 +- .../delete_container_of_near.exp.json | 84 +-- .../d2oracle/TestDelete/delete_icon.exp.json | 12 +- .../d2oracle/TestDelete/delete_link.exp.json | 8 +- .../d2oracle/TestDelete/delete_near.exp.json | 12 +- .../delete_needed_flat_near.exp.json | 12 +- .../delete_redundant_flat_near.exp.json | 12 +- .../TestDelete/delete_tooltip.exp.json | 8 +- .../d2oracle/TestDelete/drop_value.exp.json | 12 +- .../drop_value_with_primary.exp.json | 8 +- .../TestDelete/duplicate_generated.exp.json | 28 +- .../TestDelete/edge-only-style.exp.json | 16 +- .../edge_both_identical_childs.exp.json | 24 +- .../d2oracle/TestDelete/edge_common.exp.json | 16 +- .../TestDelete/edge_common_2.exp.json | 16 +- .../TestDelete/edge_common_3.exp.json | 16 +- .../TestDelete/edge_common_4.exp.json | 16 +- .../TestDelete/edge_conflict.exp.json | 24 +- .../TestDelete/edge_decrement.exp.json | 28 +- .../d2oracle/TestDelete/edge_first.exp.json | 40 +- .../TestDelete/edge_flat_style.exp.json | 8 +- .../TestDelete/edge_identical_child.exp.json | 28 +- .../TestDelete/edge_key_style.exp.json | 16 +- .../d2oracle/TestDelete/edge_last.exp.json | 48 +- .../TestDelete/edge_map_style.exp.json | 16 +- .../d2oracle/TestDelete/edge_middle.exp.json | 48 +- .../d2oracle/TestDelete/empty_map.exp.json | 12 +- testdata/d2oracle/TestDelete/flat.exp.json | 4 +- .../TestDelete/flat_reserved.exp.json | 16 +- .../TestDelete/hoist_children.exp.json | 12 +- .../TestDelete/hoist_edge_children.exp.json | 20 +- .../TestDelete/key_with_edges.exp.json | 16 +- .../TestDelete/key_with_edges_2.exp.json | 12 +- .../TestDelete/key_with_edges_3.exp.json | 12 +- .../TestDelete/key_with_edges_4.exp.json | 16 +- testdata/d2oracle/TestDelete/left.exp.json | 8 +- .../d2oracle/TestDelete/multi_near.exp.json | 20 +- .../multi_path_map_conflict.exp.json | 16 +- .../multi_path_map_no_conflict.exp.json | 16 +- .../multiple_flat_middle_container.exp.json | 16 +- .../TestDelete/multiple_flat_style.exp.json | 8 +- .../TestDelete/multiple_map_styles.exp.json | 8 +- testdata/d2oracle/TestDelete/near.exp.json | 8 +- testdata/d2oracle/TestDelete/nested.exp.json | 16 +- .../d2oracle/TestDelete/nested_2.exp.json | 16 +- .../TestDelete/nested_edge_key_style.exp.json | 20 +- .../TestDelete/nested_flat_style.exp.json | 8 +- .../TestDelete/nested_reserved.exp.json | 16 +- .../nested_underscore_update.exp.json | 12 +- .../d2oracle/TestDelete/node_in_edge.exp.json | 36 +- .../TestDelete/node_in_edge_last.exp.json | 44 +- .../only-underscore-nested.exp.json | 16 +- .../TestDelete/only-underscore.exp.json | 12 +- .../only_delete_edge_reserved.exp.json | 16 +- .../only_delete_obj_reserved.exp.json | 16 +- testdata/d2oracle/TestDelete/order_1.exp.json | 20 +- testdata/d2oracle/TestDelete/order_2.exp.json | 12 +- testdata/d2oracle/TestDelete/order_3.exp.json | 12 +- testdata/d2oracle/TestDelete/order_4.exp.json | 8 +- testdata/d2oracle/TestDelete/order_5.exp.json | 32 +- testdata/d2oracle/TestDelete/order_6.exp.json | 20 +- testdata/d2oracle/TestDelete/order_7.exp.json | 24 +- testdata/d2oracle/TestDelete/order_8.exp.json | 24 +- .../d2oracle/TestDelete/save_map.exp.json | 8 +- .../TestDelete/save_map_with_primary.exp.json | 8 +- .../d2oracle/TestDelete/shape_class.exp.json | 8 +- .../TestDelete/shape_sql_table.exp.json | 24 +- .../TestDelete/singular_flat_style.exp.json | 8 +- .../TestDelete/singular_map_style.exp.json | 8 +- .../d2oracle/TestDelete/table_refs.exp.json | 10 +- .../underscore_no_conflict.exp.json | 16 +- .../TestDelete/underscore_remove.exp.json | 32 +- testdata/d2oracle/TestDelete/width.exp.json | 8 +- .../TestMove/append_multiple_styles.exp.json | 12 +- testdata/d2oracle/TestMove/basic.exp.json | 8 +- .../d2oracle/TestMove/basic_nested.exp.json | 12 +- .../TestMove/basic_out_of_container.exp.json | 12 +- .../TestMove/between_containers.exp.json | 16 +- .../TestMove/chain_connected_nested.exp.json | 24 +- ..._connected_nested_no_extra_create.exp.json | 28 +- .../TestMove/connected_nested.exp.json | 20 +- .../container_conflicts_generated.exp.json | 20 +- ...ner_multiple_refs_with_underscore.exp.json | 12 +- .../d2oracle/TestMove/container_near.exp.json | 28 +- testdata/d2oracle/TestMove/duplicate.exp.json | 12 +- .../TestMove/duplicate_generated.exp.json | 32 +- .../TestMove/edge_across_containers.exp.json | 24 +- .../d2oracle/TestMove/edge_basic.exp.json | 16 +- .../TestMove/edge_chain_basic.exp.json | 24 +- .../TestMove/edge_chain_circular.exp.json | 24 +- .../edge_chain_into_container.exp.json | 28 +- .../edge_chain_out_container.exp.json | 28 +- .../d2oracle/TestMove/edge_conflict.exp.json | 28 +- .../TestMove/edge_into_container.exp.json | 24 +- .../TestMove/edge_nested_basic.exp.json | 20 +- .../TestMove/edge_out_of_container.exp.json | 20 +- .../d2oracle/TestMove/extend_map.exp.json | 20 +- .../TestMove/extend_stationary_path.exp.json | 16 +- .../TestMove/flat_between_containers.exp.json | 16 +- .../d2oracle/TestMove/flat_merge.exp.json | 20 +- .../TestMove/flat_middle_container.exp.json | 20 +- .../TestMove/flat_nested_merge.exp.json | 44 +- .../flat_nested_merge_multiple_refs.exp.json | 36 +- .../flat_reparent_with_map_value.exp.json | 12 +- ...lat_reparent_with_mixed_map_value.exp.json | 16 +- .../flat_reparent_with_value.exp.json | 12 +- .../d2oracle/TestMove/flat_style.exp.json | 12 +- .../TestMove/full_edge_slice.exp.json | 28 +- .../d2oracle/TestMove/full_slice.exp.json | 16 +- testdata/d2oracle/TestMove/gnarly_1.exp.json | 64 +- .../hoist_container_children.exp.json | 20 +- .../into_container_existing_map.exp.json | 16 +- .../into_container_nonexisting_map.exp.json | 12 +- .../into_container_with_flat_keys.exp.json | 12 +- .../into_container_with_flat_style.exp.json | 12 +- .../d2oracle/TestMove/map_transplant.exp.json | 20 +- .../d2oracle/TestMove/map_with_label.exp.json | 16 +- .../TestMove/merge_nested_maps.exp.json | 36 +- .../d2oracle/TestMove/merge_reserved.exp.json | 28 +- .../TestMove/middle_container.exp.json | 16 +- ...ddle_container_generated_conflict.exp.json | 36 +- .../TestMove/move_container_children.exp.json | 24 +- .../move_container_conflict_children.exp.json | 24 +- .../move_into_key_with_value.exp.json | 12 +- .../TestMove/move_out_of_edge.exp.json | 32 +- .../TestMove/move_out_of_nested_edge.exp.json | 32 +- .../TestMove/multiple_nesting_levels.exp.json | 32 +- testdata/d2oracle/TestMove/near.exp.json | 16 +- .../nested-underscore-move-out.exp.json | 16 +- .../d2oracle/TestMove/nhooyr_one.exp.json | 20 +- .../d2oracle/TestMove/nhooyr_two.exp.json | 32 +- .../out_of_newline_container.exp.json | 12 +- .../d2oracle/TestMove/parentheses.exp.json | 20 +- .../TestMove/partial_edge_slice.exp.json | 20 +- .../d2oracle/TestMove/partial_slice.exp.json | 12 +- testdata/d2oracle/TestMove/rename_2.exp.json | 24 +- testdata/d2oracle/TestMove/reuse_map.exp.json | 24 +- .../d2oracle/TestMove/slice_style.exp.json | 12 +- .../TestMove/underscore-connection.exp.json | 24 +- .../TestMove/underscore_children.exp.json | 12 +- .../underscore_edge_children.exp.json | 20 +- .../underscore_edge_container_1.exp.json | 20 +- .../underscore_edge_container_2.exp.json | 20 +- .../underscore_edge_container_3.exp.json | 20 +- .../underscore_edge_container_4.exp.json | 20 +- .../underscore_edge_container_5.exp.json | 20 +- .../TestMove/underscore_edge_split.exp.json | 28 +- .../TestMove/underscore_merge.exp.json | 16 +- .../TestMove/underscore_split.exp.json | 20 +- .../TestMove/underscore_split_out.exp.json | 24 +- .../TestMove/underscore_transplant.exp.json | 16 +- .../d2oracle/TestMove/unique_name.exp.json | 20 +- .../unique_name_with_references.exp.json | 28 +- testdata/d2oracle/TestRename/arrows.exp.json | 16 +- .../d2oracle/TestRename/arrows_chain.exp.json | 32 +- .../TestRename/arrows_complex.exp.json | 24 +- .../TestRename/arrows_trim_common.exp.json | 36 +- .../TestRename/arrows_trim_common_2.exp.json | 36 +- .../TestRename/complex_edge_1.exp.json | 24 +- .../TestRename/complex_edge_2.exp.json | 24 +- .../d2oracle/TestRename/conflict.exp.json | 12 +- .../d2oracle/TestRename/conflict_2.exp.json | 24 +- .../TestRename/conflict_with_dots.exp.json | 12 +- .../TestRename/conflict_with_numbers.exp.json | 12 +- .../d2oracle/TestRename/container.exp.json | 96 +-- testdata/d2oracle/TestRename/edges.exp.json | 60 +- testdata/d2oracle/TestRename/flat.exp.json | 8 +- .../d2oracle/TestRename/generated.exp.json | 8 +- testdata/d2oracle/TestRename/near.exp.json | 12 +- testdata/d2oracle/TestRename/nested.exp.json | 24 +- testdata/d2oracle/TestSet/base.exp.json | 8 +- .../TestSet/block_string_multiline.exp.json | 8 +- .../TestSet/block_string_oneline.exp.json | 8 +- .../d2oracle/TestSet/classes-style.exp.json | 8 +- .../TestSet/dupe-classes-style.exp.json | 8 +- testdata/d2oracle/TestSet/edge.exp.json | 16 +- .../TestSet/edge_append_style.exp.json | 16 +- testdata/d2oracle/TestSet/edge_chain.exp.json | 28 +- .../TestSet/edge_chain_append_style.exp.json | 24 +- .../edge_chain_existing_style.exp.json | 24 +- .../TestSet/edge_chain_nested_set.exp.json | 28 +- .../edge_flat_merge_arrowhead.exp.json | 28 +- .../d2oracle/TestSet/edge_index_case.exp.json | 36 +- .../TestSet/edge_index_merge_style.exp.json | 24 +- .../TestSet/edge_index_nested.exp.json | 20 +- .../TestSet/edge_key_and_key.exp.json | 20 +- testdata/d2oracle/TestSet/edge_label.exp.json | 16 +- .../TestSet/edge_merge_arrowhead.exp.json | 20 +- .../TestSet/edge_merge_style.exp.json | 16 +- .../TestSet/edge_nested_label_set.exp.json | 20 +- .../TestSet/edge_nested_style_set.exp.json | 20 +- .../TestSet/edge_replace_arrowhead.exp.json | 20 +- .../edge_replace_arrowhead_indexed.exp.json | 20 +- .../TestSet/edge_set_arrowhead.exp.json | 20 +- .../TestSet/expanded_map_style.exp.json | 8 +- testdata/d2oracle/TestSet/icon.exp.json | 8 +- .../d2oracle/TestSet/inline_style.exp.json | 8 +- testdata/d2oracle/TestSet/label.exp.json | 8 +- .../d2oracle/TestSet/label_primary.exp.json | 20 +- .../d2oracle/TestSet/label_replace.exp.json | 8 +- .../d2oracle/TestSet/label_unset.exp.json | 8 +- .../d2oracle/TestSet/map_key_missing.exp.json | 16 +- .../d2oracle/TestSet/nested_alex.exp.json | 20 +- testdata/d2oracle/TestSet/new_style.exp.json | 8 +- .../TestSet/replace_arrowhead.exp.json | 20 +- .../TestSet/replace_arrowhead_map.exp.json | 20 +- .../TestSet/replace_dimensions.exp.json | 8 +- .../TestSet/replace_edge_style.exp.json | 16 +- .../TestSet/replace_edge_style_map.exp.json | 16 +- .../TestSet/replace_fill_pattern.exp.json | 8 +- .../d2oracle/TestSet/replace_link.exp.json | 8 +- .../TestSet/replace_position.exp.json | 8 +- .../d2oracle/TestSet/replace_shape.exp.json | 8 +- .../d2oracle/TestSet/replace_style.exp.json | 8 +- .../TestSet/replace_style_edgecase.exp.json | 8 +- .../d2oracle/TestSet/replace_tooltip.exp.json | 8 +- .../d2oracle/TestSet/set_dimensions.exp.json | 8 +- .../TestSet/set_fill_pattern.exp.json | 8 +- .../d2oracle/TestSet/set_position.exp.json | 8 +- .../d2oracle/TestSet/set_tooltip.exp.json | 8 +- testdata/d2oracle/TestSet/shape.exp.json | 8 +- .../TestSet/shape_nested_style_set.exp.json | 8 +- .../unapplied-classes-style-2.exp.json | 8 +- .../TestSet/unapplied-classes-style.exp.json | 8 +- 441 files changed, 7463 insertions(+), 10219 deletions(-) create mode 100644 testdata/d2compiler/TestCompile/sql-constraints.exp.json diff --git a/d2compiler/compile.go b/d2compiler/compile.go index 9a08a6b75..c01544066 100644 --- a/d2compiler/compile.go +++ b/d2compiler/compile.go @@ -307,9 +307,28 @@ func (c *compiler) compileLabel(attrs *d2graph.Attributes, f d2ir.Node) { func (c *compiler) compileReserved(attrs *d2graph.Attributes, f *d2ir.Field) { if f.Primary() == nil { - if f.Composite != nil && !strings.EqualFold(f.Name, "class") { + compositeAccepted := strings.EqualFold(f.Name, "class") || strings.EqualFold(f.Name, "constraint") + if f.Composite != nil && !compositeAccepted { c.errorf(f.LastPrimaryKey(), "reserved field %v does not accept composite", f.Name) } + switch f.Name { + case "class": + if arr, ok := f.Composite.(*d2ir.Array); ok { + for _, class := range arr.Values { + if scalar, ok := class.(*d2ir.Scalar); ok { + attrs.Classes = append(attrs.Classes, scalar.Value.ScalarString()) + } + } + } + case "constraint": + if arr, ok := f.Composite.(*d2ir.Array); ok { + for _, constraint := range arr.Values { + if scalar, ok := constraint.(*d2ir.Scalar); ok { + attrs.Constraint = append(attrs.Constraint, scalar.Value.ScalarString()) + } + } + } + } return } scalar := f.Primary().Value @@ -409,8 +428,7 @@ func (c *compiler) compileReserved(attrs *d2graph.Attributes, f *d2ir.Field) { c.errorf(f.LastPrimaryKey(), "constraint value must be a string") return } - attrs.Constraint.Value = scalar.ScalarString() - attrs.Constraint.MapKey = f.LastPrimaryKey() + attrs.Constraint = append(attrs.Constraint, scalar.ScalarString()) case "grid-rows": v, err := strconv.Atoi(scalar.ScalarString()) if err != nil { @@ -477,17 +495,7 @@ func (c *compiler) compileReserved(attrs *d2graph.Attributes, f *d2ir.Field) { attrs.HorizontalGap.Value = scalar.ScalarString() attrs.HorizontalGap.MapKey = f.LastPrimaryKey() case "class": - if f.Primary() != nil { - attrs.Classes = append(attrs.Classes, scalar.ScalarString()) - } else if f.Composite != nil { - if arr, ok := f.Composite.(*d2ir.Array); ok { - for _, class := range arr.Values { - if scalar, ok := class.(*d2ir.Scalar); ok { - attrs.Classes = append(attrs.Classes, scalar.Value.ScalarString()) - } - } - } - } + attrs.Classes = append(attrs.Classes, scalar.ScalarString()) case "classes": } @@ -777,11 +785,9 @@ func (c *compiler) compileSQLTable(obj *d2graph.Object) { typ = "" } d2Col := d2target.SQLColumn{ - Name: d2target.Text{Label: col.IDVal}, - Type: d2target.Text{Label: typ}, - } - if col.Constraint.Value != "" { - d2Col.Constraint = col.Constraint.Value + Name: d2target.Text{Label: col.IDVal}, + Type: d2target.Text{Label: typ}, + Constraint: col.Constraint, } obj.SQLTable.Columns = append(obj.SQLTable.Columns, d2Col) } diff --git a/d2compiler/compile_test.go b/d2compiler/compile_test.go index b82b256a1..f3e5c65b9 100644 --- a/d2compiler/compile_test.go +++ b/d2compiler/compile_test.go @@ -2139,13 +2139,17 @@ ok: { }, }, { - name: "sql-panic", - text: `test { - shape: sql_table - test_id: varchar(64) {constraint: [primary_key, foreign_key]} -} -`, - expErr: `d2/testdata/d2compiler/TestCompile/sql-panic.d2:3:27: reserved field constraint does not accept composite`, + name: "sql-constraints", + text: `x: { + shape: sql_table + a: int {constraint: primary_key} + b: int {constraint: [primary_key; foreign_key]} +}`, + assertions: func(t *testing.T, g *d2graph.Graph) { + table := g.Objects[0].SQLTable + tassert.Equal(t, []string{"primary_key"}, table.Columns[0].Constraint) + tassert.Equal(t, []string{"primary_key", "foreign_key"}, table.Columns[1].Constraint) + }, }, { name: "wrong_column_index", diff --git a/d2graph/d2graph.go b/d2graph/d2graph.go index f8869976b..b427bc9e1 100644 --- a/d2graph/d2graph.go +++ b/d2graph/d2graph.go @@ -131,8 +131,8 @@ type Attributes struct { // TODO: default to ShapeRectangle instead of empty string Shape Scalar `json:"shape"` - Direction Scalar `json:"direction"` - Constraint Scalar `json:"constraint"` + Direction Scalar `json:"direction"` + Constraint []string `json:"constraint"` GridRows *Scalar `json:"gridRows,omitempty"` GridColumns *Scalar `json:"gridColumns,omitempty"` @@ -1036,11 +1036,7 @@ func (obj *Object) GetDefaultSize(mtexts []*d2target.MText, ruler *textmeasure.R } maxTypeWidth = go2.Max(maxTypeWidth, typeDims.Width) - if c.Constraint == "primary_key_foreign_key" { - // covers "PK FK" constraint with padding - constraintWidth = 80 - } else if c.Constraint != "" && constraintWidth == 0 { - // covers remaining constraints with "UNQ" being the largest + if len(c.Constraint) > 0 { constraintWidth = 60 } } diff --git a/d2renderers/d2sketch/testdata/class_and_sqlTable_border_radius/sketch.exp.svg b/d2renderers/d2sketch/testdata/class_and_sqlTable_border_radius/sketch.exp.svg index 3b7ed9ae0..edb1a93a6 100644 --- a/d2renderers/d2sketch/testdata/class_and_sqlTable_border_radius/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/class_and_sqlTable_border_radius/sketch.exp.svg @@ -1,16 +1,16 @@ - + .d2-3181790551 .fill-N1{fill:#0A0F25;} + .d2-3181790551 .fill-N2{fill:#676C7E;} + .d2-3181790551 .fill-N3{fill:#9499AB;} + .d2-3181790551 .fill-N4{fill:#CFD2DD;} + .d2-3181790551 .fill-N5{fill:#DEE1EB;} + .d2-3181790551 .fill-N6{fill:#EEF1F8;} + .d2-3181790551 .fill-N7{fill:#FFFFFF;} + .d2-3181790551 .fill-B1{fill:#0D32B2;} + .d2-3181790551 .fill-B2{fill:#0D32B2;} + .d2-3181790551 .fill-B3{fill:#E3E9FD;} + .d2-3181790551 .fill-B4{fill:#E3E9FD;} + .d2-3181790551 .fill-B5{fill:#EDF0FD;} + .d2-3181790551 .fill-B6{fill:#F7F8FE;} + .d2-3181790551 .fill-AA2{fill:#4A6FF3;} + .d2-3181790551 .fill-AA4{fill:#EDF0FD;} + .d2-3181790551 .fill-AA5{fill:#F7F8FE;} + .d2-3181790551 .fill-AB4{fill:#EDF0FD;} + .d2-3181790551 .fill-AB5{fill:#F7F8FE;} + .d2-3181790551 .stroke-N1{stroke:#0A0F25;} + .d2-3181790551 .stroke-N2{stroke:#676C7E;} + .d2-3181790551 .stroke-N3{stroke:#9499AB;} + .d2-3181790551 .stroke-N4{stroke:#CFD2DD;} + .d2-3181790551 .stroke-N5{stroke:#DEE1EB;} + .d2-3181790551 .stroke-N6{stroke:#EEF1F8;} + .d2-3181790551 .stroke-N7{stroke:#FFFFFF;} + .d2-3181790551 .stroke-B1{stroke:#0D32B2;} + .d2-3181790551 .stroke-B2{stroke:#0D32B2;} + .d2-3181790551 .stroke-B3{stroke:#E3E9FD;} + .d2-3181790551 .stroke-B4{stroke:#E3E9FD;} + .d2-3181790551 .stroke-B5{stroke:#EDF0FD;} + .d2-3181790551 .stroke-B6{stroke:#F7F8FE;} + .d2-3181790551 .stroke-AA2{stroke:#4A6FF3;} + .d2-3181790551 .stroke-AA4{stroke:#EDF0FD;} + .d2-3181790551 .stroke-AA5{stroke:#F7F8FE;} + .d2-3181790551 .stroke-AB4{stroke:#EDF0FD;} + .d2-3181790551 .stroke-AB5{stroke:#F7F8FE;} + .d2-3181790551 .background-color-N1{background-color:#0A0F25;} + .d2-3181790551 .background-color-N2{background-color:#676C7E;} + .d2-3181790551 .background-color-N3{background-color:#9499AB;} + .d2-3181790551 .background-color-N4{background-color:#CFD2DD;} + .d2-3181790551 .background-color-N5{background-color:#DEE1EB;} + .d2-3181790551 .background-color-N6{background-color:#EEF1F8;} + .d2-3181790551 .background-color-N7{background-color:#FFFFFF;} + .d2-3181790551 .background-color-B1{background-color:#0D32B2;} + .d2-3181790551 .background-color-B2{background-color:#0D32B2;} + .d2-3181790551 .background-color-B3{background-color:#E3E9FD;} + .d2-3181790551 .background-color-B4{background-color:#E3E9FD;} + .d2-3181790551 .background-color-B5{background-color:#EDF0FD;} + .d2-3181790551 .background-color-B6{background-color:#F7F8FE;} + .d2-3181790551 .background-color-AA2{background-color:#4A6FF3;} + .d2-3181790551 .background-color-AA4{background-color:#EDF0FD;} + .d2-3181790551 .background-color-AA5{background-color:#F7F8FE;} + .d2-3181790551 .background-color-AB4{background-color:#EDF0FD;} + .d2-3181790551 .background-color-AB5{background-color:#F7F8FE;} + .d2-3181790551 .color-N1{color:#0A0F25;} + .d2-3181790551 .color-N2{color:#676C7E;} + .d2-3181790551 .color-N3{color:#9499AB;} + .d2-3181790551 .color-N4{color:#CFD2DD;} + .d2-3181790551 .color-N5{color:#DEE1EB;} + .d2-3181790551 .color-N6{color:#EEF1F8;} + .d2-3181790551 .color-N7{color:#FFFFFF;} + .d2-3181790551 .color-B1{color:#0D32B2;} + .d2-3181790551 .color-B2{color:#0D32B2;} + .d2-3181790551 .color-B3{color:#E3E9FD;} + .d2-3181790551 .color-B4{color:#E3E9FD;} + .d2-3181790551 .color-B5{color:#EDF0FD;} + .d2-3181790551 .color-B6{color:#F7F8FE;} + .d2-3181790551 .color-AA2{color:#4A6FF3;} + .d2-3181790551 .color-AA4{color:#EDF0FD;} + .d2-3181790551 .color-AA5{color:#F7F8FE;} + .d2-3181790551 .color-AB4{color:#EDF0FD;} + .d2-3181790551 .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}]]> @@ -112,7 +112,7 @@ -aidintPKdiskintFKjsonjsonbUNQlast_updatedtimestamp with time zoneb+field[]string+method(a uint64)(x, y int)cd +aidintPKdiskintFKjsonjsonbUNQlast_updatedtimestamp with time zoneb+field[]string+method(a uint64)(x, y int)cd \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/opacity/sketch.exp.svg b/d2renderers/d2sketch/testdata/opacity/sketch.exp.svg index 673f5d04e..58e63f5d4 100644 --- a/d2renderers/d2sketch/testdata/opacity/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/opacity/sketch.exp.svg @@ -1,27 +1,27 @@ - @@ -852,7 +852,7 @@ x

linux: because a PC is a terrible thing to waste

-
auserslast_logindatetime You don't have to know how the computer works,just how to work the computer. +auserslast_logindatetime You don't have to know how the computer works,just how to work the computer. \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/opacity_dark/sketch.exp.svg b/d2renderers/d2sketch/testdata/opacity_dark/sketch.exp.svg index 69d3809cd..78a74ab1c 100644 --- a/d2renderers/d2sketch/testdata/opacity_dark/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/opacity_dark/sketch.exp.svg @@ -1,27 +1,27 @@ - @@ -850,7 +850,7 @@ x

linux: because a PC is a terrible thing to waste

-
auserslast_logindatetime You don't have to know how the computer works,just how to work the computer. +auserslast_logindatetime You don't have to know how the computer works,just how to work the computer. \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/sql_tables/sketch.exp.svg b/d2renderers/d2sketch/testdata/sql_tables/sketch.exp.svg index 85c566b37..e403c60d9 100644 --- a/d2renderers/d2sketch/testdata/sql_tables/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/sql_tables/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-208007175 .fill-N1{fill:#0A0F25;} + .d2-208007175 .fill-N2{fill:#676C7E;} + .d2-208007175 .fill-N3{fill:#9499AB;} + .d2-208007175 .fill-N4{fill:#CFD2DD;} + .d2-208007175 .fill-N5{fill:#DEE1EB;} + .d2-208007175 .fill-N6{fill:#EEF1F8;} + .d2-208007175 .fill-N7{fill:#FFFFFF;} + .d2-208007175 .fill-B1{fill:#0D32B2;} + .d2-208007175 .fill-B2{fill:#0D32B2;} + .d2-208007175 .fill-B3{fill:#E3E9FD;} + .d2-208007175 .fill-B4{fill:#E3E9FD;} + .d2-208007175 .fill-B5{fill:#EDF0FD;} + .d2-208007175 .fill-B6{fill:#F7F8FE;} + .d2-208007175 .fill-AA2{fill:#4A6FF3;} + .d2-208007175 .fill-AA4{fill:#EDF0FD;} + .d2-208007175 .fill-AA5{fill:#F7F8FE;} + .d2-208007175 .fill-AB4{fill:#EDF0FD;} + .d2-208007175 .fill-AB5{fill:#F7F8FE;} + .d2-208007175 .stroke-N1{stroke:#0A0F25;} + .d2-208007175 .stroke-N2{stroke:#676C7E;} + .d2-208007175 .stroke-N3{stroke:#9499AB;} + .d2-208007175 .stroke-N4{stroke:#CFD2DD;} + .d2-208007175 .stroke-N5{stroke:#DEE1EB;} + .d2-208007175 .stroke-N6{stroke:#EEF1F8;} + .d2-208007175 .stroke-N7{stroke:#FFFFFF;} + .d2-208007175 .stroke-B1{stroke:#0D32B2;} + .d2-208007175 .stroke-B2{stroke:#0D32B2;} + .d2-208007175 .stroke-B3{stroke:#E3E9FD;} + .d2-208007175 .stroke-B4{stroke:#E3E9FD;} + .d2-208007175 .stroke-B5{stroke:#EDF0FD;} + .d2-208007175 .stroke-B6{stroke:#F7F8FE;} + .d2-208007175 .stroke-AA2{stroke:#4A6FF3;} + .d2-208007175 .stroke-AA4{stroke:#EDF0FD;} + .d2-208007175 .stroke-AA5{stroke:#F7F8FE;} + .d2-208007175 .stroke-AB4{stroke:#EDF0FD;} + .d2-208007175 .stroke-AB5{stroke:#F7F8FE;} + .d2-208007175 .background-color-N1{background-color:#0A0F25;} + .d2-208007175 .background-color-N2{background-color:#676C7E;} + .d2-208007175 .background-color-N3{background-color:#9499AB;} + .d2-208007175 .background-color-N4{background-color:#CFD2DD;} + .d2-208007175 .background-color-N5{background-color:#DEE1EB;} + .d2-208007175 .background-color-N6{background-color:#EEF1F8;} + .d2-208007175 .background-color-N7{background-color:#FFFFFF;} + .d2-208007175 .background-color-B1{background-color:#0D32B2;} + .d2-208007175 .background-color-B2{background-color:#0D32B2;} + .d2-208007175 .background-color-B3{background-color:#E3E9FD;} + .d2-208007175 .background-color-B4{background-color:#E3E9FD;} + .d2-208007175 .background-color-B5{background-color:#EDF0FD;} + .d2-208007175 .background-color-B6{background-color:#F7F8FE;} + .d2-208007175 .background-color-AA2{background-color:#4A6FF3;} + .d2-208007175 .background-color-AA4{background-color:#EDF0FD;} + .d2-208007175 .background-color-AA5{background-color:#F7F8FE;} + .d2-208007175 .background-color-AB4{background-color:#EDF0FD;} + .d2-208007175 .background-color-AB5{background-color:#F7F8FE;} + .d2-208007175 .color-N1{color:#0A0F25;} + .d2-208007175 .color-N2{color:#676C7E;} + .d2-208007175 .color-N3{color:#9499AB;} + .d2-208007175 .color-N4{color:#CFD2DD;} + .d2-208007175 .color-N5{color:#DEE1EB;} + .d2-208007175 .color-N6{color:#EEF1F8;} + .d2-208007175 .color-N7{color:#FFFFFF;} + .d2-208007175 .color-B1{color:#0D32B2;} + .d2-208007175 .color-B2{color:#0D32B2;} + .d2-208007175 .color-B3{color:#E3E9FD;} + .d2-208007175 .color-B4{color:#E3E9FD;} + .d2-208007175 .color-B5{color:#EDF0FD;} + .d2-208007175 .color-B6{color:#F7F8FE;} + .d2-208007175 .color-AA2{color:#4A6FF3;} + .d2-208007175 .color-AA4{color:#EDF0FD;} + .d2-208007175 .color-AA5{color:#F7F8FE;} + .d2-208007175 .color-AB4{color:#EDF0FD;} + .d2-208007175 .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}]]> @@ -97,7 +97,7 @@ -usersidintnamestringemailstringpasswordstringlast_logindatetimeproductsidintpricedecimalskustringnamestringordersidintuser_idintproduct_idintshipmentsidintorder_idinttracking_numberstringPKstatusstring +usersidintnamestringemailstringpasswordstringlast_logindatetimeproductsidintpricedecimalskustringnamestringordersidintuser_idintproduct_idintshipmentsidintorder_idinttracking_numberstringPKstatusstring \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/sql_tables_dark/sketch.exp.svg b/d2renderers/d2sketch/testdata/sql_tables_dark/sketch.exp.svg index 4b933e55a..d49db6427 100644 --- a/d2renderers/d2sketch/testdata/sql_tables_dark/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/sql_tables_dark/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-208007175 .fill-N1{fill:#CDD6F4;} + .d2-208007175 .fill-N2{fill:#BAC2DE;} + .d2-208007175 .fill-N3{fill:#A6ADC8;} + .d2-208007175 .fill-N4{fill:#585B70;} + .d2-208007175 .fill-N5{fill:#45475A;} + .d2-208007175 .fill-N6{fill:#313244;} + .d2-208007175 .fill-N7{fill:#1E1E2E;} + .d2-208007175 .fill-B1{fill:#CBA6f7;} + .d2-208007175 .fill-B2{fill:#CBA6f7;} + .d2-208007175 .fill-B3{fill:#6C7086;} + .d2-208007175 .fill-B4{fill:#585B70;} + .d2-208007175 .fill-B5{fill:#45475A;} + .d2-208007175 .fill-B6{fill:#313244;} + .d2-208007175 .fill-AA2{fill:#f38BA8;} + .d2-208007175 .fill-AA4{fill:#45475A;} + .d2-208007175 .fill-AA5{fill:#313244;} + .d2-208007175 .fill-AB4{fill:#45475A;} + .d2-208007175 .fill-AB5{fill:#313244;} + .d2-208007175 .stroke-N1{stroke:#CDD6F4;} + .d2-208007175 .stroke-N2{stroke:#BAC2DE;} + .d2-208007175 .stroke-N3{stroke:#A6ADC8;} + .d2-208007175 .stroke-N4{stroke:#585B70;} + .d2-208007175 .stroke-N5{stroke:#45475A;} + .d2-208007175 .stroke-N6{stroke:#313244;} + .d2-208007175 .stroke-N7{stroke:#1E1E2E;} + .d2-208007175 .stroke-B1{stroke:#CBA6f7;} + .d2-208007175 .stroke-B2{stroke:#CBA6f7;} + .d2-208007175 .stroke-B3{stroke:#6C7086;} + .d2-208007175 .stroke-B4{stroke:#585B70;} + .d2-208007175 .stroke-B5{stroke:#45475A;} + .d2-208007175 .stroke-B6{stroke:#313244;} + .d2-208007175 .stroke-AA2{stroke:#f38BA8;} + .d2-208007175 .stroke-AA4{stroke:#45475A;} + .d2-208007175 .stroke-AA5{stroke:#313244;} + .d2-208007175 .stroke-AB4{stroke:#45475A;} + .d2-208007175 .stroke-AB5{stroke:#313244;} + .d2-208007175 .background-color-N1{background-color:#CDD6F4;} + .d2-208007175 .background-color-N2{background-color:#BAC2DE;} + .d2-208007175 .background-color-N3{background-color:#A6ADC8;} + .d2-208007175 .background-color-N4{background-color:#585B70;} + .d2-208007175 .background-color-N5{background-color:#45475A;} + .d2-208007175 .background-color-N6{background-color:#313244;} + .d2-208007175 .background-color-N7{background-color:#1E1E2E;} + .d2-208007175 .background-color-B1{background-color:#CBA6f7;} + .d2-208007175 .background-color-B2{background-color:#CBA6f7;} + .d2-208007175 .background-color-B3{background-color:#6C7086;} + .d2-208007175 .background-color-B4{background-color:#585B70;} + .d2-208007175 .background-color-B5{background-color:#45475A;} + .d2-208007175 .background-color-B6{background-color:#313244;} + .d2-208007175 .background-color-AA2{background-color:#f38BA8;} + .d2-208007175 .background-color-AA4{background-color:#45475A;} + .d2-208007175 .background-color-AA5{background-color:#313244;} + .d2-208007175 .background-color-AB4{background-color:#45475A;} + .d2-208007175 .background-color-AB5{background-color:#313244;} + .d2-208007175 .color-N1{color:#CDD6F4;} + .d2-208007175 .color-N2{color:#BAC2DE;} + .d2-208007175 .color-N3{color:#A6ADC8;} + .d2-208007175 .color-N4{color:#585B70;} + .d2-208007175 .color-N5{color:#45475A;} + .d2-208007175 .color-N6{color:#313244;} + .d2-208007175 .color-N7{color:#1E1E2E;} + .d2-208007175 .color-B1{color:#CBA6f7;} + .d2-208007175 .color-B2{color:#CBA6f7;} + .d2-208007175 .color-B3{color:#6C7086;} + .d2-208007175 .color-B4{color:#585B70;} + .d2-208007175 .color-B5{color:#45475A;} + .d2-208007175 .color-B6{color:#313244;} + .d2-208007175 .color-AA2{color:#f38BA8;} + .d2-208007175 .color-AA4{color:#45475A;} + .d2-208007175 .color-AA5{color:#313244;} + .d2-208007175 .color-AB4{color:#45475A;} + .d2-208007175 .color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker);mix-blend-mode:lighten}.light-code{display: none}.dark-code{display: block}]]> -usersidintnamestringemailstringpasswordstringlast_logindatetimeproductsidintpricedecimalskustringnamestringordersidintuser_idintproduct_idintshipmentsidintorder_idinttracking_numberstringPKstatusstring +usersidintnamestringemailstringpasswordstringlast_logindatetimeproductsidintpricedecimalskustringnamestringordersidintuser_idintproduct_idintshipmentsidintorder_idinttracking_numberstringPKstatusstring \ No newline at end of file diff --git a/d2renderers/d2svg/dark_theme/testdata/opacity/dark_theme.exp.svg b/d2renderers/d2svg/dark_theme/testdata/opacity/dark_theme.exp.svg index de6dc7cde..7259a474a 100644 --- a/d2renderers/d2svg/dark_theme/testdata/opacity/dark_theme.exp.svg +++ b/d2renderers/d2svg/dark_theme/testdata/opacity/dark_theme.exp.svg @@ -1,27 +1,27 @@ -x

linux: because a PC is a terrible thing to waste

-
auserslast_logindatetime You don't have to know how the computer works,just how to work the computer. +auserslast_logindatetime You don't have to know how the computer works,just how to work the computer. \ No newline at end of file diff --git a/d2renderers/d2svg/dark_theme/testdata/sql_tables/dark_theme.exp.svg b/d2renderers/d2svg/dark_theme/testdata/sql_tables/dark_theme.exp.svg index 39797d3ee..9016809d3 100644 --- a/d2renderers/d2svg/dark_theme/testdata/sql_tables/dark_theme.exp.svg +++ b/d2renderers/d2svg/dark_theme/testdata/sql_tables/dark_theme.exp.svg @@ -1,9 +1,9 @@ -usersidintnamestringemailstringpasswordstringlast_logindatetimeproductsidintpricedecimalskustringnamestringordersidintuser_idintproduct_idintshipmentsidintorder_idinttracking_numberstringPKstatusstring + .d2-208007175 .fill-N1{fill:#CDD6F4;} + .d2-208007175 .fill-N2{fill:#BAC2DE;} + .d2-208007175 .fill-N3{fill:#A6ADC8;} + .d2-208007175 .fill-N4{fill:#585B70;} + .d2-208007175 .fill-N5{fill:#45475A;} + .d2-208007175 .fill-N6{fill:#313244;} + .d2-208007175 .fill-N7{fill:#1E1E2E;} + .d2-208007175 .fill-B1{fill:#CBA6f7;} + .d2-208007175 .fill-B2{fill:#CBA6f7;} + .d2-208007175 .fill-B3{fill:#6C7086;} + .d2-208007175 .fill-B4{fill:#585B70;} + .d2-208007175 .fill-B5{fill:#45475A;} + .d2-208007175 .fill-B6{fill:#313244;} + .d2-208007175 .fill-AA2{fill:#f38BA8;} + .d2-208007175 .fill-AA4{fill:#45475A;} + .d2-208007175 .fill-AA5{fill:#313244;} + .d2-208007175 .fill-AB4{fill:#45475A;} + .d2-208007175 .fill-AB5{fill:#313244;} + .d2-208007175 .stroke-N1{stroke:#CDD6F4;} + .d2-208007175 .stroke-N2{stroke:#BAC2DE;} + .d2-208007175 .stroke-N3{stroke:#A6ADC8;} + .d2-208007175 .stroke-N4{stroke:#585B70;} + .d2-208007175 .stroke-N5{stroke:#45475A;} + .d2-208007175 .stroke-N6{stroke:#313244;} + .d2-208007175 .stroke-N7{stroke:#1E1E2E;} + .d2-208007175 .stroke-B1{stroke:#CBA6f7;} + .d2-208007175 .stroke-B2{stroke:#CBA6f7;} + .d2-208007175 .stroke-B3{stroke:#6C7086;} + .d2-208007175 .stroke-B4{stroke:#585B70;} + .d2-208007175 .stroke-B5{stroke:#45475A;} + .d2-208007175 .stroke-B6{stroke:#313244;} + .d2-208007175 .stroke-AA2{stroke:#f38BA8;} + .d2-208007175 .stroke-AA4{stroke:#45475A;} + .d2-208007175 .stroke-AA5{stroke:#313244;} + .d2-208007175 .stroke-AB4{stroke:#45475A;} + .d2-208007175 .stroke-AB5{stroke:#313244;} + .d2-208007175 .background-color-N1{background-color:#CDD6F4;} + .d2-208007175 .background-color-N2{background-color:#BAC2DE;} + .d2-208007175 .background-color-N3{background-color:#A6ADC8;} + .d2-208007175 .background-color-N4{background-color:#585B70;} + .d2-208007175 .background-color-N5{background-color:#45475A;} + .d2-208007175 .background-color-N6{background-color:#313244;} + .d2-208007175 .background-color-N7{background-color:#1E1E2E;} + .d2-208007175 .background-color-B1{background-color:#CBA6f7;} + .d2-208007175 .background-color-B2{background-color:#CBA6f7;} + .d2-208007175 .background-color-B3{background-color:#6C7086;} + .d2-208007175 .background-color-B4{background-color:#585B70;} + .d2-208007175 .background-color-B5{background-color:#45475A;} + .d2-208007175 .background-color-B6{background-color:#313244;} + .d2-208007175 .background-color-AA2{background-color:#f38BA8;} + .d2-208007175 .background-color-AA4{background-color:#45475A;} + .d2-208007175 .background-color-AA5{background-color:#313244;} + .d2-208007175 .background-color-AB4{background-color:#45475A;} + .d2-208007175 .background-color-AB5{background-color:#313244;} + .d2-208007175 .color-N1{color:#CDD6F4;} + .d2-208007175 .color-N2{color:#BAC2DE;} + .d2-208007175 .color-N3{color:#A6ADC8;} + .d2-208007175 .color-N4{color:#585B70;} + .d2-208007175 .color-N5{color:#45475A;} + .d2-208007175 .color-N6{color:#313244;} + .d2-208007175 .color-N7{color:#1E1E2E;} + .d2-208007175 .color-B1{color:#CBA6f7;} + .d2-208007175 .color-B2{color:#CBA6f7;} + .d2-208007175 .color-B3{color:#6C7086;} + .d2-208007175 .color-B4{color:#585B70;} + .d2-208007175 .color-B5{color:#45475A;} + .d2-208007175 .color-B6{color:#313244;} + .d2-208007175 .color-AA2{color:#f38BA8;} + .d2-208007175 .color-AA4{color:#45475A;} + .d2-208007175 .color-AA5{color:#313244;} + .d2-208007175 .color-AB4{color:#45475A;} + .d2-208007175 .color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker);mix-blend-mode:lighten}.light-code{display: none}.dark-code{display: block}]]>usersidintnamestringemailstringpasswordstringlast_logindatetimeproductsidintpricedecimalskustringnamestringordersidintuser_idintproduct_idintshipmentsidintorder_idinttracking_numberstringPKstatusstring \ No newline at end of file diff --git a/d2target/sqltable.go b/d2target/sqltable.go index a10821a99..f5bc1ee4e 100644 --- a/d2target/sqltable.go +++ b/d2target/sqltable.go @@ -1,5 +1,7 @@ package d2target +import "strings" + const ( NamePadding = 10 TypePadding = 20 @@ -15,10 +17,10 @@ type SQLTable struct { } type SQLColumn struct { - Name Text `json:"name"` - Type Text `json:"type"` - Constraint string `json:"constraint"` - Reference string `json:"reference"` + Name Text `json:"name"` + Type Text `json:"type"` + Constraint []string `json:"constraint"` + Reference string `json:"reference"` } func (c SQLColumn) Texts(fontSize int) []*MText { @@ -41,16 +43,22 @@ func (c SQLColumn) Texts(fontSize int) []*MText { } func (c SQLColumn) ConstraintAbbr() string { - switch c.Constraint { - case "primary_key": - return "PK" - case "foreign_key": - return "FK" - case "primary_key_foreign_key": - return "PK FK" - case "unique": - return "UNQ" - default: - return "" + var abbrs []string + + for _, constraint := range c.Constraint { + var abbr string + + switch constraint { + case "primary_key": + abbr = "PK" + case "foreign_key": + abbr = "FK" + case "unique": + abbr = "UNQ" + } + + abbrs = append(abbrs, abbr) } + + return strings.Join(abbrs, " ") } diff --git a/e2etests-cli/testdata/TestCLI_E2E/internal_linked_pdf.exp.pdf b/e2etests-cli/testdata/TestCLI_E2E/internal_linked_pdf.exp.pdf index f9cb8c74eb1959df0a27e92b9049dfe8d96b7813..1308362ad1e2d2c9f1d997963cb23391c640719b 100644 GIT binary patch delta 70 zcmezQf#v51mWC~it|rsVO&Im3JDV^XOKgA`nBvnDf T#mdOQ$k+fbw|$-|<83AYQZyA| delta 70 zcmezQf#v51mWC~it|rsVOc)KOJDV^XPG4ricv;oN$iUFR)XdmilS|(>KgA`nBvnDf T#mdOQ$k+fbw|$-|<83AYQW+Iu diff --git a/e2etests/testdata/patterns/real-lines/dagre/board.exp.json b/e2etests/testdata/patterns/real-lines/dagre/board.exp.json index 0999249c0..e3df67344 100644 --- a/e2etests/testdata/patterns/real-lines/dagre/board.exp.json +++ b/e2etests/testdata/patterns/real-lines/dagre/board.exp.json @@ -222,7 +222,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -250,7 +252,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -278,7 +280,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -306,7 +308,7 @@ "labelWidth": 91, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], @@ -379,7 +381,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -407,7 +411,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -435,7 +439,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -463,7 +467,7 @@ "labelWidth": 91, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], diff --git a/e2etests/testdata/patterns/real-lines/dagre/sketch.exp.svg b/e2etests/testdata/patterns/real-lines/dagre/sketch.exp.svg index 68ca35418..dbaed70da 100644 --- a/e2etests/testdata/patterns/real-lines/dagre/sketch.exp.svg +++ b/e2etests/testdata/patterns/real-lines/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ -RefreshAuthorizationPolicyProtocolServerSideTranslatorProtocolBufferRefreshAuthorizationPolicyCacheRefreshAuthorizationPolicyCacheok + .d2-3940939446 .fill-N1{fill:#0A0F25;} + .d2-3940939446 .fill-N2{fill:#676C7E;} + .d2-3940939446 .fill-N3{fill:#9499AB;} + .d2-3940939446 .fill-N4{fill:#CFD2DD;} + .d2-3940939446 .fill-N5{fill:#DEE1EB;} + .d2-3940939446 .fill-N6{fill:#EEF1F8;} + .d2-3940939446 .fill-N7{fill:#FFFFFF;} + .d2-3940939446 .fill-B1{fill:#0D32B2;} + .d2-3940939446 .fill-B2{fill:#0D32B2;} + .d2-3940939446 .fill-B3{fill:#E3E9FD;} + .d2-3940939446 .fill-B4{fill:#E3E9FD;} + .d2-3940939446 .fill-B5{fill:#EDF0FD;} + .d2-3940939446 .fill-B6{fill:#F7F8FE;} + .d2-3940939446 .fill-AA2{fill:#4A6FF3;} + .d2-3940939446 .fill-AA4{fill:#EDF0FD;} + .d2-3940939446 .fill-AA5{fill:#F7F8FE;} + .d2-3940939446 .fill-AB4{fill:#EDF0FD;} + .d2-3940939446 .fill-AB5{fill:#F7F8FE;} + .d2-3940939446 .stroke-N1{stroke:#0A0F25;} + .d2-3940939446 .stroke-N2{stroke:#676C7E;} + .d2-3940939446 .stroke-N3{stroke:#9499AB;} + .d2-3940939446 .stroke-N4{stroke:#CFD2DD;} + .d2-3940939446 .stroke-N5{stroke:#DEE1EB;} + .d2-3940939446 .stroke-N6{stroke:#EEF1F8;} + .d2-3940939446 .stroke-N7{stroke:#FFFFFF;} + .d2-3940939446 .stroke-B1{stroke:#0D32B2;} + .d2-3940939446 .stroke-B2{stroke:#0D32B2;} + .d2-3940939446 .stroke-B3{stroke:#E3E9FD;} + .d2-3940939446 .stroke-B4{stroke:#E3E9FD;} + .d2-3940939446 .stroke-B5{stroke:#EDF0FD;} + .d2-3940939446 .stroke-B6{stroke:#F7F8FE;} + .d2-3940939446 .stroke-AA2{stroke:#4A6FF3;} + .d2-3940939446 .stroke-AA4{stroke:#EDF0FD;} + .d2-3940939446 .stroke-AA5{stroke:#F7F8FE;} + .d2-3940939446 .stroke-AB4{stroke:#EDF0FD;} + .d2-3940939446 .stroke-AB5{stroke:#F7F8FE;} + .d2-3940939446 .background-color-N1{background-color:#0A0F25;} + .d2-3940939446 .background-color-N2{background-color:#676C7E;} + .d2-3940939446 .background-color-N3{background-color:#9499AB;} + .d2-3940939446 .background-color-N4{background-color:#CFD2DD;} + .d2-3940939446 .background-color-N5{background-color:#DEE1EB;} + .d2-3940939446 .background-color-N6{background-color:#EEF1F8;} + .d2-3940939446 .background-color-N7{background-color:#FFFFFF;} + .d2-3940939446 .background-color-B1{background-color:#0D32B2;} + .d2-3940939446 .background-color-B2{background-color:#0D32B2;} + .d2-3940939446 .background-color-B3{background-color:#E3E9FD;} + .d2-3940939446 .background-color-B4{background-color:#E3E9FD;} + .d2-3940939446 .background-color-B5{background-color:#EDF0FD;} + .d2-3940939446 .background-color-B6{background-color:#F7F8FE;} + .d2-3940939446 .background-color-AA2{background-color:#4A6FF3;} + .d2-3940939446 .background-color-AA4{background-color:#EDF0FD;} + .d2-3940939446 .background-color-AA5{background-color:#F7F8FE;} + .d2-3940939446 .background-color-AB4{background-color:#EDF0FD;} + .d2-3940939446 .background-color-AB5{background-color:#F7F8FE;} + .d2-3940939446 .color-N1{color:#0A0F25;} + .d2-3940939446 .color-N2{color:#676C7E;} + .d2-3940939446 .color-N3{color:#9499AB;} + .d2-3940939446 .color-N4{color:#CFD2DD;} + .d2-3940939446 .color-N5{color:#DEE1EB;} + .d2-3940939446 .color-N6{color:#EEF1F8;} + .d2-3940939446 .color-N7{color:#FFFFFF;} + .d2-3940939446 .color-B1{color:#0D32B2;} + .d2-3940939446 .color-B2{color:#0D32B2;} + .d2-3940939446 .color-B3{color:#E3E9FD;} + .d2-3940939446 .color-B4{color:#E3E9FD;} + .d2-3940939446 .color-B5{color:#EDF0FD;} + .d2-3940939446 .color-B6{color:#F7F8FE;} + .d2-3940939446 .color-AA2{color:#4A6FF3;} + .d2-3940939446 .color-AA4{color:#EDF0FD;} + .d2-3940939446 .color-AA5{color:#F7F8FE;} + .d2-3940939446 .color-AB4{color:#EDF0FD;} + .d2-3940939446 .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}]]>RefreshAuthorizationPolicyProtocolServerSideTranslatorProtocolBufferRefreshAuthorizationPolicyCacheRefreshAuthorizationPolicyCacheok \ No newline at end of file diff --git a/e2etests/testdata/regression/only_header_class_table/elk/board.exp.json b/e2etests/testdata/regression/only_header_class_table/elk/board.exp.json index d30ca4428..978739f12 100644 --- a/e2etests/testdata/regression/only_header_class_table/elk/board.exp.json +++ b/e2etests/testdata/regression/only_header_class_table/elk/board.exp.json @@ -141,7 +141,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "", + "constraint": null, "reference": "" } ], diff --git a/e2etests/testdata/regression/only_header_class_table/elk/sketch.exp.svg b/e2etests/testdata/regression/only_header_class_table/elk/sketch.exp.svg index 85939bdfc..dc59f1ece 100644 --- a/e2etests/testdata/regression/only_header_class_table/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/only_header_class_table/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -RefreshAuthorizationPolicyProtocolServerSideTranslatorProtocolBufferRefreshAuthorizationPolicyCacheRefreshAuthorizationPolicyCacheok + .d2-3935436195 .fill-N1{fill:#0A0F25;} + .d2-3935436195 .fill-N2{fill:#676C7E;} + .d2-3935436195 .fill-N3{fill:#9499AB;} + .d2-3935436195 .fill-N4{fill:#CFD2DD;} + .d2-3935436195 .fill-N5{fill:#DEE1EB;} + .d2-3935436195 .fill-N6{fill:#EEF1F8;} + .d2-3935436195 .fill-N7{fill:#FFFFFF;} + .d2-3935436195 .fill-B1{fill:#0D32B2;} + .d2-3935436195 .fill-B2{fill:#0D32B2;} + .d2-3935436195 .fill-B3{fill:#E3E9FD;} + .d2-3935436195 .fill-B4{fill:#E3E9FD;} + .d2-3935436195 .fill-B5{fill:#EDF0FD;} + .d2-3935436195 .fill-B6{fill:#F7F8FE;} + .d2-3935436195 .fill-AA2{fill:#4A6FF3;} + .d2-3935436195 .fill-AA4{fill:#EDF0FD;} + .d2-3935436195 .fill-AA5{fill:#F7F8FE;} + .d2-3935436195 .fill-AB4{fill:#EDF0FD;} + .d2-3935436195 .fill-AB5{fill:#F7F8FE;} + .d2-3935436195 .stroke-N1{stroke:#0A0F25;} + .d2-3935436195 .stroke-N2{stroke:#676C7E;} + .d2-3935436195 .stroke-N3{stroke:#9499AB;} + .d2-3935436195 .stroke-N4{stroke:#CFD2DD;} + .d2-3935436195 .stroke-N5{stroke:#DEE1EB;} + .d2-3935436195 .stroke-N6{stroke:#EEF1F8;} + .d2-3935436195 .stroke-N7{stroke:#FFFFFF;} + .d2-3935436195 .stroke-B1{stroke:#0D32B2;} + .d2-3935436195 .stroke-B2{stroke:#0D32B2;} + .d2-3935436195 .stroke-B3{stroke:#E3E9FD;} + .d2-3935436195 .stroke-B4{stroke:#E3E9FD;} + .d2-3935436195 .stroke-B5{stroke:#EDF0FD;} + .d2-3935436195 .stroke-B6{stroke:#F7F8FE;} + .d2-3935436195 .stroke-AA2{stroke:#4A6FF3;} + .d2-3935436195 .stroke-AA4{stroke:#EDF0FD;} + .d2-3935436195 .stroke-AA5{stroke:#F7F8FE;} + .d2-3935436195 .stroke-AB4{stroke:#EDF0FD;} + .d2-3935436195 .stroke-AB5{stroke:#F7F8FE;} + .d2-3935436195 .background-color-N1{background-color:#0A0F25;} + .d2-3935436195 .background-color-N2{background-color:#676C7E;} + .d2-3935436195 .background-color-N3{background-color:#9499AB;} + .d2-3935436195 .background-color-N4{background-color:#CFD2DD;} + .d2-3935436195 .background-color-N5{background-color:#DEE1EB;} + .d2-3935436195 .background-color-N6{background-color:#EEF1F8;} + .d2-3935436195 .background-color-N7{background-color:#FFFFFF;} + .d2-3935436195 .background-color-B1{background-color:#0D32B2;} + .d2-3935436195 .background-color-B2{background-color:#0D32B2;} + .d2-3935436195 .background-color-B3{background-color:#E3E9FD;} + .d2-3935436195 .background-color-B4{background-color:#E3E9FD;} + .d2-3935436195 .background-color-B5{background-color:#EDF0FD;} + .d2-3935436195 .background-color-B6{background-color:#F7F8FE;} + .d2-3935436195 .background-color-AA2{background-color:#4A6FF3;} + .d2-3935436195 .background-color-AA4{background-color:#EDF0FD;} + .d2-3935436195 .background-color-AA5{background-color:#F7F8FE;} + .d2-3935436195 .background-color-AB4{background-color:#EDF0FD;} + .d2-3935436195 .background-color-AB5{background-color:#F7F8FE;} + .d2-3935436195 .color-N1{color:#0A0F25;} + .d2-3935436195 .color-N2{color:#676C7E;} + .d2-3935436195 .color-N3{color:#9499AB;} + .d2-3935436195 .color-N4{color:#CFD2DD;} + .d2-3935436195 .color-N5{color:#DEE1EB;} + .d2-3935436195 .color-N6{color:#EEF1F8;} + .d2-3935436195 .color-N7{color:#FFFFFF;} + .d2-3935436195 .color-B1{color:#0D32B2;} + .d2-3935436195 .color-B2{color:#0D32B2;} + .d2-3935436195 .color-B3{color:#E3E9FD;} + .d2-3935436195 .color-B4{color:#E3E9FD;} + .d2-3935436195 .color-B5{color:#EDF0FD;} + .d2-3935436195 .color-B6{color:#F7F8FE;} + .d2-3935436195 .color-AA2{color:#4A6FF3;} + .d2-3935436195 .color-AA4{color:#EDF0FD;} + .d2-3935436195 .color-AA5{color:#F7F8FE;} + .d2-3935436195 .color-AB4{color:#EDF0FD;} + .d2-3935436195 .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}]]>RefreshAuthorizationPolicyProtocolServerSideTranslatorProtocolBufferRefreshAuthorizationPolicyCacheRefreshAuthorizationPolicyCacheok \ No newline at end of file diff --git a/e2etests/testdata/regression/sql_table_overflow/dagre/board.exp.json b/e2etests/testdata/regression/sql_table_overflow/dagre/board.exp.json index 4433d76ae..937116c15 100644 --- a/e2etests/testdata/regression/sql_table_overflow/dagre/board.exp.json +++ b/e2etests/testdata/regression/sql_table_overflow/dagre/board.exp.json @@ -55,7 +55,7 @@ "labelWidth": 242, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -83,7 +83,7 @@ "labelWidth": 45, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], @@ -155,7 +155,9 @@ "labelWidth": 242, "labelHeight": 26 }, - "constraint": "unique", + "constraint": [ + "unique" + ], "reference": "" }, { @@ -183,7 +185,9 @@ "labelWidth": 45, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" } ], diff --git a/e2etests/testdata/regression/sql_table_overflow/dagre/sketch.exp.svg b/e2etests/testdata/regression/sql_table_overflow/dagre/sketch.exp.svg index abfa1f184..6504e9f42 100644 --- a/e2etests/testdata/regression/sql_table_overflow/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/sql_table_overflow/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -sql_table_overflowshortloooooooooooooooooooongloooooooooooooooooooongshortsql_table_constrained_overflowshortloooooooooooooooooooongUNQloooooooooooooooooooongshortFK + .d2-2606580960 .fill-N1{fill:#0A0F25;} + .d2-2606580960 .fill-N2{fill:#676C7E;} + .d2-2606580960 .fill-N3{fill:#9499AB;} + .d2-2606580960 .fill-N4{fill:#CFD2DD;} + .d2-2606580960 .fill-N5{fill:#DEE1EB;} + .d2-2606580960 .fill-N6{fill:#EEF1F8;} + .d2-2606580960 .fill-N7{fill:#FFFFFF;} + .d2-2606580960 .fill-B1{fill:#0D32B2;} + .d2-2606580960 .fill-B2{fill:#0D32B2;} + .d2-2606580960 .fill-B3{fill:#E3E9FD;} + .d2-2606580960 .fill-B4{fill:#E3E9FD;} + .d2-2606580960 .fill-B5{fill:#EDF0FD;} + .d2-2606580960 .fill-B6{fill:#F7F8FE;} + .d2-2606580960 .fill-AA2{fill:#4A6FF3;} + .d2-2606580960 .fill-AA4{fill:#EDF0FD;} + .d2-2606580960 .fill-AA5{fill:#F7F8FE;} + .d2-2606580960 .fill-AB4{fill:#EDF0FD;} + .d2-2606580960 .fill-AB5{fill:#F7F8FE;} + .d2-2606580960 .stroke-N1{stroke:#0A0F25;} + .d2-2606580960 .stroke-N2{stroke:#676C7E;} + .d2-2606580960 .stroke-N3{stroke:#9499AB;} + .d2-2606580960 .stroke-N4{stroke:#CFD2DD;} + .d2-2606580960 .stroke-N5{stroke:#DEE1EB;} + .d2-2606580960 .stroke-N6{stroke:#EEF1F8;} + .d2-2606580960 .stroke-N7{stroke:#FFFFFF;} + .d2-2606580960 .stroke-B1{stroke:#0D32B2;} + .d2-2606580960 .stroke-B2{stroke:#0D32B2;} + .d2-2606580960 .stroke-B3{stroke:#E3E9FD;} + .d2-2606580960 .stroke-B4{stroke:#E3E9FD;} + .d2-2606580960 .stroke-B5{stroke:#EDF0FD;} + .d2-2606580960 .stroke-B6{stroke:#F7F8FE;} + .d2-2606580960 .stroke-AA2{stroke:#4A6FF3;} + .d2-2606580960 .stroke-AA4{stroke:#EDF0FD;} + .d2-2606580960 .stroke-AA5{stroke:#F7F8FE;} + .d2-2606580960 .stroke-AB4{stroke:#EDF0FD;} + .d2-2606580960 .stroke-AB5{stroke:#F7F8FE;} + .d2-2606580960 .background-color-N1{background-color:#0A0F25;} + .d2-2606580960 .background-color-N2{background-color:#676C7E;} + .d2-2606580960 .background-color-N3{background-color:#9499AB;} + .d2-2606580960 .background-color-N4{background-color:#CFD2DD;} + .d2-2606580960 .background-color-N5{background-color:#DEE1EB;} + .d2-2606580960 .background-color-N6{background-color:#EEF1F8;} + .d2-2606580960 .background-color-N7{background-color:#FFFFFF;} + .d2-2606580960 .background-color-B1{background-color:#0D32B2;} + .d2-2606580960 .background-color-B2{background-color:#0D32B2;} + .d2-2606580960 .background-color-B3{background-color:#E3E9FD;} + .d2-2606580960 .background-color-B4{background-color:#E3E9FD;} + .d2-2606580960 .background-color-B5{background-color:#EDF0FD;} + .d2-2606580960 .background-color-B6{background-color:#F7F8FE;} + .d2-2606580960 .background-color-AA2{background-color:#4A6FF3;} + .d2-2606580960 .background-color-AA4{background-color:#EDF0FD;} + .d2-2606580960 .background-color-AA5{background-color:#F7F8FE;} + .d2-2606580960 .background-color-AB4{background-color:#EDF0FD;} + .d2-2606580960 .background-color-AB5{background-color:#F7F8FE;} + .d2-2606580960 .color-N1{color:#0A0F25;} + .d2-2606580960 .color-N2{color:#676C7E;} + .d2-2606580960 .color-N3{color:#9499AB;} + .d2-2606580960 .color-N4{color:#CFD2DD;} + .d2-2606580960 .color-N5{color:#DEE1EB;} + .d2-2606580960 .color-N6{color:#EEF1F8;} + .d2-2606580960 .color-N7{color:#FFFFFF;} + .d2-2606580960 .color-B1{color:#0D32B2;} + .d2-2606580960 .color-B2{color:#0D32B2;} + .d2-2606580960 .color-B3{color:#E3E9FD;} + .d2-2606580960 .color-B4{color:#E3E9FD;} + .d2-2606580960 .color-B5{color:#EDF0FD;} + .d2-2606580960 .color-B6{color:#F7F8FE;} + .d2-2606580960 .color-AA2{color:#4A6FF3;} + .d2-2606580960 .color-AA4{color:#EDF0FD;} + .d2-2606580960 .color-AA5{color:#F7F8FE;} + .d2-2606580960 .color-AB4{color:#EDF0FD;} + .d2-2606580960 .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}]]>sql_table_overflowshortloooooooooooooooooooongloooooooooooooooooooongshortsql_table_constrained_overflowshortloooooooooooooooooooongUNQloooooooooooooooooooongshortFK \ No newline at end of file diff --git a/e2etests/testdata/regression/sql_table_overflow/elk/board.exp.json b/e2etests/testdata/regression/sql_table_overflow/elk/board.exp.json index b68be23ec..c4ddc7c1b 100644 --- a/e2etests/testdata/regression/sql_table_overflow/elk/board.exp.json +++ b/e2etests/testdata/regression/sql_table_overflow/elk/board.exp.json @@ -55,7 +55,7 @@ "labelWidth": 242, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -83,7 +83,7 @@ "labelWidth": 45, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], @@ -155,7 +155,9 @@ "labelWidth": 242, "labelHeight": 26 }, - "constraint": "unique", + "constraint": [ + "unique" + ], "reference": "" }, { @@ -183,7 +185,9 @@ "labelWidth": 45, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" } ], diff --git a/e2etests/testdata/regression/sql_table_overflow/elk/sketch.exp.svg b/e2etests/testdata/regression/sql_table_overflow/elk/sketch.exp.svg index e1a13f471..1cd74f696 100644 --- a/e2etests/testdata/regression/sql_table_overflow/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/sql_table_overflow/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -sql_table_overflowshortloooooooooooooooooooongloooooooooooooooooooongshortsql_table_constrained_overflowshortloooooooooooooooooooongUNQloooooooooooooooooooongshortFK + .d2-3947134090 .fill-N1{fill:#0A0F25;} + .d2-3947134090 .fill-N2{fill:#676C7E;} + .d2-3947134090 .fill-N3{fill:#9499AB;} + .d2-3947134090 .fill-N4{fill:#CFD2DD;} + .d2-3947134090 .fill-N5{fill:#DEE1EB;} + .d2-3947134090 .fill-N6{fill:#EEF1F8;} + .d2-3947134090 .fill-N7{fill:#FFFFFF;} + .d2-3947134090 .fill-B1{fill:#0D32B2;} + .d2-3947134090 .fill-B2{fill:#0D32B2;} + .d2-3947134090 .fill-B3{fill:#E3E9FD;} + .d2-3947134090 .fill-B4{fill:#E3E9FD;} + .d2-3947134090 .fill-B5{fill:#EDF0FD;} + .d2-3947134090 .fill-B6{fill:#F7F8FE;} + .d2-3947134090 .fill-AA2{fill:#4A6FF3;} + .d2-3947134090 .fill-AA4{fill:#EDF0FD;} + .d2-3947134090 .fill-AA5{fill:#F7F8FE;} + .d2-3947134090 .fill-AB4{fill:#EDF0FD;} + .d2-3947134090 .fill-AB5{fill:#F7F8FE;} + .d2-3947134090 .stroke-N1{stroke:#0A0F25;} + .d2-3947134090 .stroke-N2{stroke:#676C7E;} + .d2-3947134090 .stroke-N3{stroke:#9499AB;} + .d2-3947134090 .stroke-N4{stroke:#CFD2DD;} + .d2-3947134090 .stroke-N5{stroke:#DEE1EB;} + .d2-3947134090 .stroke-N6{stroke:#EEF1F8;} + .d2-3947134090 .stroke-N7{stroke:#FFFFFF;} + .d2-3947134090 .stroke-B1{stroke:#0D32B2;} + .d2-3947134090 .stroke-B2{stroke:#0D32B2;} + .d2-3947134090 .stroke-B3{stroke:#E3E9FD;} + .d2-3947134090 .stroke-B4{stroke:#E3E9FD;} + .d2-3947134090 .stroke-B5{stroke:#EDF0FD;} + .d2-3947134090 .stroke-B6{stroke:#F7F8FE;} + .d2-3947134090 .stroke-AA2{stroke:#4A6FF3;} + .d2-3947134090 .stroke-AA4{stroke:#EDF0FD;} + .d2-3947134090 .stroke-AA5{stroke:#F7F8FE;} + .d2-3947134090 .stroke-AB4{stroke:#EDF0FD;} + .d2-3947134090 .stroke-AB5{stroke:#F7F8FE;} + .d2-3947134090 .background-color-N1{background-color:#0A0F25;} + .d2-3947134090 .background-color-N2{background-color:#676C7E;} + .d2-3947134090 .background-color-N3{background-color:#9499AB;} + .d2-3947134090 .background-color-N4{background-color:#CFD2DD;} + .d2-3947134090 .background-color-N5{background-color:#DEE1EB;} + .d2-3947134090 .background-color-N6{background-color:#EEF1F8;} + .d2-3947134090 .background-color-N7{background-color:#FFFFFF;} + .d2-3947134090 .background-color-B1{background-color:#0D32B2;} + .d2-3947134090 .background-color-B2{background-color:#0D32B2;} + .d2-3947134090 .background-color-B3{background-color:#E3E9FD;} + .d2-3947134090 .background-color-B4{background-color:#E3E9FD;} + .d2-3947134090 .background-color-B5{background-color:#EDF0FD;} + .d2-3947134090 .background-color-B6{background-color:#F7F8FE;} + .d2-3947134090 .background-color-AA2{background-color:#4A6FF3;} + .d2-3947134090 .background-color-AA4{background-color:#EDF0FD;} + .d2-3947134090 .background-color-AA5{background-color:#F7F8FE;} + .d2-3947134090 .background-color-AB4{background-color:#EDF0FD;} + .d2-3947134090 .background-color-AB5{background-color:#F7F8FE;} + .d2-3947134090 .color-N1{color:#0A0F25;} + .d2-3947134090 .color-N2{color:#676C7E;} + .d2-3947134090 .color-N3{color:#9499AB;} + .d2-3947134090 .color-N4{color:#CFD2DD;} + .d2-3947134090 .color-N5{color:#DEE1EB;} + .d2-3947134090 .color-N6{color:#EEF1F8;} + .d2-3947134090 .color-N7{color:#FFFFFF;} + .d2-3947134090 .color-B1{color:#0D32B2;} + .d2-3947134090 .color-B2{color:#0D32B2;} + .d2-3947134090 .color-B3{color:#E3E9FD;} + .d2-3947134090 .color-B4{color:#E3E9FD;} + .d2-3947134090 .color-B5{color:#EDF0FD;} + .d2-3947134090 .color-B6{color:#F7F8FE;} + .d2-3947134090 .color-AA2{color:#4A6FF3;} + .d2-3947134090 .color-AA4{color:#EDF0FD;} + .d2-3947134090 .color-AA5{color:#F7F8FE;} + .d2-3947134090 .color-AB4{color:#EDF0FD;} + .d2-3947134090 .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}]]>sql_table_overflowshortloooooooooooooooooooongloooooooooooooooooooongshortsql_table_constrained_overflowshortloooooooooooooooooooongUNQloooooooooooooooooooongshortFK \ No newline at end of file diff --git a/e2etests/testdata/regression/unnamed_class_table_code/dagre/board.exp.json b/e2etests/testdata/regression/unnamed_class_table_code/dagre/board.exp.json index 74fa3cf47..1f783180d 100644 --- a/e2etests/testdata/regression/unnamed_class_table_code/dagre/board.exp.json +++ b/e2etests/testdata/regression/unnamed_class_table_code/dagre/board.exp.json @@ -130,7 +130,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -158,7 +158,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -186,7 +186,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -214,7 +214,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -242,7 +242,7 @@ "labelWidth": 77, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], diff --git a/e2etests/testdata/regression/unnamed_class_table_code/dagre/sketch.exp.svg b/e2etests/testdata/regression/unnamed_class_table_code/dagre/sketch.exp.svg index 6d7364667..b8f31fca0 100644 --- a/e2etests/testdata/regression/unnamed_class_table_code/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/unnamed_class_table_code/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ --numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetimea := 5 + .d2-4221205655 .fill-N1{fill:#0A0F25;} + .d2-4221205655 .fill-N2{fill:#676C7E;} + .d2-4221205655 .fill-N3{fill:#9499AB;} + .d2-4221205655 .fill-N4{fill:#CFD2DD;} + .d2-4221205655 .fill-N5{fill:#DEE1EB;} + .d2-4221205655 .fill-N6{fill:#EEF1F8;} + .d2-4221205655 .fill-N7{fill:#FFFFFF;} + .d2-4221205655 .fill-B1{fill:#0D32B2;} + .d2-4221205655 .fill-B2{fill:#0D32B2;} + .d2-4221205655 .fill-B3{fill:#E3E9FD;} + .d2-4221205655 .fill-B4{fill:#E3E9FD;} + .d2-4221205655 .fill-B5{fill:#EDF0FD;} + .d2-4221205655 .fill-B6{fill:#F7F8FE;} + .d2-4221205655 .fill-AA2{fill:#4A6FF3;} + .d2-4221205655 .fill-AA4{fill:#EDF0FD;} + .d2-4221205655 .fill-AA5{fill:#F7F8FE;} + .d2-4221205655 .fill-AB4{fill:#EDF0FD;} + .d2-4221205655 .fill-AB5{fill:#F7F8FE;} + .d2-4221205655 .stroke-N1{stroke:#0A0F25;} + .d2-4221205655 .stroke-N2{stroke:#676C7E;} + .d2-4221205655 .stroke-N3{stroke:#9499AB;} + .d2-4221205655 .stroke-N4{stroke:#CFD2DD;} + .d2-4221205655 .stroke-N5{stroke:#DEE1EB;} + .d2-4221205655 .stroke-N6{stroke:#EEF1F8;} + .d2-4221205655 .stroke-N7{stroke:#FFFFFF;} + .d2-4221205655 .stroke-B1{stroke:#0D32B2;} + .d2-4221205655 .stroke-B2{stroke:#0D32B2;} + .d2-4221205655 .stroke-B3{stroke:#E3E9FD;} + .d2-4221205655 .stroke-B4{stroke:#E3E9FD;} + .d2-4221205655 .stroke-B5{stroke:#EDF0FD;} + .d2-4221205655 .stroke-B6{stroke:#F7F8FE;} + .d2-4221205655 .stroke-AA2{stroke:#4A6FF3;} + .d2-4221205655 .stroke-AA4{stroke:#EDF0FD;} + .d2-4221205655 .stroke-AA5{stroke:#F7F8FE;} + .d2-4221205655 .stroke-AB4{stroke:#EDF0FD;} + .d2-4221205655 .stroke-AB5{stroke:#F7F8FE;} + .d2-4221205655 .background-color-N1{background-color:#0A0F25;} + .d2-4221205655 .background-color-N2{background-color:#676C7E;} + .d2-4221205655 .background-color-N3{background-color:#9499AB;} + .d2-4221205655 .background-color-N4{background-color:#CFD2DD;} + .d2-4221205655 .background-color-N5{background-color:#DEE1EB;} + .d2-4221205655 .background-color-N6{background-color:#EEF1F8;} + .d2-4221205655 .background-color-N7{background-color:#FFFFFF;} + .d2-4221205655 .background-color-B1{background-color:#0D32B2;} + .d2-4221205655 .background-color-B2{background-color:#0D32B2;} + .d2-4221205655 .background-color-B3{background-color:#E3E9FD;} + .d2-4221205655 .background-color-B4{background-color:#E3E9FD;} + .d2-4221205655 .background-color-B5{background-color:#EDF0FD;} + .d2-4221205655 .background-color-B6{background-color:#F7F8FE;} + .d2-4221205655 .background-color-AA2{background-color:#4A6FF3;} + .d2-4221205655 .background-color-AA4{background-color:#EDF0FD;} + .d2-4221205655 .background-color-AA5{background-color:#F7F8FE;} + .d2-4221205655 .background-color-AB4{background-color:#EDF0FD;} + .d2-4221205655 .background-color-AB5{background-color:#F7F8FE;} + .d2-4221205655 .color-N1{color:#0A0F25;} + .d2-4221205655 .color-N2{color:#676C7E;} + .d2-4221205655 .color-N3{color:#9499AB;} + .d2-4221205655 .color-N4{color:#CFD2DD;} + .d2-4221205655 .color-N5{color:#DEE1EB;} + .d2-4221205655 .color-N6{color:#EEF1F8;} + .d2-4221205655 .color-N7{color:#FFFFFF;} + .d2-4221205655 .color-B1{color:#0D32B2;} + .d2-4221205655 .color-B2{color:#0D32B2;} + .d2-4221205655 .color-B3{color:#E3E9FD;} + .d2-4221205655 .color-B4{color:#E3E9FD;} + .d2-4221205655 .color-B5{color:#EDF0FD;} + .d2-4221205655 .color-B6{color:#F7F8FE;} + .d2-4221205655 .color-AA2{color:#4A6FF3;} + .d2-4221205655 .color-AA4{color:#EDF0FD;} + .d2-4221205655 .color-AA5{color:#F7F8FE;} + .d2-4221205655 .color-AB4{color:#EDF0FD;} + .d2-4221205655 .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}]]>-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetimea := 5 b := a + 7 fmt.Printf("%d", b)a := 5 b := a + 7 -fmt.Printf("%d", b) +fmt.Printf("%d", b) \ No newline at end of file diff --git a/e2etests/testdata/regression/unnamed_class_table_code/elk/board.exp.json b/e2etests/testdata/regression/unnamed_class_table_code/elk/board.exp.json index 377e5f144..115ff55e5 100644 --- a/e2etests/testdata/regression/unnamed_class_table_code/elk/board.exp.json +++ b/e2etests/testdata/regression/unnamed_class_table_code/elk/board.exp.json @@ -130,7 +130,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -158,7 +158,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -186,7 +186,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -214,7 +214,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -242,7 +242,7 @@ "labelWidth": 77, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], diff --git a/e2etests/testdata/regression/unnamed_class_table_code/elk/sketch.exp.svg b/e2etests/testdata/regression/unnamed_class_table_code/elk/sketch.exp.svg index f7f7fff6c..21eb65127 100644 --- a/e2etests/testdata/regression/unnamed_class_table_code/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/unnamed_class_table_code/elk/sketch.exp.svg @@ -1,23 +1,23 @@ --numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetimea := 5 + .d2-2359991916 .fill-N1{fill:#0A0F25;} + .d2-2359991916 .fill-N2{fill:#676C7E;} + .d2-2359991916 .fill-N3{fill:#9499AB;} + .d2-2359991916 .fill-N4{fill:#CFD2DD;} + .d2-2359991916 .fill-N5{fill:#DEE1EB;} + .d2-2359991916 .fill-N6{fill:#EEF1F8;} + .d2-2359991916 .fill-N7{fill:#FFFFFF;} + .d2-2359991916 .fill-B1{fill:#0D32B2;} + .d2-2359991916 .fill-B2{fill:#0D32B2;} + .d2-2359991916 .fill-B3{fill:#E3E9FD;} + .d2-2359991916 .fill-B4{fill:#E3E9FD;} + .d2-2359991916 .fill-B5{fill:#EDF0FD;} + .d2-2359991916 .fill-B6{fill:#F7F8FE;} + .d2-2359991916 .fill-AA2{fill:#4A6FF3;} + .d2-2359991916 .fill-AA4{fill:#EDF0FD;} + .d2-2359991916 .fill-AA5{fill:#F7F8FE;} + .d2-2359991916 .fill-AB4{fill:#EDF0FD;} + .d2-2359991916 .fill-AB5{fill:#F7F8FE;} + .d2-2359991916 .stroke-N1{stroke:#0A0F25;} + .d2-2359991916 .stroke-N2{stroke:#676C7E;} + .d2-2359991916 .stroke-N3{stroke:#9499AB;} + .d2-2359991916 .stroke-N4{stroke:#CFD2DD;} + .d2-2359991916 .stroke-N5{stroke:#DEE1EB;} + .d2-2359991916 .stroke-N6{stroke:#EEF1F8;} + .d2-2359991916 .stroke-N7{stroke:#FFFFFF;} + .d2-2359991916 .stroke-B1{stroke:#0D32B2;} + .d2-2359991916 .stroke-B2{stroke:#0D32B2;} + .d2-2359991916 .stroke-B3{stroke:#E3E9FD;} + .d2-2359991916 .stroke-B4{stroke:#E3E9FD;} + .d2-2359991916 .stroke-B5{stroke:#EDF0FD;} + .d2-2359991916 .stroke-B6{stroke:#F7F8FE;} + .d2-2359991916 .stroke-AA2{stroke:#4A6FF3;} + .d2-2359991916 .stroke-AA4{stroke:#EDF0FD;} + .d2-2359991916 .stroke-AA5{stroke:#F7F8FE;} + .d2-2359991916 .stroke-AB4{stroke:#EDF0FD;} + .d2-2359991916 .stroke-AB5{stroke:#F7F8FE;} + .d2-2359991916 .background-color-N1{background-color:#0A0F25;} + .d2-2359991916 .background-color-N2{background-color:#676C7E;} + .d2-2359991916 .background-color-N3{background-color:#9499AB;} + .d2-2359991916 .background-color-N4{background-color:#CFD2DD;} + .d2-2359991916 .background-color-N5{background-color:#DEE1EB;} + .d2-2359991916 .background-color-N6{background-color:#EEF1F8;} + .d2-2359991916 .background-color-N7{background-color:#FFFFFF;} + .d2-2359991916 .background-color-B1{background-color:#0D32B2;} + .d2-2359991916 .background-color-B2{background-color:#0D32B2;} + .d2-2359991916 .background-color-B3{background-color:#E3E9FD;} + .d2-2359991916 .background-color-B4{background-color:#E3E9FD;} + .d2-2359991916 .background-color-B5{background-color:#EDF0FD;} + .d2-2359991916 .background-color-B6{background-color:#F7F8FE;} + .d2-2359991916 .background-color-AA2{background-color:#4A6FF3;} + .d2-2359991916 .background-color-AA4{background-color:#EDF0FD;} + .d2-2359991916 .background-color-AA5{background-color:#F7F8FE;} + .d2-2359991916 .background-color-AB4{background-color:#EDF0FD;} + .d2-2359991916 .background-color-AB5{background-color:#F7F8FE;} + .d2-2359991916 .color-N1{color:#0A0F25;} + .d2-2359991916 .color-N2{color:#676C7E;} + .d2-2359991916 .color-N3{color:#9499AB;} + .d2-2359991916 .color-N4{color:#CFD2DD;} + .d2-2359991916 .color-N5{color:#DEE1EB;} + .d2-2359991916 .color-N6{color:#EEF1F8;} + .d2-2359991916 .color-N7{color:#FFFFFF;} + .d2-2359991916 .color-B1{color:#0D32B2;} + .d2-2359991916 .color-B2{color:#0D32B2;} + .d2-2359991916 .color-B3{color:#E3E9FD;} + .d2-2359991916 .color-B4{color:#E3E9FD;} + .d2-2359991916 .color-B5{color:#EDF0FD;} + .d2-2359991916 .color-B6{color:#F7F8FE;} + .d2-2359991916 .color-AA2{color:#4A6FF3;} + .d2-2359991916 .color-AA4{color:#EDF0FD;} + .d2-2359991916 .color-AA5{color:#F7F8FE;} + .d2-2359991916 .color-AB4{color:#EDF0FD;} + .d2-2359991916 .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}]]>-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetimea := 5 b := a + 7 fmt.Printf("%d", b)a := 5 b := a + 7 -fmt.Printf("%d", b) +fmt.Printf("%d", b) \ No newline at end of file diff --git a/e2etests/testdata/stable/array-classes/dagre/board.exp.json b/e2etests/testdata/stable/array-classes/dagre/board.exp.json index b3149b051..ffb9d427e 100644 --- a/e2etests/testdata/stable/array-classes/dagre/board.exp.json +++ b/e2etests/testdata/stable/array-classes/dagre/board.exp.json @@ -6,6 +6,10 @@ { "id": "yay", "type": "rectangle", + "classes": [ + "button", + "success" + ], "pos": { "x": 0, "y": 0 @@ -47,6 +51,10 @@ { "id": "nay", "type": "rectangle", + "classes": [ + "button", + "error" + ], "pos": { "x": 180, "y": 0 diff --git a/e2etests/testdata/stable/array-classes/dagre/sketch.exp.svg b/e2etests/testdata/stable/array-classes/dagre/sketch.exp.svg index e9f07e5c5..345f0e650 100644 --- a/e2etests/testdata/stable/array-classes/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/array-classes/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -SuccessfulFailure + .d2-2236180231 .fill-N1{fill:#0A0F25;} + .d2-2236180231 .fill-N2{fill:#676C7E;} + .d2-2236180231 .fill-N3{fill:#9499AB;} + .d2-2236180231 .fill-N4{fill:#CFD2DD;} + .d2-2236180231 .fill-N5{fill:#DEE1EB;} + .d2-2236180231 .fill-N6{fill:#EEF1F8;} + .d2-2236180231 .fill-N7{fill:#FFFFFF;} + .d2-2236180231 .fill-B1{fill:#0D32B2;} + .d2-2236180231 .fill-B2{fill:#0D32B2;} + .d2-2236180231 .fill-B3{fill:#E3E9FD;} + .d2-2236180231 .fill-B4{fill:#E3E9FD;} + .d2-2236180231 .fill-B5{fill:#EDF0FD;} + .d2-2236180231 .fill-B6{fill:#F7F8FE;} + .d2-2236180231 .fill-AA2{fill:#4A6FF3;} + .d2-2236180231 .fill-AA4{fill:#EDF0FD;} + .d2-2236180231 .fill-AA5{fill:#F7F8FE;} + .d2-2236180231 .fill-AB4{fill:#EDF0FD;} + .d2-2236180231 .fill-AB5{fill:#F7F8FE;} + .d2-2236180231 .stroke-N1{stroke:#0A0F25;} + .d2-2236180231 .stroke-N2{stroke:#676C7E;} + .d2-2236180231 .stroke-N3{stroke:#9499AB;} + .d2-2236180231 .stroke-N4{stroke:#CFD2DD;} + .d2-2236180231 .stroke-N5{stroke:#DEE1EB;} + .d2-2236180231 .stroke-N6{stroke:#EEF1F8;} + .d2-2236180231 .stroke-N7{stroke:#FFFFFF;} + .d2-2236180231 .stroke-B1{stroke:#0D32B2;} + .d2-2236180231 .stroke-B2{stroke:#0D32B2;} + .d2-2236180231 .stroke-B3{stroke:#E3E9FD;} + .d2-2236180231 .stroke-B4{stroke:#E3E9FD;} + .d2-2236180231 .stroke-B5{stroke:#EDF0FD;} + .d2-2236180231 .stroke-B6{stroke:#F7F8FE;} + .d2-2236180231 .stroke-AA2{stroke:#4A6FF3;} + .d2-2236180231 .stroke-AA4{stroke:#EDF0FD;} + .d2-2236180231 .stroke-AA5{stroke:#F7F8FE;} + .d2-2236180231 .stroke-AB4{stroke:#EDF0FD;} + .d2-2236180231 .stroke-AB5{stroke:#F7F8FE;} + .d2-2236180231 .background-color-N1{background-color:#0A0F25;} + .d2-2236180231 .background-color-N2{background-color:#676C7E;} + .d2-2236180231 .background-color-N3{background-color:#9499AB;} + .d2-2236180231 .background-color-N4{background-color:#CFD2DD;} + .d2-2236180231 .background-color-N5{background-color:#DEE1EB;} + .d2-2236180231 .background-color-N6{background-color:#EEF1F8;} + .d2-2236180231 .background-color-N7{background-color:#FFFFFF;} + .d2-2236180231 .background-color-B1{background-color:#0D32B2;} + .d2-2236180231 .background-color-B2{background-color:#0D32B2;} + .d2-2236180231 .background-color-B3{background-color:#E3E9FD;} + .d2-2236180231 .background-color-B4{background-color:#E3E9FD;} + .d2-2236180231 .background-color-B5{background-color:#EDF0FD;} + .d2-2236180231 .background-color-B6{background-color:#F7F8FE;} + .d2-2236180231 .background-color-AA2{background-color:#4A6FF3;} + .d2-2236180231 .background-color-AA4{background-color:#EDF0FD;} + .d2-2236180231 .background-color-AA5{background-color:#F7F8FE;} + .d2-2236180231 .background-color-AB4{background-color:#EDF0FD;} + .d2-2236180231 .background-color-AB5{background-color:#F7F8FE;} + .d2-2236180231 .color-N1{color:#0A0F25;} + .d2-2236180231 .color-N2{color:#676C7E;} + .d2-2236180231 .color-N3{color:#9499AB;} + .d2-2236180231 .color-N4{color:#CFD2DD;} + .d2-2236180231 .color-N5{color:#DEE1EB;} + .d2-2236180231 .color-N6{color:#EEF1F8;} + .d2-2236180231 .color-N7{color:#FFFFFF;} + .d2-2236180231 .color-B1{color:#0D32B2;} + .d2-2236180231 .color-B2{color:#0D32B2;} + .d2-2236180231 .color-B3{color:#E3E9FD;} + .d2-2236180231 .color-B4{color:#E3E9FD;} + .d2-2236180231 .color-B5{color:#EDF0FD;} + .d2-2236180231 .color-B6{color:#F7F8FE;} + .d2-2236180231 .color-AA2{color:#4A6FF3;} + .d2-2236180231 .color-AA4{color:#EDF0FD;} + .d2-2236180231 .color-AA5{color:#F7F8FE;} + .d2-2236180231 .color-AB4{color:#EDF0FD;} + .d2-2236180231 .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}]]>SuccessfulFailure \ No newline at end of file diff --git a/e2etests/testdata/stable/array-classes/elk/board.exp.json b/e2etests/testdata/stable/array-classes/elk/board.exp.json index c1e181894..9d1326c7a 100644 --- a/e2etests/testdata/stable/array-classes/elk/board.exp.json +++ b/e2etests/testdata/stable/array-classes/elk/board.exp.json @@ -6,6 +6,10 @@ { "id": "yay", "type": "rectangle", + "classes": [ + "button", + "success" + ], "pos": { "x": 12, "y": 12 @@ -47,6 +51,10 @@ { "id": "nay", "type": "rectangle", + "classes": [ + "button", + "error" + ], "pos": { "x": 152, "y": 12 diff --git a/e2etests/testdata/stable/array-classes/elk/sketch.exp.svg b/e2etests/testdata/stable/array-classes/elk/sketch.exp.svg index 939583be3..deacb3872 100644 --- a/e2etests/testdata/stable/array-classes/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/array-classes/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -SuccessfulFailure + .d2-2397487381 .fill-N1{fill:#0A0F25;} + .d2-2397487381 .fill-N2{fill:#676C7E;} + .d2-2397487381 .fill-N3{fill:#9499AB;} + .d2-2397487381 .fill-N4{fill:#CFD2DD;} + .d2-2397487381 .fill-N5{fill:#DEE1EB;} + .d2-2397487381 .fill-N6{fill:#EEF1F8;} + .d2-2397487381 .fill-N7{fill:#FFFFFF;} + .d2-2397487381 .fill-B1{fill:#0D32B2;} + .d2-2397487381 .fill-B2{fill:#0D32B2;} + .d2-2397487381 .fill-B3{fill:#E3E9FD;} + .d2-2397487381 .fill-B4{fill:#E3E9FD;} + .d2-2397487381 .fill-B5{fill:#EDF0FD;} + .d2-2397487381 .fill-B6{fill:#F7F8FE;} + .d2-2397487381 .fill-AA2{fill:#4A6FF3;} + .d2-2397487381 .fill-AA4{fill:#EDF0FD;} + .d2-2397487381 .fill-AA5{fill:#F7F8FE;} + .d2-2397487381 .fill-AB4{fill:#EDF0FD;} + .d2-2397487381 .fill-AB5{fill:#F7F8FE;} + .d2-2397487381 .stroke-N1{stroke:#0A0F25;} + .d2-2397487381 .stroke-N2{stroke:#676C7E;} + .d2-2397487381 .stroke-N3{stroke:#9499AB;} + .d2-2397487381 .stroke-N4{stroke:#CFD2DD;} + .d2-2397487381 .stroke-N5{stroke:#DEE1EB;} + .d2-2397487381 .stroke-N6{stroke:#EEF1F8;} + .d2-2397487381 .stroke-N7{stroke:#FFFFFF;} + .d2-2397487381 .stroke-B1{stroke:#0D32B2;} + .d2-2397487381 .stroke-B2{stroke:#0D32B2;} + .d2-2397487381 .stroke-B3{stroke:#E3E9FD;} + .d2-2397487381 .stroke-B4{stroke:#E3E9FD;} + .d2-2397487381 .stroke-B5{stroke:#EDF0FD;} + .d2-2397487381 .stroke-B6{stroke:#F7F8FE;} + .d2-2397487381 .stroke-AA2{stroke:#4A6FF3;} + .d2-2397487381 .stroke-AA4{stroke:#EDF0FD;} + .d2-2397487381 .stroke-AA5{stroke:#F7F8FE;} + .d2-2397487381 .stroke-AB4{stroke:#EDF0FD;} + .d2-2397487381 .stroke-AB5{stroke:#F7F8FE;} + .d2-2397487381 .background-color-N1{background-color:#0A0F25;} + .d2-2397487381 .background-color-N2{background-color:#676C7E;} + .d2-2397487381 .background-color-N3{background-color:#9499AB;} + .d2-2397487381 .background-color-N4{background-color:#CFD2DD;} + .d2-2397487381 .background-color-N5{background-color:#DEE1EB;} + .d2-2397487381 .background-color-N6{background-color:#EEF1F8;} + .d2-2397487381 .background-color-N7{background-color:#FFFFFF;} + .d2-2397487381 .background-color-B1{background-color:#0D32B2;} + .d2-2397487381 .background-color-B2{background-color:#0D32B2;} + .d2-2397487381 .background-color-B3{background-color:#E3E9FD;} + .d2-2397487381 .background-color-B4{background-color:#E3E9FD;} + .d2-2397487381 .background-color-B5{background-color:#EDF0FD;} + .d2-2397487381 .background-color-B6{background-color:#F7F8FE;} + .d2-2397487381 .background-color-AA2{background-color:#4A6FF3;} + .d2-2397487381 .background-color-AA4{background-color:#EDF0FD;} + .d2-2397487381 .background-color-AA5{background-color:#F7F8FE;} + .d2-2397487381 .background-color-AB4{background-color:#EDF0FD;} + .d2-2397487381 .background-color-AB5{background-color:#F7F8FE;} + .d2-2397487381 .color-N1{color:#0A0F25;} + .d2-2397487381 .color-N2{color:#676C7E;} + .d2-2397487381 .color-N3{color:#9499AB;} + .d2-2397487381 .color-N4{color:#CFD2DD;} + .d2-2397487381 .color-N5{color:#DEE1EB;} + .d2-2397487381 .color-N6{color:#EEF1F8;} + .d2-2397487381 .color-N7{color:#FFFFFF;} + .d2-2397487381 .color-B1{color:#0D32B2;} + .d2-2397487381 .color-B2{color:#0D32B2;} + .d2-2397487381 .color-B3{color:#E3E9FD;} + .d2-2397487381 .color-B4{color:#E3E9FD;} + .d2-2397487381 .color-B5{color:#EDF0FD;} + .d2-2397487381 .color-B6{color:#F7F8FE;} + .d2-2397487381 .color-AA2{color:#4A6FF3;} + .d2-2397487381 .color-AA4{color:#EDF0FD;} + .d2-2397487381 .color-AA5{color:#F7F8FE;} + .d2-2397487381 .color-AB4{color:#EDF0FD;} + .d2-2397487381 .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}]]>SuccessfulFailure \ No newline at end of file diff --git a/e2etests/testdata/stable/class_and_sqlTable_border_radius/dagre/board.exp.json b/e2etests/testdata/stable/class_and_sqlTable_border_radius/dagre/board.exp.json index 0836aabed..3d9ed2ba9 100644 --- a/e2etests/testdata/stable/class_and_sqlTable_border_radius/dagre/board.exp.json +++ b/e2etests/testdata/stable/class_and_sqlTable_border_radius/dagre/board.exp.json @@ -55,7 +55,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -83,7 +85,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" }, { @@ -111,7 +115,9 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "unique", + "constraint": [ + "unique" + ], "reference": "" }, { @@ -139,7 +145,7 @@ "labelWidth": 219, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], diff --git a/e2etests/testdata/stable/class_and_sqlTable_border_radius/dagre/sketch.exp.svg b/e2etests/testdata/stable/class_and_sqlTable_border_radius/dagre/sketch.exp.svg index 9ba6d5ad1..cae570d32 100644 --- a/e2etests/testdata/stable/class_and_sqlTable_border_radius/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/class_and_sqlTable_border_radius/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ - aidintPKdiskintFKjsonjsonbUNQlast_updatedtimestamp with time zone b+field[]string+method(a uint64)(x, y int) c d + .d2-3002275928 .fill-N1{fill:#0A0F25;} + .d2-3002275928 .fill-N2{fill:#676C7E;} + .d2-3002275928 .fill-N3{fill:#9499AB;} + .d2-3002275928 .fill-N4{fill:#CFD2DD;} + .d2-3002275928 .fill-N5{fill:#DEE1EB;} + .d2-3002275928 .fill-N6{fill:#EEF1F8;} + .d2-3002275928 .fill-N7{fill:#FFFFFF;} + .d2-3002275928 .fill-B1{fill:#0D32B2;} + .d2-3002275928 .fill-B2{fill:#0D32B2;} + .d2-3002275928 .fill-B3{fill:#E3E9FD;} + .d2-3002275928 .fill-B4{fill:#E3E9FD;} + .d2-3002275928 .fill-B5{fill:#EDF0FD;} + .d2-3002275928 .fill-B6{fill:#F7F8FE;} + .d2-3002275928 .fill-AA2{fill:#4A6FF3;} + .d2-3002275928 .fill-AA4{fill:#EDF0FD;} + .d2-3002275928 .fill-AA5{fill:#F7F8FE;} + .d2-3002275928 .fill-AB4{fill:#EDF0FD;} + .d2-3002275928 .fill-AB5{fill:#F7F8FE;} + .d2-3002275928 .stroke-N1{stroke:#0A0F25;} + .d2-3002275928 .stroke-N2{stroke:#676C7E;} + .d2-3002275928 .stroke-N3{stroke:#9499AB;} + .d2-3002275928 .stroke-N4{stroke:#CFD2DD;} + .d2-3002275928 .stroke-N5{stroke:#DEE1EB;} + .d2-3002275928 .stroke-N6{stroke:#EEF1F8;} + .d2-3002275928 .stroke-N7{stroke:#FFFFFF;} + .d2-3002275928 .stroke-B1{stroke:#0D32B2;} + .d2-3002275928 .stroke-B2{stroke:#0D32B2;} + .d2-3002275928 .stroke-B3{stroke:#E3E9FD;} + .d2-3002275928 .stroke-B4{stroke:#E3E9FD;} + .d2-3002275928 .stroke-B5{stroke:#EDF0FD;} + .d2-3002275928 .stroke-B6{stroke:#F7F8FE;} + .d2-3002275928 .stroke-AA2{stroke:#4A6FF3;} + .d2-3002275928 .stroke-AA4{stroke:#EDF0FD;} + .d2-3002275928 .stroke-AA5{stroke:#F7F8FE;} + .d2-3002275928 .stroke-AB4{stroke:#EDF0FD;} + .d2-3002275928 .stroke-AB5{stroke:#F7F8FE;} + .d2-3002275928 .background-color-N1{background-color:#0A0F25;} + .d2-3002275928 .background-color-N2{background-color:#676C7E;} + .d2-3002275928 .background-color-N3{background-color:#9499AB;} + .d2-3002275928 .background-color-N4{background-color:#CFD2DD;} + .d2-3002275928 .background-color-N5{background-color:#DEE1EB;} + .d2-3002275928 .background-color-N6{background-color:#EEF1F8;} + .d2-3002275928 .background-color-N7{background-color:#FFFFFF;} + .d2-3002275928 .background-color-B1{background-color:#0D32B2;} + .d2-3002275928 .background-color-B2{background-color:#0D32B2;} + .d2-3002275928 .background-color-B3{background-color:#E3E9FD;} + .d2-3002275928 .background-color-B4{background-color:#E3E9FD;} + .d2-3002275928 .background-color-B5{background-color:#EDF0FD;} + .d2-3002275928 .background-color-B6{background-color:#F7F8FE;} + .d2-3002275928 .background-color-AA2{background-color:#4A6FF3;} + .d2-3002275928 .background-color-AA4{background-color:#EDF0FD;} + .d2-3002275928 .background-color-AA5{background-color:#F7F8FE;} + .d2-3002275928 .background-color-AB4{background-color:#EDF0FD;} + .d2-3002275928 .background-color-AB5{background-color:#F7F8FE;} + .d2-3002275928 .color-N1{color:#0A0F25;} + .d2-3002275928 .color-N2{color:#676C7E;} + .d2-3002275928 .color-N3{color:#9499AB;} + .d2-3002275928 .color-N4{color:#CFD2DD;} + .d2-3002275928 .color-N5{color:#DEE1EB;} + .d2-3002275928 .color-N6{color:#EEF1F8;} + .d2-3002275928 .color-N7{color:#FFFFFF;} + .d2-3002275928 .color-B1{color:#0D32B2;} + .d2-3002275928 .color-B2{color:#0D32B2;} + .d2-3002275928 .color-B3{color:#E3E9FD;} + .d2-3002275928 .color-B4{color:#E3E9FD;} + .d2-3002275928 .color-B5{color:#EDF0FD;} + .d2-3002275928 .color-B6{color:#F7F8FE;} + .d2-3002275928 .color-AA2{color:#4A6FF3;} + .d2-3002275928 .color-AA4{color:#EDF0FD;} + .d2-3002275928 .color-AA5{color:#F7F8FE;} + .d2-3002275928 .color-AB4{color:#EDF0FD;} + .d2-3002275928 .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}]]> aidintPKdiskintFKjsonjsonbUNQlast_updatedtimestamp with time zone b+field[]string+method(a uint64)(x, y int) c d \ No newline at end of file diff --git a/e2etests/testdata/stable/class_and_sqlTable_border_radius/elk/board.exp.json b/e2etests/testdata/stable/class_and_sqlTable_border_radius/elk/board.exp.json index 557561b09..1b5822a06 100644 --- a/e2etests/testdata/stable/class_and_sqlTable_border_radius/elk/board.exp.json +++ b/e2etests/testdata/stable/class_and_sqlTable_border_radius/elk/board.exp.json @@ -55,7 +55,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -83,7 +85,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" }, { @@ -111,7 +115,9 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "unique", + "constraint": [ + "unique" + ], "reference": "" }, { @@ -139,7 +145,7 @@ "labelWidth": 219, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], diff --git a/e2etests/testdata/stable/class_and_sqlTable_border_radius/elk/sketch.exp.svg b/e2etests/testdata/stable/class_and_sqlTable_border_radius/elk/sketch.exp.svg index 52519382c..a873cde20 100644 --- a/e2etests/testdata/stable/class_and_sqlTable_border_radius/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/class_and_sqlTable_border_radius/elk/sketch.exp.svg @@ -1,16 +1,16 @@ - aidintPKdiskintFKjsonjsonbUNQlast_updatedtimestamp with time zone b+field[]string+method(a uint64)(x, y int) c d + .d2-3551662305 .fill-N1{fill:#0A0F25;} + .d2-3551662305 .fill-N2{fill:#676C7E;} + .d2-3551662305 .fill-N3{fill:#9499AB;} + .d2-3551662305 .fill-N4{fill:#CFD2DD;} + .d2-3551662305 .fill-N5{fill:#DEE1EB;} + .d2-3551662305 .fill-N6{fill:#EEF1F8;} + .d2-3551662305 .fill-N7{fill:#FFFFFF;} + .d2-3551662305 .fill-B1{fill:#0D32B2;} + .d2-3551662305 .fill-B2{fill:#0D32B2;} + .d2-3551662305 .fill-B3{fill:#E3E9FD;} + .d2-3551662305 .fill-B4{fill:#E3E9FD;} + .d2-3551662305 .fill-B5{fill:#EDF0FD;} + .d2-3551662305 .fill-B6{fill:#F7F8FE;} + .d2-3551662305 .fill-AA2{fill:#4A6FF3;} + .d2-3551662305 .fill-AA4{fill:#EDF0FD;} + .d2-3551662305 .fill-AA5{fill:#F7F8FE;} + .d2-3551662305 .fill-AB4{fill:#EDF0FD;} + .d2-3551662305 .fill-AB5{fill:#F7F8FE;} + .d2-3551662305 .stroke-N1{stroke:#0A0F25;} + .d2-3551662305 .stroke-N2{stroke:#676C7E;} + .d2-3551662305 .stroke-N3{stroke:#9499AB;} + .d2-3551662305 .stroke-N4{stroke:#CFD2DD;} + .d2-3551662305 .stroke-N5{stroke:#DEE1EB;} + .d2-3551662305 .stroke-N6{stroke:#EEF1F8;} + .d2-3551662305 .stroke-N7{stroke:#FFFFFF;} + .d2-3551662305 .stroke-B1{stroke:#0D32B2;} + .d2-3551662305 .stroke-B2{stroke:#0D32B2;} + .d2-3551662305 .stroke-B3{stroke:#E3E9FD;} + .d2-3551662305 .stroke-B4{stroke:#E3E9FD;} + .d2-3551662305 .stroke-B5{stroke:#EDF0FD;} + .d2-3551662305 .stroke-B6{stroke:#F7F8FE;} + .d2-3551662305 .stroke-AA2{stroke:#4A6FF3;} + .d2-3551662305 .stroke-AA4{stroke:#EDF0FD;} + .d2-3551662305 .stroke-AA5{stroke:#F7F8FE;} + .d2-3551662305 .stroke-AB4{stroke:#EDF0FD;} + .d2-3551662305 .stroke-AB5{stroke:#F7F8FE;} + .d2-3551662305 .background-color-N1{background-color:#0A0F25;} + .d2-3551662305 .background-color-N2{background-color:#676C7E;} + .d2-3551662305 .background-color-N3{background-color:#9499AB;} + .d2-3551662305 .background-color-N4{background-color:#CFD2DD;} + .d2-3551662305 .background-color-N5{background-color:#DEE1EB;} + .d2-3551662305 .background-color-N6{background-color:#EEF1F8;} + .d2-3551662305 .background-color-N7{background-color:#FFFFFF;} + .d2-3551662305 .background-color-B1{background-color:#0D32B2;} + .d2-3551662305 .background-color-B2{background-color:#0D32B2;} + .d2-3551662305 .background-color-B3{background-color:#E3E9FD;} + .d2-3551662305 .background-color-B4{background-color:#E3E9FD;} + .d2-3551662305 .background-color-B5{background-color:#EDF0FD;} + .d2-3551662305 .background-color-B6{background-color:#F7F8FE;} + .d2-3551662305 .background-color-AA2{background-color:#4A6FF3;} + .d2-3551662305 .background-color-AA4{background-color:#EDF0FD;} + .d2-3551662305 .background-color-AA5{background-color:#F7F8FE;} + .d2-3551662305 .background-color-AB4{background-color:#EDF0FD;} + .d2-3551662305 .background-color-AB5{background-color:#F7F8FE;} + .d2-3551662305 .color-N1{color:#0A0F25;} + .d2-3551662305 .color-N2{color:#676C7E;} + .d2-3551662305 .color-N3{color:#9499AB;} + .d2-3551662305 .color-N4{color:#CFD2DD;} + .d2-3551662305 .color-N5{color:#DEE1EB;} + .d2-3551662305 .color-N6{color:#EEF1F8;} + .d2-3551662305 .color-N7{color:#FFFFFF;} + .d2-3551662305 .color-B1{color:#0D32B2;} + .d2-3551662305 .color-B2{color:#0D32B2;} + .d2-3551662305 .color-B3{color:#E3E9FD;} + .d2-3551662305 .color-B4{color:#E3E9FD;} + .d2-3551662305 .color-B5{color:#EDF0FD;} + .d2-3551662305 .color-B6{color:#F7F8FE;} + .d2-3551662305 .color-AA2{color:#4A6FF3;} + .d2-3551662305 .color-AA4{color:#EDF0FD;} + .d2-3551662305 .color-AA5{color:#F7F8FE;} + .d2-3551662305 .color-AB4{color:#EDF0FD;} + .d2-3551662305 .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}]]> aidintPKdiskintFKjsonjsonbUNQlast_updatedtimestamp with time zone b+field[]string+method(a uint64)(x, y int) c d \ No newline at end of file diff --git a/e2etests/testdata/stable/ent2d2_basic/dagre/board.exp.json b/e2etests/testdata/stable/ent2d2_basic/dagre/board.exp.json index b2ce90df8..304295ec3 100644 --- a/e2etests/testdata/stable/ent2d2_basic/dagre/board.exp.json +++ b/e2etests/testdata/stable/ent2d2_basic/dagre/board.exp.json @@ -55,7 +55,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -83,7 +85,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" }, { @@ -111,7 +115,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" } ], @@ -183,7 +189,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -211,7 +219,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" } ], @@ -283,7 +293,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -311,7 +323,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" } ], @@ -383,7 +397,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -411,7 +427,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -439,7 +455,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" } ], @@ -511,7 +529,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -539,7 +559,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], @@ -611,7 +631,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -639,7 +661,7 @@ "labelWidth": 149, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], diff --git a/e2etests/testdata/stable/ent2d2_basic/dagre/sketch.exp.svg b/e2etests/testdata/stable/ent2d2_basic/dagre/sketch.exp.svg index e820b5b57..74924db37 100644 --- a/e2etests/testdata/stable/ent2d2_basic/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/ent2d2_basic/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -UseridintPKparent_idintFKspouse_idintFKPetidintPKowner_idintFKCardidintPKowner_idintFKPostidintPKtextstringauthor_idintFKMetadataidintPKageintInfoidintPKcontentjson.RawMessage spouse children/parent/ancestorpets/ownercard/ownerposts/authormetadata/userinfo/user + .d2-2055794670 .fill-N1{fill:#0A0F25;} + .d2-2055794670 .fill-N2{fill:#676C7E;} + .d2-2055794670 .fill-N3{fill:#9499AB;} + .d2-2055794670 .fill-N4{fill:#CFD2DD;} + .d2-2055794670 .fill-N5{fill:#DEE1EB;} + .d2-2055794670 .fill-N6{fill:#EEF1F8;} + .d2-2055794670 .fill-N7{fill:#FFFFFF;} + .d2-2055794670 .fill-B1{fill:#0D32B2;} + .d2-2055794670 .fill-B2{fill:#0D32B2;} + .d2-2055794670 .fill-B3{fill:#E3E9FD;} + .d2-2055794670 .fill-B4{fill:#E3E9FD;} + .d2-2055794670 .fill-B5{fill:#EDF0FD;} + .d2-2055794670 .fill-B6{fill:#F7F8FE;} + .d2-2055794670 .fill-AA2{fill:#4A6FF3;} + .d2-2055794670 .fill-AA4{fill:#EDF0FD;} + .d2-2055794670 .fill-AA5{fill:#F7F8FE;} + .d2-2055794670 .fill-AB4{fill:#EDF0FD;} + .d2-2055794670 .fill-AB5{fill:#F7F8FE;} + .d2-2055794670 .stroke-N1{stroke:#0A0F25;} + .d2-2055794670 .stroke-N2{stroke:#676C7E;} + .d2-2055794670 .stroke-N3{stroke:#9499AB;} + .d2-2055794670 .stroke-N4{stroke:#CFD2DD;} + .d2-2055794670 .stroke-N5{stroke:#DEE1EB;} + .d2-2055794670 .stroke-N6{stroke:#EEF1F8;} + .d2-2055794670 .stroke-N7{stroke:#FFFFFF;} + .d2-2055794670 .stroke-B1{stroke:#0D32B2;} + .d2-2055794670 .stroke-B2{stroke:#0D32B2;} + .d2-2055794670 .stroke-B3{stroke:#E3E9FD;} + .d2-2055794670 .stroke-B4{stroke:#E3E9FD;} + .d2-2055794670 .stroke-B5{stroke:#EDF0FD;} + .d2-2055794670 .stroke-B6{stroke:#F7F8FE;} + .d2-2055794670 .stroke-AA2{stroke:#4A6FF3;} + .d2-2055794670 .stroke-AA4{stroke:#EDF0FD;} + .d2-2055794670 .stroke-AA5{stroke:#F7F8FE;} + .d2-2055794670 .stroke-AB4{stroke:#EDF0FD;} + .d2-2055794670 .stroke-AB5{stroke:#F7F8FE;} + .d2-2055794670 .background-color-N1{background-color:#0A0F25;} + .d2-2055794670 .background-color-N2{background-color:#676C7E;} + .d2-2055794670 .background-color-N3{background-color:#9499AB;} + .d2-2055794670 .background-color-N4{background-color:#CFD2DD;} + .d2-2055794670 .background-color-N5{background-color:#DEE1EB;} + .d2-2055794670 .background-color-N6{background-color:#EEF1F8;} + .d2-2055794670 .background-color-N7{background-color:#FFFFFF;} + .d2-2055794670 .background-color-B1{background-color:#0D32B2;} + .d2-2055794670 .background-color-B2{background-color:#0D32B2;} + .d2-2055794670 .background-color-B3{background-color:#E3E9FD;} + .d2-2055794670 .background-color-B4{background-color:#E3E9FD;} + .d2-2055794670 .background-color-B5{background-color:#EDF0FD;} + .d2-2055794670 .background-color-B6{background-color:#F7F8FE;} + .d2-2055794670 .background-color-AA2{background-color:#4A6FF3;} + .d2-2055794670 .background-color-AA4{background-color:#EDF0FD;} + .d2-2055794670 .background-color-AA5{background-color:#F7F8FE;} + .d2-2055794670 .background-color-AB4{background-color:#EDF0FD;} + .d2-2055794670 .background-color-AB5{background-color:#F7F8FE;} + .d2-2055794670 .color-N1{color:#0A0F25;} + .d2-2055794670 .color-N2{color:#676C7E;} + .d2-2055794670 .color-N3{color:#9499AB;} + .d2-2055794670 .color-N4{color:#CFD2DD;} + .d2-2055794670 .color-N5{color:#DEE1EB;} + .d2-2055794670 .color-N6{color:#EEF1F8;} + .d2-2055794670 .color-N7{color:#FFFFFF;} + .d2-2055794670 .color-B1{color:#0D32B2;} + .d2-2055794670 .color-B2{color:#0D32B2;} + .d2-2055794670 .color-B3{color:#E3E9FD;} + .d2-2055794670 .color-B4{color:#E3E9FD;} + .d2-2055794670 .color-B5{color:#EDF0FD;} + .d2-2055794670 .color-B6{color:#F7F8FE;} + .d2-2055794670 .color-AA2{color:#4A6FF3;} + .d2-2055794670 .color-AA4{color:#EDF0FD;} + .d2-2055794670 .color-AA5{color:#F7F8FE;} + .d2-2055794670 .color-AB4{color:#EDF0FD;} + .d2-2055794670 .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}]]>UseridintPKparent_idintFKspouse_idintFKPetidintPKowner_idintFKCardidintPKowner_idintFKPostidintPKtextstringauthor_idintFKMetadataidintPKageintInfoidintPKcontentjson.RawMessage spouse children/parent/ancestorpets/ownercard/ownerposts/authormetadata/userinfo/user diff --git a/e2etests/testdata/stable/ent2d2_basic/elk/board.exp.json b/e2etests/testdata/stable/ent2d2_basic/elk/board.exp.json index fbf27f13b..fe3ccb359 100644 --- a/e2etests/testdata/stable/ent2d2_basic/elk/board.exp.json +++ b/e2etests/testdata/stable/ent2d2_basic/elk/board.exp.json @@ -55,7 +55,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -83,7 +85,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" }, { @@ -111,7 +115,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" } ], @@ -183,7 +189,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -211,7 +219,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" } ], @@ -283,7 +293,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -311,7 +323,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" } ], @@ -383,7 +397,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -411,7 +427,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -439,7 +455,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" } ], @@ -511,7 +529,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -539,7 +559,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], @@ -611,7 +631,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -639,7 +661,7 @@ "labelWidth": 149, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], diff --git a/e2etests/testdata/stable/ent2d2_basic/elk/sketch.exp.svg b/e2etests/testdata/stable/ent2d2_basic/elk/sketch.exp.svg index a6417eaa8..e476e9383 100644 --- a/e2etests/testdata/stable/ent2d2_basic/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/ent2d2_basic/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -UseridintPKparent_idintFKspouse_idintFKPetidintPKowner_idintFKCardidintPKowner_idintFKPostidintPKtextstringauthor_idintFKMetadataidintPKageintInfoidintPKcontentjson.RawMessage spouse children/parent/ancestorpets/ownercard/ownerposts/authormetadata/userinfo/user + .d2-3468469930 .fill-N1{fill:#0A0F25;} + .d2-3468469930 .fill-N2{fill:#676C7E;} + .d2-3468469930 .fill-N3{fill:#9499AB;} + .d2-3468469930 .fill-N4{fill:#CFD2DD;} + .d2-3468469930 .fill-N5{fill:#DEE1EB;} + .d2-3468469930 .fill-N6{fill:#EEF1F8;} + .d2-3468469930 .fill-N7{fill:#FFFFFF;} + .d2-3468469930 .fill-B1{fill:#0D32B2;} + .d2-3468469930 .fill-B2{fill:#0D32B2;} + .d2-3468469930 .fill-B3{fill:#E3E9FD;} + .d2-3468469930 .fill-B4{fill:#E3E9FD;} + .d2-3468469930 .fill-B5{fill:#EDF0FD;} + .d2-3468469930 .fill-B6{fill:#F7F8FE;} + .d2-3468469930 .fill-AA2{fill:#4A6FF3;} + .d2-3468469930 .fill-AA4{fill:#EDF0FD;} + .d2-3468469930 .fill-AA5{fill:#F7F8FE;} + .d2-3468469930 .fill-AB4{fill:#EDF0FD;} + .d2-3468469930 .fill-AB5{fill:#F7F8FE;} + .d2-3468469930 .stroke-N1{stroke:#0A0F25;} + .d2-3468469930 .stroke-N2{stroke:#676C7E;} + .d2-3468469930 .stroke-N3{stroke:#9499AB;} + .d2-3468469930 .stroke-N4{stroke:#CFD2DD;} + .d2-3468469930 .stroke-N5{stroke:#DEE1EB;} + .d2-3468469930 .stroke-N6{stroke:#EEF1F8;} + .d2-3468469930 .stroke-N7{stroke:#FFFFFF;} + .d2-3468469930 .stroke-B1{stroke:#0D32B2;} + .d2-3468469930 .stroke-B2{stroke:#0D32B2;} + .d2-3468469930 .stroke-B3{stroke:#E3E9FD;} + .d2-3468469930 .stroke-B4{stroke:#E3E9FD;} + .d2-3468469930 .stroke-B5{stroke:#EDF0FD;} + .d2-3468469930 .stroke-B6{stroke:#F7F8FE;} + .d2-3468469930 .stroke-AA2{stroke:#4A6FF3;} + .d2-3468469930 .stroke-AA4{stroke:#EDF0FD;} + .d2-3468469930 .stroke-AA5{stroke:#F7F8FE;} + .d2-3468469930 .stroke-AB4{stroke:#EDF0FD;} + .d2-3468469930 .stroke-AB5{stroke:#F7F8FE;} + .d2-3468469930 .background-color-N1{background-color:#0A0F25;} + .d2-3468469930 .background-color-N2{background-color:#676C7E;} + .d2-3468469930 .background-color-N3{background-color:#9499AB;} + .d2-3468469930 .background-color-N4{background-color:#CFD2DD;} + .d2-3468469930 .background-color-N5{background-color:#DEE1EB;} + .d2-3468469930 .background-color-N6{background-color:#EEF1F8;} + .d2-3468469930 .background-color-N7{background-color:#FFFFFF;} + .d2-3468469930 .background-color-B1{background-color:#0D32B2;} + .d2-3468469930 .background-color-B2{background-color:#0D32B2;} + .d2-3468469930 .background-color-B3{background-color:#E3E9FD;} + .d2-3468469930 .background-color-B4{background-color:#E3E9FD;} + .d2-3468469930 .background-color-B5{background-color:#EDF0FD;} + .d2-3468469930 .background-color-B6{background-color:#F7F8FE;} + .d2-3468469930 .background-color-AA2{background-color:#4A6FF3;} + .d2-3468469930 .background-color-AA4{background-color:#EDF0FD;} + .d2-3468469930 .background-color-AA5{background-color:#F7F8FE;} + .d2-3468469930 .background-color-AB4{background-color:#EDF0FD;} + .d2-3468469930 .background-color-AB5{background-color:#F7F8FE;} + .d2-3468469930 .color-N1{color:#0A0F25;} + .d2-3468469930 .color-N2{color:#676C7E;} + .d2-3468469930 .color-N3{color:#9499AB;} + .d2-3468469930 .color-N4{color:#CFD2DD;} + .d2-3468469930 .color-N5{color:#DEE1EB;} + .d2-3468469930 .color-N6{color:#EEF1F8;} + .d2-3468469930 .color-N7{color:#FFFFFF;} + .d2-3468469930 .color-B1{color:#0D32B2;} + .d2-3468469930 .color-B2{color:#0D32B2;} + .d2-3468469930 .color-B3{color:#E3E9FD;} + .d2-3468469930 .color-B4{color:#E3E9FD;} + .d2-3468469930 .color-B5{color:#EDF0FD;} + .d2-3468469930 .color-B6{color:#F7F8FE;} + .d2-3468469930 .color-AA2{color:#4A6FF3;} + .d2-3468469930 .color-AA4{color:#EDF0FD;} + .d2-3468469930 .color-AA5{color:#F7F8FE;} + .d2-3468469930 .color-AB4{color:#EDF0FD;} + .d2-3468469930 .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}]]>UseridintPKparent_idintFKspouse_idintFKPetidintPKowner_idintFKCardidintPKowner_idintFKPostidintPKtextstringauthor_idintFKMetadataidintPKageintInfoidintPKcontentjson.RawMessage spouse children/parent/ancestorpets/ownercard/ownerposts/authormetadata/userinfo/user diff --git a/e2etests/testdata/stable/ent2d2_right/dagre/board.exp.json b/e2etests/testdata/stable/ent2d2_right/dagre/board.exp.json index e3cd89886..0b96e1683 100644 --- a/e2etests/testdata/stable/ent2d2_right/dagre/board.exp.json +++ b/e2etests/testdata/stable/ent2d2_right/dagre/board.exp.json @@ -55,7 +55,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -83,7 +85,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" }, { @@ -111,7 +115,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" } ], @@ -183,7 +189,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -211,7 +219,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" } ], @@ -283,7 +293,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -311,7 +323,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" } ], @@ -383,7 +397,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -411,7 +427,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -439,7 +455,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" } ], @@ -511,7 +529,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -539,7 +559,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], @@ -611,7 +631,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -639,7 +661,7 @@ "labelWidth": 149, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], diff --git a/e2etests/testdata/stable/ent2d2_right/dagre/sketch.exp.svg b/e2etests/testdata/stable/ent2d2_right/dagre/sketch.exp.svg index 884d3e0fc..fd47a5755 100644 --- a/e2etests/testdata/stable/ent2d2_right/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/ent2d2_right/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -UseridintPKparent_idintFKspouse_idintFKPetidintPKowner_idintFKCardidintPKowner_idintFKPostidintPKtextstringauthor_idintFKMetadataidintPKageintInfoidintPKcontentjson.RawMessage spousespouse childrenparentyowhoaheypets/ownercard/ownerposts/authormetadata/userinfo/user + .d2-3852161025 .fill-N1{fill:#0A0F25;} + .d2-3852161025 .fill-N2{fill:#676C7E;} + .d2-3852161025 .fill-N3{fill:#9499AB;} + .d2-3852161025 .fill-N4{fill:#CFD2DD;} + .d2-3852161025 .fill-N5{fill:#DEE1EB;} + .d2-3852161025 .fill-N6{fill:#EEF1F8;} + .d2-3852161025 .fill-N7{fill:#FFFFFF;} + .d2-3852161025 .fill-B1{fill:#0D32B2;} + .d2-3852161025 .fill-B2{fill:#0D32B2;} + .d2-3852161025 .fill-B3{fill:#E3E9FD;} + .d2-3852161025 .fill-B4{fill:#E3E9FD;} + .d2-3852161025 .fill-B5{fill:#EDF0FD;} + .d2-3852161025 .fill-B6{fill:#F7F8FE;} + .d2-3852161025 .fill-AA2{fill:#4A6FF3;} + .d2-3852161025 .fill-AA4{fill:#EDF0FD;} + .d2-3852161025 .fill-AA5{fill:#F7F8FE;} + .d2-3852161025 .fill-AB4{fill:#EDF0FD;} + .d2-3852161025 .fill-AB5{fill:#F7F8FE;} + .d2-3852161025 .stroke-N1{stroke:#0A0F25;} + .d2-3852161025 .stroke-N2{stroke:#676C7E;} + .d2-3852161025 .stroke-N3{stroke:#9499AB;} + .d2-3852161025 .stroke-N4{stroke:#CFD2DD;} + .d2-3852161025 .stroke-N5{stroke:#DEE1EB;} + .d2-3852161025 .stroke-N6{stroke:#EEF1F8;} + .d2-3852161025 .stroke-N7{stroke:#FFFFFF;} + .d2-3852161025 .stroke-B1{stroke:#0D32B2;} + .d2-3852161025 .stroke-B2{stroke:#0D32B2;} + .d2-3852161025 .stroke-B3{stroke:#E3E9FD;} + .d2-3852161025 .stroke-B4{stroke:#E3E9FD;} + .d2-3852161025 .stroke-B5{stroke:#EDF0FD;} + .d2-3852161025 .stroke-B6{stroke:#F7F8FE;} + .d2-3852161025 .stroke-AA2{stroke:#4A6FF3;} + .d2-3852161025 .stroke-AA4{stroke:#EDF0FD;} + .d2-3852161025 .stroke-AA5{stroke:#F7F8FE;} + .d2-3852161025 .stroke-AB4{stroke:#EDF0FD;} + .d2-3852161025 .stroke-AB5{stroke:#F7F8FE;} + .d2-3852161025 .background-color-N1{background-color:#0A0F25;} + .d2-3852161025 .background-color-N2{background-color:#676C7E;} + .d2-3852161025 .background-color-N3{background-color:#9499AB;} + .d2-3852161025 .background-color-N4{background-color:#CFD2DD;} + .d2-3852161025 .background-color-N5{background-color:#DEE1EB;} + .d2-3852161025 .background-color-N6{background-color:#EEF1F8;} + .d2-3852161025 .background-color-N7{background-color:#FFFFFF;} + .d2-3852161025 .background-color-B1{background-color:#0D32B2;} + .d2-3852161025 .background-color-B2{background-color:#0D32B2;} + .d2-3852161025 .background-color-B3{background-color:#E3E9FD;} + .d2-3852161025 .background-color-B4{background-color:#E3E9FD;} + .d2-3852161025 .background-color-B5{background-color:#EDF0FD;} + .d2-3852161025 .background-color-B6{background-color:#F7F8FE;} + .d2-3852161025 .background-color-AA2{background-color:#4A6FF3;} + .d2-3852161025 .background-color-AA4{background-color:#EDF0FD;} + .d2-3852161025 .background-color-AA5{background-color:#F7F8FE;} + .d2-3852161025 .background-color-AB4{background-color:#EDF0FD;} + .d2-3852161025 .background-color-AB5{background-color:#F7F8FE;} + .d2-3852161025 .color-N1{color:#0A0F25;} + .d2-3852161025 .color-N2{color:#676C7E;} + .d2-3852161025 .color-N3{color:#9499AB;} + .d2-3852161025 .color-N4{color:#CFD2DD;} + .d2-3852161025 .color-N5{color:#DEE1EB;} + .d2-3852161025 .color-N6{color:#EEF1F8;} + .d2-3852161025 .color-N7{color:#FFFFFF;} + .d2-3852161025 .color-B1{color:#0D32B2;} + .d2-3852161025 .color-B2{color:#0D32B2;} + .d2-3852161025 .color-B3{color:#E3E9FD;} + .d2-3852161025 .color-B4{color:#E3E9FD;} + .d2-3852161025 .color-B5{color:#EDF0FD;} + .d2-3852161025 .color-B6{color:#F7F8FE;} + .d2-3852161025 .color-AA2{color:#4A6FF3;} + .d2-3852161025 .color-AA4{color:#EDF0FD;} + .d2-3852161025 .color-AA5{color:#F7F8FE;} + .d2-3852161025 .color-AB4{color:#EDF0FD;} + .d2-3852161025 .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}]]>UseridintPKparent_idintFKspouse_idintFKPetidintPKowner_idintFKCardidintPKowner_idintFKPostidintPKtextstringauthor_idintFKMetadataidintPKageintInfoidintPKcontentjson.RawMessage spousespouse childrenparentyowhoaheypets/ownercard/ownerposts/authormetadata/userinfo/user diff --git a/e2etests/testdata/stable/ent2d2_right/elk/board.exp.json b/e2etests/testdata/stable/ent2d2_right/elk/board.exp.json index 6843f9ded..a479af116 100644 --- a/e2etests/testdata/stable/ent2d2_right/elk/board.exp.json +++ b/e2etests/testdata/stable/ent2d2_right/elk/board.exp.json @@ -55,7 +55,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -83,7 +85,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" }, { @@ -111,7 +115,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" } ], @@ -183,7 +189,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -211,7 +219,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" } ], @@ -283,7 +293,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -311,7 +323,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" } ], @@ -383,7 +397,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -411,7 +427,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -439,7 +455,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" } ], @@ -511,7 +529,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -539,7 +559,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], @@ -611,7 +631,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -639,7 +661,7 @@ "labelWidth": 149, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], diff --git a/e2etests/testdata/stable/ent2d2_right/elk/sketch.exp.svg b/e2etests/testdata/stable/ent2d2_right/elk/sketch.exp.svg index e0fdbba72..186557cf2 100644 --- a/e2etests/testdata/stable/ent2d2_right/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/ent2d2_right/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -UseridintPKparent_idintFKspouse_idintFKPetidintPKowner_idintFKCardidintPKowner_idintFKPostidintPKtextstringauthor_idintFKMetadataidintPKageintInfoidintPKcontentjson.RawMessage spousespouse childrenparentyowhoaheypets/ownercard/ownerposts/authormetadata/userinfo/user + .d2-1453399416 .fill-N1{fill:#0A0F25;} + .d2-1453399416 .fill-N2{fill:#676C7E;} + .d2-1453399416 .fill-N3{fill:#9499AB;} + .d2-1453399416 .fill-N4{fill:#CFD2DD;} + .d2-1453399416 .fill-N5{fill:#DEE1EB;} + .d2-1453399416 .fill-N6{fill:#EEF1F8;} + .d2-1453399416 .fill-N7{fill:#FFFFFF;} + .d2-1453399416 .fill-B1{fill:#0D32B2;} + .d2-1453399416 .fill-B2{fill:#0D32B2;} + .d2-1453399416 .fill-B3{fill:#E3E9FD;} + .d2-1453399416 .fill-B4{fill:#E3E9FD;} + .d2-1453399416 .fill-B5{fill:#EDF0FD;} + .d2-1453399416 .fill-B6{fill:#F7F8FE;} + .d2-1453399416 .fill-AA2{fill:#4A6FF3;} + .d2-1453399416 .fill-AA4{fill:#EDF0FD;} + .d2-1453399416 .fill-AA5{fill:#F7F8FE;} + .d2-1453399416 .fill-AB4{fill:#EDF0FD;} + .d2-1453399416 .fill-AB5{fill:#F7F8FE;} + .d2-1453399416 .stroke-N1{stroke:#0A0F25;} + .d2-1453399416 .stroke-N2{stroke:#676C7E;} + .d2-1453399416 .stroke-N3{stroke:#9499AB;} + .d2-1453399416 .stroke-N4{stroke:#CFD2DD;} + .d2-1453399416 .stroke-N5{stroke:#DEE1EB;} + .d2-1453399416 .stroke-N6{stroke:#EEF1F8;} + .d2-1453399416 .stroke-N7{stroke:#FFFFFF;} + .d2-1453399416 .stroke-B1{stroke:#0D32B2;} + .d2-1453399416 .stroke-B2{stroke:#0D32B2;} + .d2-1453399416 .stroke-B3{stroke:#E3E9FD;} + .d2-1453399416 .stroke-B4{stroke:#E3E9FD;} + .d2-1453399416 .stroke-B5{stroke:#EDF0FD;} + .d2-1453399416 .stroke-B6{stroke:#F7F8FE;} + .d2-1453399416 .stroke-AA2{stroke:#4A6FF3;} + .d2-1453399416 .stroke-AA4{stroke:#EDF0FD;} + .d2-1453399416 .stroke-AA5{stroke:#F7F8FE;} + .d2-1453399416 .stroke-AB4{stroke:#EDF0FD;} + .d2-1453399416 .stroke-AB5{stroke:#F7F8FE;} + .d2-1453399416 .background-color-N1{background-color:#0A0F25;} + .d2-1453399416 .background-color-N2{background-color:#676C7E;} + .d2-1453399416 .background-color-N3{background-color:#9499AB;} + .d2-1453399416 .background-color-N4{background-color:#CFD2DD;} + .d2-1453399416 .background-color-N5{background-color:#DEE1EB;} + .d2-1453399416 .background-color-N6{background-color:#EEF1F8;} + .d2-1453399416 .background-color-N7{background-color:#FFFFFF;} + .d2-1453399416 .background-color-B1{background-color:#0D32B2;} + .d2-1453399416 .background-color-B2{background-color:#0D32B2;} + .d2-1453399416 .background-color-B3{background-color:#E3E9FD;} + .d2-1453399416 .background-color-B4{background-color:#E3E9FD;} + .d2-1453399416 .background-color-B5{background-color:#EDF0FD;} + .d2-1453399416 .background-color-B6{background-color:#F7F8FE;} + .d2-1453399416 .background-color-AA2{background-color:#4A6FF3;} + .d2-1453399416 .background-color-AA4{background-color:#EDF0FD;} + .d2-1453399416 .background-color-AA5{background-color:#F7F8FE;} + .d2-1453399416 .background-color-AB4{background-color:#EDF0FD;} + .d2-1453399416 .background-color-AB5{background-color:#F7F8FE;} + .d2-1453399416 .color-N1{color:#0A0F25;} + .d2-1453399416 .color-N2{color:#676C7E;} + .d2-1453399416 .color-N3{color:#9499AB;} + .d2-1453399416 .color-N4{color:#CFD2DD;} + .d2-1453399416 .color-N5{color:#DEE1EB;} + .d2-1453399416 .color-N6{color:#EEF1F8;} + .d2-1453399416 .color-N7{color:#FFFFFF;} + .d2-1453399416 .color-B1{color:#0D32B2;} + .d2-1453399416 .color-B2{color:#0D32B2;} + .d2-1453399416 .color-B3{color:#E3E9FD;} + .d2-1453399416 .color-B4{color:#E3E9FD;} + .d2-1453399416 .color-B5{color:#EDF0FD;} + .d2-1453399416 .color-B6{color:#F7F8FE;} + .d2-1453399416 .color-AA2{color:#4A6FF3;} + .d2-1453399416 .color-AA4{color:#EDF0FD;} + .d2-1453399416 .color-AA5{color:#F7F8FE;} + .d2-1453399416 .color-AB4{color:#EDF0FD;} + .d2-1453399416 .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}]]>UseridintPKparent_idintFKspouse_idintFKPetidintPKowner_idintFKCardidintPKowner_idintFKPostidintPKtextstringauthor_idintFKMetadataidintPKageintInfoidintPKcontentjson.RawMessage spousespouse childrenparentyowhoaheypets/ownercard/ownerposts/authormetadata/userinfo/user 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 7b5c31322..dd6b3f0d2 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 @@ -860,7 +860,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -888,7 +888,7 @@ "labelWidth": 64, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], 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 a94e3f9f8..10d0baad6 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 @@ -1,30 +1,30 @@ -a labelblabelsa class+public() boolvoid-private() intvoidcloudyyyya := 5 + .d2-1927191183 .fill-N1{fill:#0A0F25;} + .d2-1927191183 .fill-N2{fill:#676C7E;} + .d2-1927191183 .fill-N3{fill:#9499AB;} + .d2-1927191183 .fill-N4{fill:#CFD2DD;} + .d2-1927191183 .fill-N5{fill:#DEE1EB;} + .d2-1927191183 .fill-N6{fill:#EEF1F8;} + .d2-1927191183 .fill-N7{fill:#FFFFFF;} + .d2-1927191183 .fill-B1{fill:#0D32B2;} + .d2-1927191183 .fill-B2{fill:#0D32B2;} + .d2-1927191183 .fill-B3{fill:#E3E9FD;} + .d2-1927191183 .fill-B4{fill:#E3E9FD;} + .d2-1927191183 .fill-B5{fill:#EDF0FD;} + .d2-1927191183 .fill-B6{fill:#F7F8FE;} + .d2-1927191183 .fill-AA2{fill:#4A6FF3;} + .d2-1927191183 .fill-AA4{fill:#EDF0FD;} + .d2-1927191183 .fill-AA5{fill:#F7F8FE;} + .d2-1927191183 .fill-AB4{fill:#EDF0FD;} + .d2-1927191183 .fill-AB5{fill:#F7F8FE;} + .d2-1927191183 .stroke-N1{stroke:#0A0F25;} + .d2-1927191183 .stroke-N2{stroke:#676C7E;} + .d2-1927191183 .stroke-N3{stroke:#9499AB;} + .d2-1927191183 .stroke-N4{stroke:#CFD2DD;} + .d2-1927191183 .stroke-N5{stroke:#DEE1EB;} + .d2-1927191183 .stroke-N6{stroke:#EEF1F8;} + .d2-1927191183 .stroke-N7{stroke:#FFFFFF;} + .d2-1927191183 .stroke-B1{stroke:#0D32B2;} + .d2-1927191183 .stroke-B2{stroke:#0D32B2;} + .d2-1927191183 .stroke-B3{stroke:#E3E9FD;} + .d2-1927191183 .stroke-B4{stroke:#E3E9FD;} + .d2-1927191183 .stroke-B5{stroke:#EDF0FD;} + .d2-1927191183 .stroke-B6{stroke:#F7F8FE;} + .d2-1927191183 .stroke-AA2{stroke:#4A6FF3;} + .d2-1927191183 .stroke-AA4{stroke:#EDF0FD;} + .d2-1927191183 .stroke-AA5{stroke:#F7F8FE;} + .d2-1927191183 .stroke-AB4{stroke:#EDF0FD;} + .d2-1927191183 .stroke-AB5{stroke:#F7F8FE;} + .d2-1927191183 .background-color-N1{background-color:#0A0F25;} + .d2-1927191183 .background-color-N2{background-color:#676C7E;} + .d2-1927191183 .background-color-N3{background-color:#9499AB;} + .d2-1927191183 .background-color-N4{background-color:#CFD2DD;} + .d2-1927191183 .background-color-N5{background-color:#DEE1EB;} + .d2-1927191183 .background-color-N6{background-color:#EEF1F8;} + .d2-1927191183 .background-color-N7{background-color:#FFFFFF;} + .d2-1927191183 .background-color-B1{background-color:#0D32B2;} + .d2-1927191183 .background-color-B2{background-color:#0D32B2;} + .d2-1927191183 .background-color-B3{background-color:#E3E9FD;} + .d2-1927191183 .background-color-B4{background-color:#E3E9FD;} + .d2-1927191183 .background-color-B5{background-color:#EDF0FD;} + .d2-1927191183 .background-color-B6{background-color:#F7F8FE;} + .d2-1927191183 .background-color-AA2{background-color:#4A6FF3;} + .d2-1927191183 .background-color-AA4{background-color:#EDF0FD;} + .d2-1927191183 .background-color-AA5{background-color:#F7F8FE;} + .d2-1927191183 .background-color-AB4{background-color:#EDF0FD;} + .d2-1927191183 .background-color-AB5{background-color:#F7F8FE;} + .d2-1927191183 .color-N1{color:#0A0F25;} + .d2-1927191183 .color-N2{color:#676C7E;} + .d2-1927191183 .color-N3{color:#9499AB;} + .d2-1927191183 .color-N4{color:#CFD2DD;} + .d2-1927191183 .color-N5{color:#DEE1EB;} + .d2-1927191183 .color-N6{color:#EEF1F8;} + .d2-1927191183 .color-N7{color:#FFFFFF;} + .d2-1927191183 .color-B1{color:#0D32B2;} + .d2-1927191183 .color-B2{color:#0D32B2;} + .d2-1927191183 .color-B3{color:#E3E9FD;} + .d2-1927191183 .color-B4{color:#E3E9FD;} + .d2-1927191183 .color-B5{color:#EDF0FD;} + .d2-1927191183 .color-B6{color:#F7F8FE;} + .d2-1927191183 .color-AA2{color:#4A6FF3;} + .d2-1927191183 .color-AA4{color:#EDF0FD;} + .d2-1927191183 .color-AA5{color:#F7F8FE;} + .d2-1927191183 .color-AB4{color:#EDF0FD;} + .d2-1927191183 .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}]]>a labelblabelsa class+public() boolvoid-private() intvoidcloudyyyya := 5 b := a + 7 fmt.Printf("%d", b)a := 5 b := a + 7 -fmt.Printf("%d", b)cyldiadocssix cornersa random iconoverpackdocs pagetoohard o saysinglepersona queuea squarea step at a timedatausersidintnamevarchar result := callThisFunction(obj, 5) midthis sideother side +fmt.Printf("%d", b)cyldiadocssix cornersa random iconoverpackdocs pagetoohard o saysinglepersona queuea squarea step at a timedatausersidintnamevarchar result := callThisFunction(obj, 5) midthis sideother side diff --git a/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/board.exp.json b/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/board.exp.json index 7b5c31322..dd6b3f0d2 100644 --- a/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/board.exp.json @@ -860,7 +860,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -888,7 +888,7 @@ "labelWidth": 64, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], diff --git a/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/sketch.exp.svg index a94e3f9f8..10d0baad6 100644 --- a/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/sketch.exp.svg @@ -1,30 +1,30 @@ -a labelblabelsa class+public() boolvoid-private() intvoidcloudyyyya := 5 + .d2-1927191183 .fill-N1{fill:#0A0F25;} + .d2-1927191183 .fill-N2{fill:#676C7E;} + .d2-1927191183 .fill-N3{fill:#9499AB;} + .d2-1927191183 .fill-N4{fill:#CFD2DD;} + .d2-1927191183 .fill-N5{fill:#DEE1EB;} + .d2-1927191183 .fill-N6{fill:#EEF1F8;} + .d2-1927191183 .fill-N7{fill:#FFFFFF;} + .d2-1927191183 .fill-B1{fill:#0D32B2;} + .d2-1927191183 .fill-B2{fill:#0D32B2;} + .d2-1927191183 .fill-B3{fill:#E3E9FD;} + .d2-1927191183 .fill-B4{fill:#E3E9FD;} + .d2-1927191183 .fill-B5{fill:#EDF0FD;} + .d2-1927191183 .fill-B6{fill:#F7F8FE;} + .d2-1927191183 .fill-AA2{fill:#4A6FF3;} + .d2-1927191183 .fill-AA4{fill:#EDF0FD;} + .d2-1927191183 .fill-AA5{fill:#F7F8FE;} + .d2-1927191183 .fill-AB4{fill:#EDF0FD;} + .d2-1927191183 .fill-AB5{fill:#F7F8FE;} + .d2-1927191183 .stroke-N1{stroke:#0A0F25;} + .d2-1927191183 .stroke-N2{stroke:#676C7E;} + .d2-1927191183 .stroke-N3{stroke:#9499AB;} + .d2-1927191183 .stroke-N4{stroke:#CFD2DD;} + .d2-1927191183 .stroke-N5{stroke:#DEE1EB;} + .d2-1927191183 .stroke-N6{stroke:#EEF1F8;} + .d2-1927191183 .stroke-N7{stroke:#FFFFFF;} + .d2-1927191183 .stroke-B1{stroke:#0D32B2;} + .d2-1927191183 .stroke-B2{stroke:#0D32B2;} + .d2-1927191183 .stroke-B3{stroke:#E3E9FD;} + .d2-1927191183 .stroke-B4{stroke:#E3E9FD;} + .d2-1927191183 .stroke-B5{stroke:#EDF0FD;} + .d2-1927191183 .stroke-B6{stroke:#F7F8FE;} + .d2-1927191183 .stroke-AA2{stroke:#4A6FF3;} + .d2-1927191183 .stroke-AA4{stroke:#EDF0FD;} + .d2-1927191183 .stroke-AA5{stroke:#F7F8FE;} + .d2-1927191183 .stroke-AB4{stroke:#EDF0FD;} + .d2-1927191183 .stroke-AB5{stroke:#F7F8FE;} + .d2-1927191183 .background-color-N1{background-color:#0A0F25;} + .d2-1927191183 .background-color-N2{background-color:#676C7E;} + .d2-1927191183 .background-color-N3{background-color:#9499AB;} + .d2-1927191183 .background-color-N4{background-color:#CFD2DD;} + .d2-1927191183 .background-color-N5{background-color:#DEE1EB;} + .d2-1927191183 .background-color-N6{background-color:#EEF1F8;} + .d2-1927191183 .background-color-N7{background-color:#FFFFFF;} + .d2-1927191183 .background-color-B1{background-color:#0D32B2;} + .d2-1927191183 .background-color-B2{background-color:#0D32B2;} + .d2-1927191183 .background-color-B3{background-color:#E3E9FD;} + .d2-1927191183 .background-color-B4{background-color:#E3E9FD;} + .d2-1927191183 .background-color-B5{background-color:#EDF0FD;} + .d2-1927191183 .background-color-B6{background-color:#F7F8FE;} + .d2-1927191183 .background-color-AA2{background-color:#4A6FF3;} + .d2-1927191183 .background-color-AA4{background-color:#EDF0FD;} + .d2-1927191183 .background-color-AA5{background-color:#F7F8FE;} + .d2-1927191183 .background-color-AB4{background-color:#EDF0FD;} + .d2-1927191183 .background-color-AB5{background-color:#F7F8FE;} + .d2-1927191183 .color-N1{color:#0A0F25;} + .d2-1927191183 .color-N2{color:#676C7E;} + .d2-1927191183 .color-N3{color:#9499AB;} + .d2-1927191183 .color-N4{color:#CFD2DD;} + .d2-1927191183 .color-N5{color:#DEE1EB;} + .d2-1927191183 .color-N6{color:#EEF1F8;} + .d2-1927191183 .color-N7{color:#FFFFFF;} + .d2-1927191183 .color-B1{color:#0D32B2;} + .d2-1927191183 .color-B2{color:#0D32B2;} + .d2-1927191183 .color-B3{color:#E3E9FD;} + .d2-1927191183 .color-B4{color:#E3E9FD;} + .d2-1927191183 .color-B5{color:#EDF0FD;} + .d2-1927191183 .color-B6{color:#F7F8FE;} + .d2-1927191183 .color-AA2{color:#4A6FF3;} + .d2-1927191183 .color-AA4{color:#EDF0FD;} + .d2-1927191183 .color-AA5{color:#F7F8FE;} + .d2-1927191183 .color-AB4{color:#EDF0FD;} + .d2-1927191183 .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}]]>a labelblabelsa class+public() boolvoid-private() intvoidcloudyyyya := 5 b := a + 7 fmt.Printf("%d", b)a := 5 b := a + 7 -fmt.Printf("%d", b)cyldiadocssix cornersa random iconoverpackdocs pagetoohard o saysinglepersona queuea squarea step at a timedatausersidintnamevarchar result := callThisFunction(obj, 5) midthis sideother side +fmt.Printf("%d", b)cyldiadocssix cornersa random iconoverpackdocs pagetoohard o saysinglepersona queuea squarea step at a timedatausersidintnamevarchar result := callThisFunction(obj, 5) midthis sideother side diff --git a/e2etests/testdata/stable/sql_table_column_styles/dagre/board.exp.json b/e2etests/testdata/stable/sql_table_column_styles/dagre/board.exp.json index 55c5ecf20..24dffe9d7 100644 --- a/e2etests/testdata/stable/sql_table_column_styles/dagre/board.exp.json +++ b/e2etests/testdata/stable/sql_table_column_styles/dagre/board.exp.json @@ -55,7 +55,7 @@ "labelWidth": 166, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -83,7 +83,7 @@ "labelWidth": 210, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], @@ -155,7 +155,7 @@ "labelWidth": 248, "labelHeight": 38 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -183,7 +183,7 @@ "labelWidth": 315, "labelHeight": 38 }, - "constraint": "", + "constraint": null, "reference": "" } ], diff --git a/e2etests/testdata/stable/sql_table_column_styles/dagre/sketch.exp.svg b/e2etests/testdata/stable/sql_table_column_styles/dagre/sketch.exp.svg index b3b49c676..75a24a50b 100644 --- a/e2etests/testdata/stable/sql_table_column_styles/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sql_table_column_styles/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -Humor in the CourtCould you see him from where you were standing?I could see his head.And where was his head?Just above his shoulders.Humor in the Court2Could you see him from where you were standing?I could see his head.And where was his head?Just above his shoulders.BatchManager-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voidBatchManager-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)void + .d2-4052321575 .fill-N1{fill:#0A0F25;} + .d2-4052321575 .fill-N2{fill:#676C7E;} + .d2-4052321575 .fill-N3{fill:#9499AB;} + .d2-4052321575 .fill-N4{fill:#CFD2DD;} + .d2-4052321575 .fill-N5{fill:#DEE1EB;} + .d2-4052321575 .fill-N6{fill:#EEF1F8;} + .d2-4052321575 .fill-N7{fill:#FFFFFF;} + .d2-4052321575 .fill-B1{fill:#0D32B2;} + .d2-4052321575 .fill-B2{fill:#0D32B2;} + .d2-4052321575 .fill-B3{fill:#E3E9FD;} + .d2-4052321575 .fill-B4{fill:#E3E9FD;} + .d2-4052321575 .fill-B5{fill:#EDF0FD;} + .d2-4052321575 .fill-B6{fill:#F7F8FE;} + .d2-4052321575 .fill-AA2{fill:#4A6FF3;} + .d2-4052321575 .fill-AA4{fill:#EDF0FD;} + .d2-4052321575 .fill-AA5{fill:#F7F8FE;} + .d2-4052321575 .fill-AB4{fill:#EDF0FD;} + .d2-4052321575 .fill-AB5{fill:#F7F8FE;} + .d2-4052321575 .stroke-N1{stroke:#0A0F25;} + .d2-4052321575 .stroke-N2{stroke:#676C7E;} + .d2-4052321575 .stroke-N3{stroke:#9499AB;} + .d2-4052321575 .stroke-N4{stroke:#CFD2DD;} + .d2-4052321575 .stroke-N5{stroke:#DEE1EB;} + .d2-4052321575 .stroke-N6{stroke:#EEF1F8;} + .d2-4052321575 .stroke-N7{stroke:#FFFFFF;} + .d2-4052321575 .stroke-B1{stroke:#0D32B2;} + .d2-4052321575 .stroke-B2{stroke:#0D32B2;} + .d2-4052321575 .stroke-B3{stroke:#E3E9FD;} + .d2-4052321575 .stroke-B4{stroke:#E3E9FD;} + .d2-4052321575 .stroke-B5{stroke:#EDF0FD;} + .d2-4052321575 .stroke-B6{stroke:#F7F8FE;} + .d2-4052321575 .stroke-AA2{stroke:#4A6FF3;} + .d2-4052321575 .stroke-AA4{stroke:#EDF0FD;} + .d2-4052321575 .stroke-AA5{stroke:#F7F8FE;} + .d2-4052321575 .stroke-AB4{stroke:#EDF0FD;} + .d2-4052321575 .stroke-AB5{stroke:#F7F8FE;} + .d2-4052321575 .background-color-N1{background-color:#0A0F25;} + .d2-4052321575 .background-color-N2{background-color:#676C7E;} + .d2-4052321575 .background-color-N3{background-color:#9499AB;} + .d2-4052321575 .background-color-N4{background-color:#CFD2DD;} + .d2-4052321575 .background-color-N5{background-color:#DEE1EB;} + .d2-4052321575 .background-color-N6{background-color:#EEF1F8;} + .d2-4052321575 .background-color-N7{background-color:#FFFFFF;} + .d2-4052321575 .background-color-B1{background-color:#0D32B2;} + .d2-4052321575 .background-color-B2{background-color:#0D32B2;} + .d2-4052321575 .background-color-B3{background-color:#E3E9FD;} + .d2-4052321575 .background-color-B4{background-color:#E3E9FD;} + .d2-4052321575 .background-color-B5{background-color:#EDF0FD;} + .d2-4052321575 .background-color-B6{background-color:#F7F8FE;} + .d2-4052321575 .background-color-AA2{background-color:#4A6FF3;} + .d2-4052321575 .background-color-AA4{background-color:#EDF0FD;} + .d2-4052321575 .background-color-AA5{background-color:#F7F8FE;} + .d2-4052321575 .background-color-AB4{background-color:#EDF0FD;} + .d2-4052321575 .background-color-AB5{background-color:#F7F8FE;} + .d2-4052321575 .color-N1{color:#0A0F25;} + .d2-4052321575 .color-N2{color:#676C7E;} + .d2-4052321575 .color-N3{color:#9499AB;} + .d2-4052321575 .color-N4{color:#CFD2DD;} + .d2-4052321575 .color-N5{color:#DEE1EB;} + .d2-4052321575 .color-N6{color:#EEF1F8;} + .d2-4052321575 .color-N7{color:#FFFFFF;} + .d2-4052321575 .color-B1{color:#0D32B2;} + .d2-4052321575 .color-B2{color:#0D32B2;} + .d2-4052321575 .color-B3{color:#E3E9FD;} + .d2-4052321575 .color-B4{color:#E3E9FD;} + .d2-4052321575 .color-B5{color:#EDF0FD;} + .d2-4052321575 .color-B6{color:#F7F8FE;} + .d2-4052321575 .color-AA2{color:#4A6FF3;} + .d2-4052321575 .color-AA4{color:#EDF0FD;} + .d2-4052321575 .color-AA5{color:#F7F8FE;} + .d2-4052321575 .color-AB4{color:#EDF0FD;} + .d2-4052321575 .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}]]>Humor in the CourtCould you see him from where you were standing?I could see his head.And where was his head?Just above his shoulders.Humor in the Court2Could you see him from where you were standing?I could see his head.And where was his head?Just above his shoulders.BatchManager-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voidBatchManager-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)void \ No newline at end of file diff --git a/e2etests/testdata/stable/sql_table_column_styles/elk/board.exp.json b/e2etests/testdata/stable/sql_table_column_styles/elk/board.exp.json index 4819ec11c..220d7395f 100644 --- a/e2etests/testdata/stable/sql_table_column_styles/elk/board.exp.json +++ b/e2etests/testdata/stable/sql_table_column_styles/elk/board.exp.json @@ -55,7 +55,7 @@ "labelWidth": 166, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -83,7 +83,7 @@ "labelWidth": 210, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], @@ -155,7 +155,7 @@ "labelWidth": 248, "labelHeight": 38 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -183,7 +183,7 @@ "labelWidth": 315, "labelHeight": 38 }, - "constraint": "", + "constraint": null, "reference": "" } ], diff --git a/e2etests/testdata/stable/sql_table_column_styles/elk/sketch.exp.svg b/e2etests/testdata/stable/sql_table_column_styles/elk/sketch.exp.svg index dd0442e3c..18942cbb6 100644 --- a/e2etests/testdata/stable/sql_table_column_styles/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sql_table_column_styles/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -Humor in the CourtCould you see him from where you were standing?I could see his head.And where was his head?Just above his shoulders.Humor in the Court2Could you see him from where you were standing?I could see his head.And where was his head?Just above his shoulders.BatchManager-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voidBatchManager-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)void + .d2-2628520825 .fill-N1{fill:#0A0F25;} + .d2-2628520825 .fill-N2{fill:#676C7E;} + .d2-2628520825 .fill-N3{fill:#9499AB;} + .d2-2628520825 .fill-N4{fill:#CFD2DD;} + .d2-2628520825 .fill-N5{fill:#DEE1EB;} + .d2-2628520825 .fill-N6{fill:#EEF1F8;} + .d2-2628520825 .fill-N7{fill:#FFFFFF;} + .d2-2628520825 .fill-B1{fill:#0D32B2;} + .d2-2628520825 .fill-B2{fill:#0D32B2;} + .d2-2628520825 .fill-B3{fill:#E3E9FD;} + .d2-2628520825 .fill-B4{fill:#E3E9FD;} + .d2-2628520825 .fill-B5{fill:#EDF0FD;} + .d2-2628520825 .fill-B6{fill:#F7F8FE;} + .d2-2628520825 .fill-AA2{fill:#4A6FF3;} + .d2-2628520825 .fill-AA4{fill:#EDF0FD;} + .d2-2628520825 .fill-AA5{fill:#F7F8FE;} + .d2-2628520825 .fill-AB4{fill:#EDF0FD;} + .d2-2628520825 .fill-AB5{fill:#F7F8FE;} + .d2-2628520825 .stroke-N1{stroke:#0A0F25;} + .d2-2628520825 .stroke-N2{stroke:#676C7E;} + .d2-2628520825 .stroke-N3{stroke:#9499AB;} + .d2-2628520825 .stroke-N4{stroke:#CFD2DD;} + .d2-2628520825 .stroke-N5{stroke:#DEE1EB;} + .d2-2628520825 .stroke-N6{stroke:#EEF1F8;} + .d2-2628520825 .stroke-N7{stroke:#FFFFFF;} + .d2-2628520825 .stroke-B1{stroke:#0D32B2;} + .d2-2628520825 .stroke-B2{stroke:#0D32B2;} + .d2-2628520825 .stroke-B3{stroke:#E3E9FD;} + .d2-2628520825 .stroke-B4{stroke:#E3E9FD;} + .d2-2628520825 .stroke-B5{stroke:#EDF0FD;} + .d2-2628520825 .stroke-B6{stroke:#F7F8FE;} + .d2-2628520825 .stroke-AA2{stroke:#4A6FF3;} + .d2-2628520825 .stroke-AA4{stroke:#EDF0FD;} + .d2-2628520825 .stroke-AA5{stroke:#F7F8FE;} + .d2-2628520825 .stroke-AB4{stroke:#EDF0FD;} + .d2-2628520825 .stroke-AB5{stroke:#F7F8FE;} + .d2-2628520825 .background-color-N1{background-color:#0A0F25;} + .d2-2628520825 .background-color-N2{background-color:#676C7E;} + .d2-2628520825 .background-color-N3{background-color:#9499AB;} + .d2-2628520825 .background-color-N4{background-color:#CFD2DD;} + .d2-2628520825 .background-color-N5{background-color:#DEE1EB;} + .d2-2628520825 .background-color-N6{background-color:#EEF1F8;} + .d2-2628520825 .background-color-N7{background-color:#FFFFFF;} + .d2-2628520825 .background-color-B1{background-color:#0D32B2;} + .d2-2628520825 .background-color-B2{background-color:#0D32B2;} + .d2-2628520825 .background-color-B3{background-color:#E3E9FD;} + .d2-2628520825 .background-color-B4{background-color:#E3E9FD;} + .d2-2628520825 .background-color-B5{background-color:#EDF0FD;} + .d2-2628520825 .background-color-B6{background-color:#F7F8FE;} + .d2-2628520825 .background-color-AA2{background-color:#4A6FF3;} + .d2-2628520825 .background-color-AA4{background-color:#EDF0FD;} + .d2-2628520825 .background-color-AA5{background-color:#F7F8FE;} + .d2-2628520825 .background-color-AB4{background-color:#EDF0FD;} + .d2-2628520825 .background-color-AB5{background-color:#F7F8FE;} + .d2-2628520825 .color-N1{color:#0A0F25;} + .d2-2628520825 .color-N2{color:#676C7E;} + .d2-2628520825 .color-N3{color:#9499AB;} + .d2-2628520825 .color-N4{color:#CFD2DD;} + .d2-2628520825 .color-N5{color:#DEE1EB;} + .d2-2628520825 .color-N6{color:#EEF1F8;} + .d2-2628520825 .color-N7{color:#FFFFFF;} + .d2-2628520825 .color-B1{color:#0D32B2;} + .d2-2628520825 .color-B2{color:#0D32B2;} + .d2-2628520825 .color-B3{color:#E3E9FD;} + .d2-2628520825 .color-B4{color:#E3E9FD;} + .d2-2628520825 .color-B5{color:#EDF0FD;} + .d2-2628520825 .color-B6{color:#F7F8FE;} + .d2-2628520825 .color-AA2{color:#4A6FF3;} + .d2-2628520825 .color-AA4{color:#EDF0FD;} + .d2-2628520825 .color-AA5{color:#F7F8FE;} + .d2-2628520825 .color-AB4{color:#EDF0FD;} + .d2-2628520825 .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}]]>Humor in the CourtCould you see him from where you were standing?I could see his head.And where was his head?Just above his shoulders.Humor in the Court2Could you see him from where you were standing?I could see his head.And where was his head?Just above his shoulders.BatchManager-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voidBatchManager-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)void \ No newline at end of file diff --git a/e2etests/testdata/stable/sql_table_tooltip_animated/dagre/board.exp.json b/e2etests/testdata/stable/sql_table_tooltip_animated/dagre/board.exp.json index 24914b479..9e4967a4c 100644 --- a/e2etests/testdata/stable/sql_table_tooltip_animated/dagre/board.exp.json +++ b/e2etests/testdata/stable/sql_table_tooltip_animated/dagre/board.exp.json @@ -55,7 +55,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "", + "constraint": null, "reference": "" } ], @@ -127,7 +127,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "", + "constraint": null, "reference": "" } ], diff --git a/e2etests/testdata/stable/sql_table_tooltip_animated/dagre/sketch.exp.svg b/e2etests/testdata/stable/sql_table_tooltip_animated/dagre/sketch.exp.svg index b8b8c9bbf..8b5037ed1 100644 --- a/e2etests/testdata/stable/sql_table_tooltip_animated/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sql_table_tooltip_animated/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -xy + .d2-3227093269 .fill-N1{fill:#0A0F25;} + .d2-3227093269 .fill-N2{fill:#676C7E;} + .d2-3227093269 .fill-N3{fill:#9499AB;} + .d2-3227093269 .fill-N4{fill:#CFD2DD;} + .d2-3227093269 .fill-N5{fill:#DEE1EB;} + .d2-3227093269 .fill-N6{fill:#EEF1F8;} + .d2-3227093269 .fill-N7{fill:#FFFFFF;} + .d2-3227093269 .fill-B1{fill:#0D32B2;} + .d2-3227093269 .fill-B2{fill:#0D32B2;} + .d2-3227093269 .fill-B3{fill:#E3E9FD;} + .d2-3227093269 .fill-B4{fill:#E3E9FD;} + .d2-3227093269 .fill-B5{fill:#EDF0FD;} + .d2-3227093269 .fill-B6{fill:#F7F8FE;} + .d2-3227093269 .fill-AA2{fill:#4A6FF3;} + .d2-3227093269 .fill-AA4{fill:#EDF0FD;} + .d2-3227093269 .fill-AA5{fill:#F7F8FE;} + .d2-3227093269 .fill-AB4{fill:#EDF0FD;} + .d2-3227093269 .fill-AB5{fill:#F7F8FE;} + .d2-3227093269 .stroke-N1{stroke:#0A0F25;} + .d2-3227093269 .stroke-N2{stroke:#676C7E;} + .d2-3227093269 .stroke-N3{stroke:#9499AB;} + .d2-3227093269 .stroke-N4{stroke:#CFD2DD;} + .d2-3227093269 .stroke-N5{stroke:#DEE1EB;} + .d2-3227093269 .stroke-N6{stroke:#EEF1F8;} + .d2-3227093269 .stroke-N7{stroke:#FFFFFF;} + .d2-3227093269 .stroke-B1{stroke:#0D32B2;} + .d2-3227093269 .stroke-B2{stroke:#0D32B2;} + .d2-3227093269 .stroke-B3{stroke:#E3E9FD;} + .d2-3227093269 .stroke-B4{stroke:#E3E9FD;} + .d2-3227093269 .stroke-B5{stroke:#EDF0FD;} + .d2-3227093269 .stroke-B6{stroke:#F7F8FE;} + .d2-3227093269 .stroke-AA2{stroke:#4A6FF3;} + .d2-3227093269 .stroke-AA4{stroke:#EDF0FD;} + .d2-3227093269 .stroke-AA5{stroke:#F7F8FE;} + .d2-3227093269 .stroke-AB4{stroke:#EDF0FD;} + .d2-3227093269 .stroke-AB5{stroke:#F7F8FE;} + .d2-3227093269 .background-color-N1{background-color:#0A0F25;} + .d2-3227093269 .background-color-N2{background-color:#676C7E;} + .d2-3227093269 .background-color-N3{background-color:#9499AB;} + .d2-3227093269 .background-color-N4{background-color:#CFD2DD;} + .d2-3227093269 .background-color-N5{background-color:#DEE1EB;} + .d2-3227093269 .background-color-N6{background-color:#EEF1F8;} + .d2-3227093269 .background-color-N7{background-color:#FFFFFF;} + .d2-3227093269 .background-color-B1{background-color:#0D32B2;} + .d2-3227093269 .background-color-B2{background-color:#0D32B2;} + .d2-3227093269 .background-color-B3{background-color:#E3E9FD;} + .d2-3227093269 .background-color-B4{background-color:#E3E9FD;} + .d2-3227093269 .background-color-B5{background-color:#EDF0FD;} + .d2-3227093269 .background-color-B6{background-color:#F7F8FE;} + .d2-3227093269 .background-color-AA2{background-color:#4A6FF3;} + .d2-3227093269 .background-color-AA4{background-color:#EDF0FD;} + .d2-3227093269 .background-color-AA5{background-color:#F7F8FE;} + .d2-3227093269 .background-color-AB4{background-color:#EDF0FD;} + .d2-3227093269 .background-color-AB5{background-color:#F7F8FE;} + .d2-3227093269 .color-N1{color:#0A0F25;} + .d2-3227093269 .color-N2{color:#676C7E;} + .d2-3227093269 .color-N3{color:#9499AB;} + .d2-3227093269 .color-N4{color:#CFD2DD;} + .d2-3227093269 .color-N5{color:#DEE1EB;} + .d2-3227093269 .color-N6{color:#EEF1F8;} + .d2-3227093269 .color-N7{color:#FFFFFF;} + .d2-3227093269 .color-B1{color:#0D32B2;} + .d2-3227093269 .color-B2{color:#0D32B2;} + .d2-3227093269 .color-B3{color:#E3E9FD;} + .d2-3227093269 .color-B4{color:#E3E9FD;} + .d2-3227093269 .color-B5{color:#EDF0FD;} + .d2-3227093269 .color-B6{color:#F7F8FE;} + .d2-3227093269 .color-AA2{color:#4A6FF3;} + .d2-3227093269 .color-AA4{color:#EDF0FD;} + .d2-3227093269 .color-AA5{color:#F7F8FE;} + .d2-3227093269 .color-AB4{color:#EDF0FD;} + .d2-3227093269 .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}]]>xy @@ -111,7 +111,7 @@ -I like turtlesab +I like turtlesab \ No newline at end of file diff --git a/e2etests/testdata/stable/sql_table_tooltip_animated/elk/board.exp.json b/e2etests/testdata/stable/sql_table_tooltip_animated/elk/board.exp.json index 196665d6c..613062453 100644 --- a/e2etests/testdata/stable/sql_table_tooltip_animated/elk/board.exp.json +++ b/e2etests/testdata/stable/sql_table_tooltip_animated/elk/board.exp.json @@ -55,7 +55,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "", + "constraint": null, "reference": "" } ], @@ -127,7 +127,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "", + "constraint": null, "reference": "" } ], diff --git a/e2etests/testdata/stable/sql_table_tooltip_animated/elk/sketch.exp.svg b/e2etests/testdata/stable/sql_table_tooltip_animated/elk/sketch.exp.svg index dde79e6fa..a44e7991e 100644 --- a/e2etests/testdata/stable/sql_table_tooltip_animated/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sql_table_tooltip_animated/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -xy + .d2-514706804 .fill-N1{fill:#0A0F25;} + .d2-514706804 .fill-N2{fill:#676C7E;} + .d2-514706804 .fill-N3{fill:#9499AB;} + .d2-514706804 .fill-N4{fill:#CFD2DD;} + .d2-514706804 .fill-N5{fill:#DEE1EB;} + .d2-514706804 .fill-N6{fill:#EEF1F8;} + .d2-514706804 .fill-N7{fill:#FFFFFF;} + .d2-514706804 .fill-B1{fill:#0D32B2;} + .d2-514706804 .fill-B2{fill:#0D32B2;} + .d2-514706804 .fill-B3{fill:#E3E9FD;} + .d2-514706804 .fill-B4{fill:#E3E9FD;} + .d2-514706804 .fill-B5{fill:#EDF0FD;} + .d2-514706804 .fill-B6{fill:#F7F8FE;} + .d2-514706804 .fill-AA2{fill:#4A6FF3;} + .d2-514706804 .fill-AA4{fill:#EDF0FD;} + .d2-514706804 .fill-AA5{fill:#F7F8FE;} + .d2-514706804 .fill-AB4{fill:#EDF0FD;} + .d2-514706804 .fill-AB5{fill:#F7F8FE;} + .d2-514706804 .stroke-N1{stroke:#0A0F25;} + .d2-514706804 .stroke-N2{stroke:#676C7E;} + .d2-514706804 .stroke-N3{stroke:#9499AB;} + .d2-514706804 .stroke-N4{stroke:#CFD2DD;} + .d2-514706804 .stroke-N5{stroke:#DEE1EB;} + .d2-514706804 .stroke-N6{stroke:#EEF1F8;} + .d2-514706804 .stroke-N7{stroke:#FFFFFF;} + .d2-514706804 .stroke-B1{stroke:#0D32B2;} + .d2-514706804 .stroke-B2{stroke:#0D32B2;} + .d2-514706804 .stroke-B3{stroke:#E3E9FD;} + .d2-514706804 .stroke-B4{stroke:#E3E9FD;} + .d2-514706804 .stroke-B5{stroke:#EDF0FD;} + .d2-514706804 .stroke-B6{stroke:#F7F8FE;} + .d2-514706804 .stroke-AA2{stroke:#4A6FF3;} + .d2-514706804 .stroke-AA4{stroke:#EDF0FD;} + .d2-514706804 .stroke-AA5{stroke:#F7F8FE;} + .d2-514706804 .stroke-AB4{stroke:#EDF0FD;} + .d2-514706804 .stroke-AB5{stroke:#F7F8FE;} + .d2-514706804 .background-color-N1{background-color:#0A0F25;} + .d2-514706804 .background-color-N2{background-color:#676C7E;} + .d2-514706804 .background-color-N3{background-color:#9499AB;} + .d2-514706804 .background-color-N4{background-color:#CFD2DD;} + .d2-514706804 .background-color-N5{background-color:#DEE1EB;} + .d2-514706804 .background-color-N6{background-color:#EEF1F8;} + .d2-514706804 .background-color-N7{background-color:#FFFFFF;} + .d2-514706804 .background-color-B1{background-color:#0D32B2;} + .d2-514706804 .background-color-B2{background-color:#0D32B2;} + .d2-514706804 .background-color-B3{background-color:#E3E9FD;} + .d2-514706804 .background-color-B4{background-color:#E3E9FD;} + .d2-514706804 .background-color-B5{background-color:#EDF0FD;} + .d2-514706804 .background-color-B6{background-color:#F7F8FE;} + .d2-514706804 .background-color-AA2{background-color:#4A6FF3;} + .d2-514706804 .background-color-AA4{background-color:#EDF0FD;} + .d2-514706804 .background-color-AA5{background-color:#F7F8FE;} + .d2-514706804 .background-color-AB4{background-color:#EDF0FD;} + .d2-514706804 .background-color-AB5{background-color:#F7F8FE;} + .d2-514706804 .color-N1{color:#0A0F25;} + .d2-514706804 .color-N2{color:#676C7E;} + .d2-514706804 .color-N3{color:#9499AB;} + .d2-514706804 .color-N4{color:#CFD2DD;} + .d2-514706804 .color-N5{color:#DEE1EB;} + .d2-514706804 .color-N6{color:#EEF1F8;} + .d2-514706804 .color-N7{color:#FFFFFF;} + .d2-514706804 .color-B1{color:#0D32B2;} + .d2-514706804 .color-B2{color:#0D32B2;} + .d2-514706804 .color-B3{color:#E3E9FD;} + .d2-514706804 .color-B4{color:#E3E9FD;} + .d2-514706804 .color-B5{color:#EDF0FD;} + .d2-514706804 .color-B6{color:#F7F8FE;} + .d2-514706804 .color-AA2{color:#4A6FF3;} + .d2-514706804 .color-AA4{color:#EDF0FD;} + .d2-514706804 .color-AA5{color:#F7F8FE;} + .d2-514706804 .color-AB4{color:#EDF0FD;} + .d2-514706804 .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}]]>xy @@ -111,7 +111,7 @@ -I like turtlesab +I like turtlesab \ No newline at end of file diff --git a/e2etests/testdata/stable/sql_tables/dagre/board.exp.json b/e2etests/testdata/stable/sql_tables/dagre/board.exp.json index 581e46023..3a9f9f9ef 100644 --- a/e2etests/testdata/stable/sql_tables/dagre/board.exp.json +++ b/e2etests/testdata/stable/sql_tables/dagre/board.exp.json @@ -55,7 +55,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -83,7 +83,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -111,7 +111,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -139,7 +139,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -167,7 +167,9 @@ "labelWidth": 77, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" } ], @@ -239,7 +241,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -267,7 +269,7 @@ "labelWidth": 67, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -295,7 +297,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -323,7 +325,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], @@ -395,7 +397,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -423,7 +425,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -451,7 +453,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], @@ -523,7 +525,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -551,7 +553,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -579,7 +581,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -607,7 +609,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], diff --git a/e2etests/testdata/stable/sql_tables/dagre/sketch.exp.svg b/e2etests/testdata/stable/sql_tables/dagre/sketch.exp.svg index 81f940f21..c9995c79b 100644 --- a/e2etests/testdata/stable/sql_tables/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sql_tables/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -usersidintnamestringemailstringpasswordstringlast_logindatetimePKproductsidintpricedecimalskustringnamestringordersidintuser_idintproduct_idintshipmentsidintorder_idinttracking_numberstringstatusstring + .d2-974536278 .fill-N1{fill:#0A0F25;} + .d2-974536278 .fill-N2{fill:#676C7E;} + .d2-974536278 .fill-N3{fill:#9499AB;} + .d2-974536278 .fill-N4{fill:#CFD2DD;} + .d2-974536278 .fill-N5{fill:#DEE1EB;} + .d2-974536278 .fill-N6{fill:#EEF1F8;} + .d2-974536278 .fill-N7{fill:#FFFFFF;} + .d2-974536278 .fill-B1{fill:#0D32B2;} + .d2-974536278 .fill-B2{fill:#0D32B2;} + .d2-974536278 .fill-B3{fill:#E3E9FD;} + .d2-974536278 .fill-B4{fill:#E3E9FD;} + .d2-974536278 .fill-B5{fill:#EDF0FD;} + .d2-974536278 .fill-B6{fill:#F7F8FE;} + .d2-974536278 .fill-AA2{fill:#4A6FF3;} + .d2-974536278 .fill-AA4{fill:#EDF0FD;} + .d2-974536278 .fill-AA5{fill:#F7F8FE;} + .d2-974536278 .fill-AB4{fill:#EDF0FD;} + .d2-974536278 .fill-AB5{fill:#F7F8FE;} + .d2-974536278 .stroke-N1{stroke:#0A0F25;} + .d2-974536278 .stroke-N2{stroke:#676C7E;} + .d2-974536278 .stroke-N3{stroke:#9499AB;} + .d2-974536278 .stroke-N4{stroke:#CFD2DD;} + .d2-974536278 .stroke-N5{stroke:#DEE1EB;} + .d2-974536278 .stroke-N6{stroke:#EEF1F8;} + .d2-974536278 .stroke-N7{stroke:#FFFFFF;} + .d2-974536278 .stroke-B1{stroke:#0D32B2;} + .d2-974536278 .stroke-B2{stroke:#0D32B2;} + .d2-974536278 .stroke-B3{stroke:#E3E9FD;} + .d2-974536278 .stroke-B4{stroke:#E3E9FD;} + .d2-974536278 .stroke-B5{stroke:#EDF0FD;} + .d2-974536278 .stroke-B6{stroke:#F7F8FE;} + .d2-974536278 .stroke-AA2{stroke:#4A6FF3;} + .d2-974536278 .stroke-AA4{stroke:#EDF0FD;} + .d2-974536278 .stroke-AA5{stroke:#F7F8FE;} + .d2-974536278 .stroke-AB4{stroke:#EDF0FD;} + .d2-974536278 .stroke-AB5{stroke:#F7F8FE;} + .d2-974536278 .background-color-N1{background-color:#0A0F25;} + .d2-974536278 .background-color-N2{background-color:#676C7E;} + .d2-974536278 .background-color-N3{background-color:#9499AB;} + .d2-974536278 .background-color-N4{background-color:#CFD2DD;} + .d2-974536278 .background-color-N5{background-color:#DEE1EB;} + .d2-974536278 .background-color-N6{background-color:#EEF1F8;} + .d2-974536278 .background-color-N7{background-color:#FFFFFF;} + .d2-974536278 .background-color-B1{background-color:#0D32B2;} + .d2-974536278 .background-color-B2{background-color:#0D32B2;} + .d2-974536278 .background-color-B3{background-color:#E3E9FD;} + .d2-974536278 .background-color-B4{background-color:#E3E9FD;} + .d2-974536278 .background-color-B5{background-color:#EDF0FD;} + .d2-974536278 .background-color-B6{background-color:#F7F8FE;} + .d2-974536278 .background-color-AA2{background-color:#4A6FF3;} + .d2-974536278 .background-color-AA4{background-color:#EDF0FD;} + .d2-974536278 .background-color-AA5{background-color:#F7F8FE;} + .d2-974536278 .background-color-AB4{background-color:#EDF0FD;} + .d2-974536278 .background-color-AB5{background-color:#F7F8FE;} + .d2-974536278 .color-N1{color:#0A0F25;} + .d2-974536278 .color-N2{color:#676C7E;} + .d2-974536278 .color-N3{color:#9499AB;} + .d2-974536278 .color-N4{color:#CFD2DD;} + .d2-974536278 .color-N5{color:#DEE1EB;} + .d2-974536278 .color-N6{color:#EEF1F8;} + .d2-974536278 .color-N7{color:#FFFFFF;} + .d2-974536278 .color-B1{color:#0D32B2;} + .d2-974536278 .color-B2{color:#0D32B2;} + .d2-974536278 .color-B3{color:#E3E9FD;} + .d2-974536278 .color-B4{color:#E3E9FD;} + .d2-974536278 .color-B5{color:#EDF0FD;} + .d2-974536278 .color-B6{color:#F7F8FE;} + .d2-974536278 .color-AA2{color:#4A6FF3;} + .d2-974536278 .color-AA4{color:#EDF0FD;} + .d2-974536278 .color-AA5{color:#F7F8FE;} + .d2-974536278 .color-AB4{color:#EDF0FD;} + .d2-974536278 .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}]]>usersidintnamestringemailstringpasswordstringlast_logindatetimePKproductsidintpricedecimalskustringnamestringordersidintuser_idintproduct_idintshipmentsidintorder_idinttracking_numberstringstatusstring \ No newline at end of file diff --git a/e2etests/testdata/stable/sql_tables/elk/board.exp.json b/e2etests/testdata/stable/sql_tables/elk/board.exp.json index 286573e69..2915e1b47 100644 --- a/e2etests/testdata/stable/sql_tables/elk/board.exp.json +++ b/e2etests/testdata/stable/sql_tables/elk/board.exp.json @@ -55,7 +55,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -83,7 +83,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -111,7 +111,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -139,7 +139,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -167,7 +167,9 @@ "labelWidth": 77, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" } ], @@ -239,7 +241,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -267,7 +269,7 @@ "labelWidth": 67, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -295,7 +297,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -323,7 +325,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], @@ -395,7 +397,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -423,7 +425,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -451,7 +453,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], @@ -523,7 +525,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -551,7 +553,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -579,7 +581,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -607,7 +609,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], diff --git a/e2etests/testdata/stable/sql_tables/elk/sketch.exp.svg b/e2etests/testdata/stable/sql_tables/elk/sketch.exp.svg index 8a5e91dab..5644330b9 100644 --- a/e2etests/testdata/stable/sql_tables/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sql_tables/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -usersidintnamestringemailstringpasswordstringlast_logindatetimePKproductsidintpricedecimalskustringnamestringordersidintuser_idintproduct_idintshipmentsidintorder_idinttracking_numberstringstatusstring + .d2-4282920767 .fill-N1{fill:#0A0F25;} + .d2-4282920767 .fill-N2{fill:#676C7E;} + .d2-4282920767 .fill-N3{fill:#9499AB;} + .d2-4282920767 .fill-N4{fill:#CFD2DD;} + .d2-4282920767 .fill-N5{fill:#DEE1EB;} + .d2-4282920767 .fill-N6{fill:#EEF1F8;} + .d2-4282920767 .fill-N7{fill:#FFFFFF;} + .d2-4282920767 .fill-B1{fill:#0D32B2;} + .d2-4282920767 .fill-B2{fill:#0D32B2;} + .d2-4282920767 .fill-B3{fill:#E3E9FD;} + .d2-4282920767 .fill-B4{fill:#E3E9FD;} + .d2-4282920767 .fill-B5{fill:#EDF0FD;} + .d2-4282920767 .fill-B6{fill:#F7F8FE;} + .d2-4282920767 .fill-AA2{fill:#4A6FF3;} + .d2-4282920767 .fill-AA4{fill:#EDF0FD;} + .d2-4282920767 .fill-AA5{fill:#F7F8FE;} + .d2-4282920767 .fill-AB4{fill:#EDF0FD;} + .d2-4282920767 .fill-AB5{fill:#F7F8FE;} + .d2-4282920767 .stroke-N1{stroke:#0A0F25;} + .d2-4282920767 .stroke-N2{stroke:#676C7E;} + .d2-4282920767 .stroke-N3{stroke:#9499AB;} + .d2-4282920767 .stroke-N4{stroke:#CFD2DD;} + .d2-4282920767 .stroke-N5{stroke:#DEE1EB;} + .d2-4282920767 .stroke-N6{stroke:#EEF1F8;} + .d2-4282920767 .stroke-N7{stroke:#FFFFFF;} + .d2-4282920767 .stroke-B1{stroke:#0D32B2;} + .d2-4282920767 .stroke-B2{stroke:#0D32B2;} + .d2-4282920767 .stroke-B3{stroke:#E3E9FD;} + .d2-4282920767 .stroke-B4{stroke:#E3E9FD;} + .d2-4282920767 .stroke-B5{stroke:#EDF0FD;} + .d2-4282920767 .stroke-B6{stroke:#F7F8FE;} + .d2-4282920767 .stroke-AA2{stroke:#4A6FF3;} + .d2-4282920767 .stroke-AA4{stroke:#EDF0FD;} + .d2-4282920767 .stroke-AA5{stroke:#F7F8FE;} + .d2-4282920767 .stroke-AB4{stroke:#EDF0FD;} + .d2-4282920767 .stroke-AB5{stroke:#F7F8FE;} + .d2-4282920767 .background-color-N1{background-color:#0A0F25;} + .d2-4282920767 .background-color-N2{background-color:#676C7E;} + .d2-4282920767 .background-color-N3{background-color:#9499AB;} + .d2-4282920767 .background-color-N4{background-color:#CFD2DD;} + .d2-4282920767 .background-color-N5{background-color:#DEE1EB;} + .d2-4282920767 .background-color-N6{background-color:#EEF1F8;} + .d2-4282920767 .background-color-N7{background-color:#FFFFFF;} + .d2-4282920767 .background-color-B1{background-color:#0D32B2;} + .d2-4282920767 .background-color-B2{background-color:#0D32B2;} + .d2-4282920767 .background-color-B3{background-color:#E3E9FD;} + .d2-4282920767 .background-color-B4{background-color:#E3E9FD;} + .d2-4282920767 .background-color-B5{background-color:#EDF0FD;} + .d2-4282920767 .background-color-B6{background-color:#F7F8FE;} + .d2-4282920767 .background-color-AA2{background-color:#4A6FF3;} + .d2-4282920767 .background-color-AA4{background-color:#EDF0FD;} + .d2-4282920767 .background-color-AA5{background-color:#F7F8FE;} + .d2-4282920767 .background-color-AB4{background-color:#EDF0FD;} + .d2-4282920767 .background-color-AB5{background-color:#F7F8FE;} + .d2-4282920767 .color-N1{color:#0A0F25;} + .d2-4282920767 .color-N2{color:#676C7E;} + .d2-4282920767 .color-N3{color:#9499AB;} + .d2-4282920767 .color-N4{color:#CFD2DD;} + .d2-4282920767 .color-N5{color:#DEE1EB;} + .d2-4282920767 .color-N6{color:#EEF1F8;} + .d2-4282920767 .color-N7{color:#FFFFFF;} + .d2-4282920767 .color-B1{color:#0D32B2;} + .d2-4282920767 .color-B2{color:#0D32B2;} + .d2-4282920767 .color-B3{color:#E3E9FD;} + .d2-4282920767 .color-B4{color:#E3E9FD;} + .d2-4282920767 .color-B5{color:#EDF0FD;} + .d2-4282920767 .color-B6{color:#F7F8FE;} + .d2-4282920767 .color-AA2{color:#4A6FF3;} + .d2-4282920767 .color-AA4{color:#EDF0FD;} + .d2-4282920767 .color-AA5{color:#F7F8FE;} + .d2-4282920767 .color-AB4{color:#EDF0FD;} + .d2-4282920767 .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}]]>usersidintnamestringemailstringpasswordstringlast_logindatetimePKproductsidintpricedecimalskustringnamestringordersidintuser_idintproduct_idintshipmentsidintorder_idinttracking_numberstringstatusstring \ No newline at end of file diff --git a/e2etests/testdata/stable/unnamed_only_height/dagre/board.exp.json b/e2etests/testdata/stable/unnamed_only_height/dagre/board.exp.json index 75d93d051..362c4f342 100644 --- a/e2etests/testdata/stable/unnamed_only_height/dagre/board.exp.json +++ b/e2etests/testdata/stable/unnamed_only_height/dagre/board.exp.json @@ -130,7 +130,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -158,7 +158,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -186,7 +186,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -214,7 +214,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -242,7 +242,7 @@ "labelWidth": 77, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], diff --git a/e2etests/testdata/stable/unnamed_only_height/dagre/sketch.exp.svg b/e2etests/testdata/stable/unnamed_only_height/dagre/sketch.exp.svg index 89a1bbd71..736a400fe 100644 --- a/e2etests/testdata/stable/unnamed_only_height/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/unnamed_only_height/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ --numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetimea := 5 + .d2-1407267750 .fill-N1{fill:#0A0F25;} + .d2-1407267750 .fill-N2{fill:#676C7E;} + .d2-1407267750 .fill-N3{fill:#9499AB;} + .d2-1407267750 .fill-N4{fill:#CFD2DD;} + .d2-1407267750 .fill-N5{fill:#DEE1EB;} + .d2-1407267750 .fill-N6{fill:#EEF1F8;} + .d2-1407267750 .fill-N7{fill:#FFFFFF;} + .d2-1407267750 .fill-B1{fill:#0D32B2;} + .d2-1407267750 .fill-B2{fill:#0D32B2;} + .d2-1407267750 .fill-B3{fill:#E3E9FD;} + .d2-1407267750 .fill-B4{fill:#E3E9FD;} + .d2-1407267750 .fill-B5{fill:#EDF0FD;} + .d2-1407267750 .fill-B6{fill:#F7F8FE;} + .d2-1407267750 .fill-AA2{fill:#4A6FF3;} + .d2-1407267750 .fill-AA4{fill:#EDF0FD;} + .d2-1407267750 .fill-AA5{fill:#F7F8FE;} + .d2-1407267750 .fill-AB4{fill:#EDF0FD;} + .d2-1407267750 .fill-AB5{fill:#F7F8FE;} + .d2-1407267750 .stroke-N1{stroke:#0A0F25;} + .d2-1407267750 .stroke-N2{stroke:#676C7E;} + .d2-1407267750 .stroke-N3{stroke:#9499AB;} + .d2-1407267750 .stroke-N4{stroke:#CFD2DD;} + .d2-1407267750 .stroke-N5{stroke:#DEE1EB;} + .d2-1407267750 .stroke-N6{stroke:#EEF1F8;} + .d2-1407267750 .stroke-N7{stroke:#FFFFFF;} + .d2-1407267750 .stroke-B1{stroke:#0D32B2;} + .d2-1407267750 .stroke-B2{stroke:#0D32B2;} + .d2-1407267750 .stroke-B3{stroke:#E3E9FD;} + .d2-1407267750 .stroke-B4{stroke:#E3E9FD;} + .d2-1407267750 .stroke-B5{stroke:#EDF0FD;} + .d2-1407267750 .stroke-B6{stroke:#F7F8FE;} + .d2-1407267750 .stroke-AA2{stroke:#4A6FF3;} + .d2-1407267750 .stroke-AA4{stroke:#EDF0FD;} + .d2-1407267750 .stroke-AA5{stroke:#F7F8FE;} + .d2-1407267750 .stroke-AB4{stroke:#EDF0FD;} + .d2-1407267750 .stroke-AB5{stroke:#F7F8FE;} + .d2-1407267750 .background-color-N1{background-color:#0A0F25;} + .d2-1407267750 .background-color-N2{background-color:#676C7E;} + .d2-1407267750 .background-color-N3{background-color:#9499AB;} + .d2-1407267750 .background-color-N4{background-color:#CFD2DD;} + .d2-1407267750 .background-color-N5{background-color:#DEE1EB;} + .d2-1407267750 .background-color-N6{background-color:#EEF1F8;} + .d2-1407267750 .background-color-N7{background-color:#FFFFFF;} + .d2-1407267750 .background-color-B1{background-color:#0D32B2;} + .d2-1407267750 .background-color-B2{background-color:#0D32B2;} + .d2-1407267750 .background-color-B3{background-color:#E3E9FD;} + .d2-1407267750 .background-color-B4{background-color:#E3E9FD;} + .d2-1407267750 .background-color-B5{background-color:#EDF0FD;} + .d2-1407267750 .background-color-B6{background-color:#F7F8FE;} + .d2-1407267750 .background-color-AA2{background-color:#4A6FF3;} + .d2-1407267750 .background-color-AA4{background-color:#EDF0FD;} + .d2-1407267750 .background-color-AA5{background-color:#F7F8FE;} + .d2-1407267750 .background-color-AB4{background-color:#EDF0FD;} + .d2-1407267750 .background-color-AB5{background-color:#F7F8FE;} + .d2-1407267750 .color-N1{color:#0A0F25;} + .d2-1407267750 .color-N2{color:#676C7E;} + .d2-1407267750 .color-N3{color:#9499AB;} + .d2-1407267750 .color-N4{color:#CFD2DD;} + .d2-1407267750 .color-N5{color:#DEE1EB;} + .d2-1407267750 .color-N6{color:#EEF1F8;} + .d2-1407267750 .color-N7{color:#FFFFFF;} + .d2-1407267750 .color-B1{color:#0D32B2;} + .d2-1407267750 .color-B2{color:#0D32B2;} + .d2-1407267750 .color-B3{color:#E3E9FD;} + .d2-1407267750 .color-B4{color:#E3E9FD;} + .d2-1407267750 .color-B5{color:#EDF0FD;} + .d2-1407267750 .color-B6{color:#F7F8FE;} + .d2-1407267750 .color-AA2{color:#4A6FF3;} + .d2-1407267750 .color-AA4{color:#EDF0FD;} + .d2-1407267750 .color-AA5{color:#F7F8FE;} + .d2-1407267750 .color-AB4{color:#EDF0FD;} + .d2-1407267750 .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}]]>-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetimea := 5 b := a + 7 fmt.Printf("%d", b)a := 5 b := a + 7 -fmt.Printf("%d", b) +fmt.Printf("%d", b) \ No newline at end of file diff --git a/e2etests/testdata/stable/unnamed_only_height/elk/board.exp.json b/e2etests/testdata/stable/unnamed_only_height/elk/board.exp.json index 93804d206..b4c0804d3 100644 --- a/e2etests/testdata/stable/unnamed_only_height/elk/board.exp.json +++ b/e2etests/testdata/stable/unnamed_only_height/elk/board.exp.json @@ -130,7 +130,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -158,7 +158,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -186,7 +186,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -214,7 +214,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -242,7 +242,7 @@ "labelWidth": 77, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], diff --git a/e2etests/testdata/stable/unnamed_only_height/elk/sketch.exp.svg b/e2etests/testdata/stable/unnamed_only_height/elk/sketch.exp.svg index 1b7ba0dd3..1b28eb69d 100644 --- a/e2etests/testdata/stable/unnamed_only_height/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/unnamed_only_height/elk/sketch.exp.svg @@ -1,23 +1,23 @@ --numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetimea := 5 + .d2-161332075 .fill-N1{fill:#0A0F25;} + .d2-161332075 .fill-N2{fill:#676C7E;} + .d2-161332075 .fill-N3{fill:#9499AB;} + .d2-161332075 .fill-N4{fill:#CFD2DD;} + .d2-161332075 .fill-N5{fill:#DEE1EB;} + .d2-161332075 .fill-N6{fill:#EEF1F8;} + .d2-161332075 .fill-N7{fill:#FFFFFF;} + .d2-161332075 .fill-B1{fill:#0D32B2;} + .d2-161332075 .fill-B2{fill:#0D32B2;} + .d2-161332075 .fill-B3{fill:#E3E9FD;} + .d2-161332075 .fill-B4{fill:#E3E9FD;} + .d2-161332075 .fill-B5{fill:#EDF0FD;} + .d2-161332075 .fill-B6{fill:#F7F8FE;} + .d2-161332075 .fill-AA2{fill:#4A6FF3;} + .d2-161332075 .fill-AA4{fill:#EDF0FD;} + .d2-161332075 .fill-AA5{fill:#F7F8FE;} + .d2-161332075 .fill-AB4{fill:#EDF0FD;} + .d2-161332075 .fill-AB5{fill:#F7F8FE;} + .d2-161332075 .stroke-N1{stroke:#0A0F25;} + .d2-161332075 .stroke-N2{stroke:#676C7E;} + .d2-161332075 .stroke-N3{stroke:#9499AB;} + .d2-161332075 .stroke-N4{stroke:#CFD2DD;} + .d2-161332075 .stroke-N5{stroke:#DEE1EB;} + .d2-161332075 .stroke-N6{stroke:#EEF1F8;} + .d2-161332075 .stroke-N7{stroke:#FFFFFF;} + .d2-161332075 .stroke-B1{stroke:#0D32B2;} + .d2-161332075 .stroke-B2{stroke:#0D32B2;} + .d2-161332075 .stroke-B3{stroke:#E3E9FD;} + .d2-161332075 .stroke-B4{stroke:#E3E9FD;} + .d2-161332075 .stroke-B5{stroke:#EDF0FD;} + .d2-161332075 .stroke-B6{stroke:#F7F8FE;} + .d2-161332075 .stroke-AA2{stroke:#4A6FF3;} + .d2-161332075 .stroke-AA4{stroke:#EDF0FD;} + .d2-161332075 .stroke-AA5{stroke:#F7F8FE;} + .d2-161332075 .stroke-AB4{stroke:#EDF0FD;} + .d2-161332075 .stroke-AB5{stroke:#F7F8FE;} + .d2-161332075 .background-color-N1{background-color:#0A0F25;} + .d2-161332075 .background-color-N2{background-color:#676C7E;} + .d2-161332075 .background-color-N3{background-color:#9499AB;} + .d2-161332075 .background-color-N4{background-color:#CFD2DD;} + .d2-161332075 .background-color-N5{background-color:#DEE1EB;} + .d2-161332075 .background-color-N6{background-color:#EEF1F8;} + .d2-161332075 .background-color-N7{background-color:#FFFFFF;} + .d2-161332075 .background-color-B1{background-color:#0D32B2;} + .d2-161332075 .background-color-B2{background-color:#0D32B2;} + .d2-161332075 .background-color-B3{background-color:#E3E9FD;} + .d2-161332075 .background-color-B4{background-color:#E3E9FD;} + .d2-161332075 .background-color-B5{background-color:#EDF0FD;} + .d2-161332075 .background-color-B6{background-color:#F7F8FE;} + .d2-161332075 .background-color-AA2{background-color:#4A6FF3;} + .d2-161332075 .background-color-AA4{background-color:#EDF0FD;} + .d2-161332075 .background-color-AA5{background-color:#F7F8FE;} + .d2-161332075 .background-color-AB4{background-color:#EDF0FD;} + .d2-161332075 .background-color-AB5{background-color:#F7F8FE;} + .d2-161332075 .color-N1{color:#0A0F25;} + .d2-161332075 .color-N2{color:#676C7E;} + .d2-161332075 .color-N3{color:#9499AB;} + .d2-161332075 .color-N4{color:#CFD2DD;} + .d2-161332075 .color-N5{color:#DEE1EB;} + .d2-161332075 .color-N6{color:#EEF1F8;} + .d2-161332075 .color-N7{color:#FFFFFF;} + .d2-161332075 .color-B1{color:#0D32B2;} + .d2-161332075 .color-B2{color:#0D32B2;} + .d2-161332075 .color-B3{color:#E3E9FD;} + .d2-161332075 .color-B4{color:#E3E9FD;} + .d2-161332075 .color-B5{color:#EDF0FD;} + .d2-161332075 .color-B6{color:#F7F8FE;} + .d2-161332075 .color-AA2{color:#4A6FF3;} + .d2-161332075 .color-AA4{color:#EDF0FD;} + .d2-161332075 .color-AA5{color:#F7F8FE;} + .d2-161332075 .color-AB4{color:#EDF0FD;} + .d2-161332075 .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}]]>-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetimea := 5 b := a + 7 fmt.Printf("%d", b)a := 5 b := a + 7 -fmt.Printf("%d", b) +fmt.Printf("%d", b) \ No newline at end of file diff --git a/e2etests/testdata/stable/unnamed_only_width/dagre/board.exp.json b/e2etests/testdata/stable/unnamed_only_width/dagre/board.exp.json index bc19074e8..508c0dfda 100644 --- a/e2etests/testdata/stable/unnamed_only_width/dagre/board.exp.json +++ b/e2etests/testdata/stable/unnamed_only_width/dagre/board.exp.json @@ -130,7 +130,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -158,7 +158,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -186,7 +186,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -214,7 +214,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -242,7 +242,7 @@ "labelWidth": 77, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], diff --git a/e2etests/testdata/stable/unnamed_only_width/dagre/sketch.exp.svg b/e2etests/testdata/stable/unnamed_only_width/dagre/sketch.exp.svg index 504e7aae7..edc974615 100644 --- a/e2etests/testdata/stable/unnamed_only_width/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/unnamed_only_width/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ --numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetimea := 5 + .d2-2995629861 .fill-N1{fill:#0A0F25;} + .d2-2995629861 .fill-N2{fill:#676C7E;} + .d2-2995629861 .fill-N3{fill:#9499AB;} + .d2-2995629861 .fill-N4{fill:#CFD2DD;} + .d2-2995629861 .fill-N5{fill:#DEE1EB;} + .d2-2995629861 .fill-N6{fill:#EEF1F8;} + .d2-2995629861 .fill-N7{fill:#FFFFFF;} + .d2-2995629861 .fill-B1{fill:#0D32B2;} + .d2-2995629861 .fill-B2{fill:#0D32B2;} + .d2-2995629861 .fill-B3{fill:#E3E9FD;} + .d2-2995629861 .fill-B4{fill:#E3E9FD;} + .d2-2995629861 .fill-B5{fill:#EDF0FD;} + .d2-2995629861 .fill-B6{fill:#F7F8FE;} + .d2-2995629861 .fill-AA2{fill:#4A6FF3;} + .d2-2995629861 .fill-AA4{fill:#EDF0FD;} + .d2-2995629861 .fill-AA5{fill:#F7F8FE;} + .d2-2995629861 .fill-AB4{fill:#EDF0FD;} + .d2-2995629861 .fill-AB5{fill:#F7F8FE;} + .d2-2995629861 .stroke-N1{stroke:#0A0F25;} + .d2-2995629861 .stroke-N2{stroke:#676C7E;} + .d2-2995629861 .stroke-N3{stroke:#9499AB;} + .d2-2995629861 .stroke-N4{stroke:#CFD2DD;} + .d2-2995629861 .stroke-N5{stroke:#DEE1EB;} + .d2-2995629861 .stroke-N6{stroke:#EEF1F8;} + .d2-2995629861 .stroke-N7{stroke:#FFFFFF;} + .d2-2995629861 .stroke-B1{stroke:#0D32B2;} + .d2-2995629861 .stroke-B2{stroke:#0D32B2;} + .d2-2995629861 .stroke-B3{stroke:#E3E9FD;} + .d2-2995629861 .stroke-B4{stroke:#E3E9FD;} + .d2-2995629861 .stroke-B5{stroke:#EDF0FD;} + .d2-2995629861 .stroke-B6{stroke:#F7F8FE;} + .d2-2995629861 .stroke-AA2{stroke:#4A6FF3;} + .d2-2995629861 .stroke-AA4{stroke:#EDF0FD;} + .d2-2995629861 .stroke-AA5{stroke:#F7F8FE;} + .d2-2995629861 .stroke-AB4{stroke:#EDF0FD;} + .d2-2995629861 .stroke-AB5{stroke:#F7F8FE;} + .d2-2995629861 .background-color-N1{background-color:#0A0F25;} + .d2-2995629861 .background-color-N2{background-color:#676C7E;} + .d2-2995629861 .background-color-N3{background-color:#9499AB;} + .d2-2995629861 .background-color-N4{background-color:#CFD2DD;} + .d2-2995629861 .background-color-N5{background-color:#DEE1EB;} + .d2-2995629861 .background-color-N6{background-color:#EEF1F8;} + .d2-2995629861 .background-color-N7{background-color:#FFFFFF;} + .d2-2995629861 .background-color-B1{background-color:#0D32B2;} + .d2-2995629861 .background-color-B2{background-color:#0D32B2;} + .d2-2995629861 .background-color-B3{background-color:#E3E9FD;} + .d2-2995629861 .background-color-B4{background-color:#E3E9FD;} + .d2-2995629861 .background-color-B5{background-color:#EDF0FD;} + .d2-2995629861 .background-color-B6{background-color:#F7F8FE;} + .d2-2995629861 .background-color-AA2{background-color:#4A6FF3;} + .d2-2995629861 .background-color-AA4{background-color:#EDF0FD;} + .d2-2995629861 .background-color-AA5{background-color:#F7F8FE;} + .d2-2995629861 .background-color-AB4{background-color:#EDF0FD;} + .d2-2995629861 .background-color-AB5{background-color:#F7F8FE;} + .d2-2995629861 .color-N1{color:#0A0F25;} + .d2-2995629861 .color-N2{color:#676C7E;} + .d2-2995629861 .color-N3{color:#9499AB;} + .d2-2995629861 .color-N4{color:#CFD2DD;} + .d2-2995629861 .color-N5{color:#DEE1EB;} + .d2-2995629861 .color-N6{color:#EEF1F8;} + .d2-2995629861 .color-N7{color:#FFFFFF;} + .d2-2995629861 .color-B1{color:#0D32B2;} + .d2-2995629861 .color-B2{color:#0D32B2;} + .d2-2995629861 .color-B3{color:#E3E9FD;} + .d2-2995629861 .color-B4{color:#E3E9FD;} + .d2-2995629861 .color-B5{color:#EDF0FD;} + .d2-2995629861 .color-B6{color:#F7F8FE;} + .d2-2995629861 .color-AA2{color:#4A6FF3;} + .d2-2995629861 .color-AA4{color:#EDF0FD;} + .d2-2995629861 .color-AA5{color:#F7F8FE;} + .d2-2995629861 .color-AB4{color:#EDF0FD;} + .d2-2995629861 .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}]]>-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetimea := 5 b := a + 7 fmt.Printf("%d", b)a := 5 b := a + 7 -fmt.Printf("%d", b) +fmt.Printf("%d", b) \ No newline at end of file diff --git a/e2etests/testdata/stable/unnamed_only_width/elk/board.exp.json b/e2etests/testdata/stable/unnamed_only_width/elk/board.exp.json index e3549a896..bbcdf884f 100644 --- a/e2etests/testdata/stable/unnamed_only_width/elk/board.exp.json +++ b/e2etests/testdata/stable/unnamed_only_width/elk/board.exp.json @@ -130,7 +130,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -158,7 +158,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -186,7 +186,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -214,7 +214,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -242,7 +242,7 @@ "labelWidth": 77, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], diff --git a/e2etests/testdata/stable/unnamed_only_width/elk/sketch.exp.svg b/e2etests/testdata/stable/unnamed_only_width/elk/sketch.exp.svg index 33f300ff3..25b46f205 100644 --- a/e2etests/testdata/stable/unnamed_only_width/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/unnamed_only_width/elk/sketch.exp.svg @@ -1,23 +1,23 @@ --numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetimea := 5 + .d2-2813224635 .fill-N1{fill:#0A0F25;} + .d2-2813224635 .fill-N2{fill:#676C7E;} + .d2-2813224635 .fill-N3{fill:#9499AB;} + .d2-2813224635 .fill-N4{fill:#CFD2DD;} + .d2-2813224635 .fill-N5{fill:#DEE1EB;} + .d2-2813224635 .fill-N6{fill:#EEF1F8;} + .d2-2813224635 .fill-N7{fill:#FFFFFF;} + .d2-2813224635 .fill-B1{fill:#0D32B2;} + .d2-2813224635 .fill-B2{fill:#0D32B2;} + .d2-2813224635 .fill-B3{fill:#E3E9FD;} + .d2-2813224635 .fill-B4{fill:#E3E9FD;} + .d2-2813224635 .fill-B5{fill:#EDF0FD;} + .d2-2813224635 .fill-B6{fill:#F7F8FE;} + .d2-2813224635 .fill-AA2{fill:#4A6FF3;} + .d2-2813224635 .fill-AA4{fill:#EDF0FD;} + .d2-2813224635 .fill-AA5{fill:#F7F8FE;} + .d2-2813224635 .fill-AB4{fill:#EDF0FD;} + .d2-2813224635 .fill-AB5{fill:#F7F8FE;} + .d2-2813224635 .stroke-N1{stroke:#0A0F25;} + .d2-2813224635 .stroke-N2{stroke:#676C7E;} + .d2-2813224635 .stroke-N3{stroke:#9499AB;} + .d2-2813224635 .stroke-N4{stroke:#CFD2DD;} + .d2-2813224635 .stroke-N5{stroke:#DEE1EB;} + .d2-2813224635 .stroke-N6{stroke:#EEF1F8;} + .d2-2813224635 .stroke-N7{stroke:#FFFFFF;} + .d2-2813224635 .stroke-B1{stroke:#0D32B2;} + .d2-2813224635 .stroke-B2{stroke:#0D32B2;} + .d2-2813224635 .stroke-B3{stroke:#E3E9FD;} + .d2-2813224635 .stroke-B4{stroke:#E3E9FD;} + .d2-2813224635 .stroke-B5{stroke:#EDF0FD;} + .d2-2813224635 .stroke-B6{stroke:#F7F8FE;} + .d2-2813224635 .stroke-AA2{stroke:#4A6FF3;} + .d2-2813224635 .stroke-AA4{stroke:#EDF0FD;} + .d2-2813224635 .stroke-AA5{stroke:#F7F8FE;} + .d2-2813224635 .stroke-AB4{stroke:#EDF0FD;} + .d2-2813224635 .stroke-AB5{stroke:#F7F8FE;} + .d2-2813224635 .background-color-N1{background-color:#0A0F25;} + .d2-2813224635 .background-color-N2{background-color:#676C7E;} + .d2-2813224635 .background-color-N3{background-color:#9499AB;} + .d2-2813224635 .background-color-N4{background-color:#CFD2DD;} + .d2-2813224635 .background-color-N5{background-color:#DEE1EB;} + .d2-2813224635 .background-color-N6{background-color:#EEF1F8;} + .d2-2813224635 .background-color-N7{background-color:#FFFFFF;} + .d2-2813224635 .background-color-B1{background-color:#0D32B2;} + .d2-2813224635 .background-color-B2{background-color:#0D32B2;} + .d2-2813224635 .background-color-B3{background-color:#E3E9FD;} + .d2-2813224635 .background-color-B4{background-color:#E3E9FD;} + .d2-2813224635 .background-color-B5{background-color:#EDF0FD;} + .d2-2813224635 .background-color-B6{background-color:#F7F8FE;} + .d2-2813224635 .background-color-AA2{background-color:#4A6FF3;} + .d2-2813224635 .background-color-AA4{background-color:#EDF0FD;} + .d2-2813224635 .background-color-AA5{background-color:#F7F8FE;} + .d2-2813224635 .background-color-AB4{background-color:#EDF0FD;} + .d2-2813224635 .background-color-AB5{background-color:#F7F8FE;} + .d2-2813224635 .color-N1{color:#0A0F25;} + .d2-2813224635 .color-N2{color:#676C7E;} + .d2-2813224635 .color-N3{color:#9499AB;} + .d2-2813224635 .color-N4{color:#CFD2DD;} + .d2-2813224635 .color-N5{color:#DEE1EB;} + .d2-2813224635 .color-N6{color:#EEF1F8;} + .d2-2813224635 .color-N7{color:#FFFFFF;} + .d2-2813224635 .color-B1{color:#0D32B2;} + .d2-2813224635 .color-B2{color:#0D32B2;} + .d2-2813224635 .color-B3{color:#E3E9FD;} + .d2-2813224635 .color-B4{color:#E3E9FD;} + .d2-2813224635 .color-B5{color:#EDF0FD;} + .d2-2813224635 .color-B6{color:#F7F8FE;} + .d2-2813224635 .color-AA2{color:#4A6FF3;} + .d2-2813224635 .color-AA4{color:#EDF0FD;} + .d2-2813224635 .color-AA5{color:#F7F8FE;} + .d2-2813224635 .color-AB4{color:#EDF0FD;} + .d2-2813224635 .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}]]>-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetimea := 5 b := a + 7 fmt.Printf("%d", b)a := 5 b := a + 7 -fmt.Printf("%d", b) +fmt.Printf("%d", b) \ No newline at end of file diff --git a/e2etests/testdata/themes/dark_terrastruct_flagship/dagre/board.exp.json b/e2etests/testdata/themes/dark_terrastruct_flagship/dagre/board.exp.json index dff52458e..5dc8a4ddb 100644 --- a/e2etests/testdata/themes/dark_terrastruct_flagship/dagre/board.exp.json +++ b/e2etests/testdata/themes/dark_terrastruct_flagship/dagre/board.exp.json @@ -506,7 +506,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -534,7 +534,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -562,7 +562,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -590,7 +590,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -618,7 +618,7 @@ "labelWidth": 77, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], diff --git a/e2etests/testdata/themes/dark_terrastruct_flagship/dagre/sketch.exp.svg b/e2etests/testdata/themes/dark_terrastruct_flagship/dagre/sketch.exp.svg index 4f343b627..54b9ad183 100644 --- a/e2etests/testdata/themes/dark_terrastruct_flagship/dagre/sketch.exp.svg +++ b/e2etests/testdata/themes/dark_terrastruct_flagship/dagre/sketch.exp.svg @@ -1,41 +1,41 @@ -networkuserapi serverlogsusersidintnamestringemailstringpasswordstringlast_logindatetimeproducts+idint+pricedecimal+skustring+namestring

A tale

@@ -908,7 +908,7 @@     city2 := City{Name: "CityB", Population: 1200000}     tellTale(city1, city2) -}Cell Toweronline portaldata processorsatellitesTRANSMITTERuistorage sendsendsendphone logsmake call accessdisplaypersist +}Cell Toweronline portaldata processorsatellitesTRANSMITTERuistorage sendsendsendphone logsmake call accessdisplaypersist diff --git a/e2etests/testdata/themes/dark_terrastruct_flagship/elk/board.exp.json b/e2etests/testdata/themes/dark_terrastruct_flagship/elk/board.exp.json index 06b748c37..b41e1e298 100644 --- a/e2etests/testdata/themes/dark_terrastruct_flagship/elk/board.exp.json +++ b/e2etests/testdata/themes/dark_terrastruct_flagship/elk/board.exp.json @@ -506,7 +506,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -534,7 +534,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -562,7 +562,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -590,7 +590,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -618,7 +618,7 @@ "labelWidth": 77, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], diff --git a/e2etests/testdata/themes/dark_terrastruct_flagship/elk/sketch.exp.svg b/e2etests/testdata/themes/dark_terrastruct_flagship/elk/sketch.exp.svg index 32e986e26..3264e89ce 100644 --- a/e2etests/testdata/themes/dark_terrastruct_flagship/elk/sketch.exp.svg +++ b/e2etests/testdata/themes/dark_terrastruct_flagship/elk/sketch.exp.svg @@ -1,41 +1,41 @@ -networkuserapi serverlogsusersidintnamestringemailstringpasswordstringlast_logindatetimeproducts+idint+pricedecimal+skustring+namestring

A tale

@@ -908,7 +908,7 @@     city2 := City{Name: "CityB", Population: 1200000}     tellTale(city1, city2) -}Cell Toweronline portaldata processorsatellitesTRANSMITTERuistorage sendsendsendphone logsmake call accessdisplaypersist +}Cell Toweronline portaldata processorsatellitesTRANSMITTERuistorage sendsendsendphone logsmake call accessdisplaypersist diff --git a/e2etests/testdata/themes/terminal/dagre/board.exp.json b/e2etests/testdata/themes/terminal/dagre/board.exp.json index 78da5cd83..6a08b6ef8 100644 --- a/e2etests/testdata/themes/terminal/dagre/board.exp.json +++ b/e2etests/testdata/themes/terminal/dagre/board.exp.json @@ -510,7 +510,7 @@ "labelWidth": 34, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -538,7 +538,7 @@ "labelWidth": 71, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -566,7 +566,7 @@ "labelWidth": 71, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -594,7 +594,7 @@ "labelWidth": 71, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -622,7 +622,7 @@ "labelWidth": 94, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], diff --git a/e2etests/testdata/themes/terminal/dagre/sketch.exp.svg b/e2etests/testdata/themes/terminal/dagre/sketch.exp.svg index 3fddcb766..d3fcda588 100644 --- a/e2etests/testdata/themes/terminal/dagre/sketch.exp.svg +++ b/e2etests/testdata/themes/terminal/dagre/sketch.exp.svg @@ -1,34 +1,34 @@ -containerscloudtall cylinderclass2-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voidusersidintnamestringemailstringpasswordstringlast_logindatetimecontainer

markdown text expanded to 800x400

@@ -859,7 +859,7 @@ b := a + 7 fmt.Printf("%d", b)a := 5 b := a + 7 -fmt.Printf("%d", b)circle containerdiamond containeroval containerhexagon containerdiamondcirclehexagonoval +fmt.Printf("%d", b)circle containerdiamond containeroval containerhexagon containerdiamondcirclehexagonoval \ No newline at end of file diff --git a/e2etests/testdata/todo/shape_set_width_height/elk/board.exp.json b/e2etests/testdata/todo/shape_set_width_height/elk/board.exp.json index a461cb6a0..f83df4dbe 100644 --- a/e2etests/testdata/todo/shape_set_width_height/elk/board.exp.json +++ b/e2etests/testdata/todo/shape_set_width_height/elk/board.exp.json @@ -581,7 +581,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -609,7 +609,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -637,7 +637,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -665,7 +665,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -693,7 +693,7 @@ "labelWidth": 77, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], diff --git a/e2etests/testdata/todo/shape_set_width_height/elk/sketch.exp.svg b/e2etests/testdata/todo/shape_set_width_height/elk/sketch.exp.svg index 974f24494..1eacaa706 100644 --- a/e2etests/testdata/todo/shape_set_width_height/elk/sketch.exp.svg +++ b/e2etests/testdata/todo/shape_set_width_height/elk/sketch.exp.svg @@ -1,34 +1,34 @@ -containerscloudtall cylinderclass2-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voidusersidintnamestringemailstringpasswordstringlast_logindatetimecontainer

markdown text expanded to 800x400

@@ -859,7 +859,7 @@ b := a + 7 fmt.Printf("%d", b)a := 5 b := a + 7 -fmt.Printf("%d", b)circle containerdiamond containeroval containerhexagon containerdiamondcirclehexagonoval +fmt.Printf("%d", b)circle containerdiamond containeroval containerhexagon containerdiamondcirclehexagonoval \ No newline at end of file diff --git a/testdata/d2compiler/TestCompile/array-classes.exp.json b/testdata/d2compiler/TestCompile/array-classes.exp.json index 5b8f0f4d7..3b4e75a95 100644 --- a/testdata/d2compiler/TestCompile/array-classes.exp.json +++ b/testdata/d2compiler/TestCompile/array-classes.exp.json @@ -623,9 +623,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -660,9 +658,11 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null, + "classes": [ + "path", + "path2" + ] }, "zIndex": 0 } @@ -736,9 +736,11 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null, + "classes": [ + "dragon_ball", + "path" + ] }, "zIndex": 0 }, @@ -810,9 +812,11 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null, + "classes": [ + "path", + "dragon_ball" + ] }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/basic_icon.exp.json b/testdata/d2compiler/TestCompile/basic_icon.exp.json index bc9297187..fec8c9f44 100644 --- a/testdata/d2compiler/TestCompile/basic_icon.exp.json +++ b/testdata/d2compiler/TestCompile/basic_icon.exp.json @@ -93,9 +93,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -155,9 +153,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/basic_sequence.exp.json b/testdata/d2compiler/TestCompile/basic_sequence.exp.json index 115675dbb..40ecd99ad 100644 --- a/testdata/d2compiler/TestCompile/basic_sequence.exp.json +++ b/testdata/d2compiler/TestCompile/basic_sequence.exp.json @@ -88,9 +88,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -137,9 +135,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/basic_shape.exp.json b/testdata/d2compiler/TestCompile/basic_shape.exp.json index d5d26fb77..74758c4b0 100644 --- a/testdata/d2compiler/TestCompile/basic_shape.exp.json +++ b/testdata/d2compiler/TestCompile/basic_shape.exp.json @@ -88,9 +88,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -137,9 +135,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/basic_style.exp.json b/testdata/d2compiler/TestCompile/basic_style.exp.json index cb68c4cc1..d69341d1c 100644 --- a/testdata/d2compiler/TestCompile/basic_style.exp.json +++ b/testdata/d2compiler/TestCompile/basic_style.exp.json @@ -95,9 +95,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -148,9 +146,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/class-shape-class.exp.json b/testdata/d2compiler/TestCompile/class-shape-class.exp.json index a787bab08..dd334affa 100644 --- a/testdata/d2compiler/TestCompile/class-shape-class.exp.json +++ b/testdata/d2compiler/TestCompile/class-shape-class.exp.json @@ -212,9 +212,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -271,9 +269,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - }, + "constraint": null, "classes": [ "classClass" ] diff --git a/testdata/d2compiler/TestCompile/class_paren.exp.json b/testdata/d2compiler/TestCompile/class_paren.exp.json index aeaf5b5d4..7d81a32af 100644 --- a/testdata/d2compiler/TestCompile/class_paren.exp.json +++ b/testdata/d2compiler/TestCompile/class_paren.exp.json @@ -187,9 +187,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -257,9 +255,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/class_style.exp.json b/testdata/d2compiler/TestCompile/class_style.exp.json index d9df3a793..32a6cc903 100644 --- a/testdata/d2compiler/TestCompile/class_style.exp.json +++ b/testdata/d2compiler/TestCompile/class_style.exp.json @@ -161,9 +161,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -224,9 +222,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/classes.exp.json b/testdata/d2compiler/TestCompile/classes.exp.json index dc7045842..f1518a445 100644 --- a/testdata/d2compiler/TestCompile/classes.exp.json +++ b/testdata/d2compiler/TestCompile/classes.exp.json @@ -649,9 +649,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -686,9 +684,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - }, + "constraint": null, "classes": [ "path" ] @@ -762,9 +758,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - }, + "constraint": null, "classes": [ "dragon_ball" ] @@ -836,9 +830,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - }, + "constraint": null, "classes": [ "dragon_ball" ] @@ -890,9 +882,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - }, + "constraint": null, "classes": [ "dragon_ball" ] diff --git a/testdata/d2compiler/TestCompile/constraint_label.exp.json b/testdata/d2compiler/TestCompile/constraint_label.exp.json index f85092e4c..789a5e3d0 100644 --- a/testdata/d2compiler/TestCompile/constraint_label.exp.json +++ b/testdata/d2compiler/TestCompile/constraint_label.exp.json @@ -121,9 +121,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -170,9 +168,9 @@ "direction": { "value": "" }, - "constraint": { - "value": "BIZ" - } + "constraint": [ + "BIZ" + ] }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/default_direction.exp.json b/testdata/d2compiler/TestCompile/default_direction.exp.json index 32057225f..b412ef6b2 100644 --- a/testdata/d2compiler/TestCompile/default_direction.exp.json +++ b/testdata/d2compiler/TestCompile/default_direction.exp.json @@ -49,9 +49,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -98,9 +96,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/dimension_with_style.exp.json b/testdata/d2compiler/TestCompile/dimension_with_style.exp.json index ef03ae945..8ed777881 100644 --- a/testdata/d2compiler/TestCompile/dimension_with_style.exp.json +++ b/testdata/d2compiler/TestCompile/dimension_with_style.exp.json @@ -123,9 +123,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -179,9 +177,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/dimensions_on_containers.exp.json b/testdata/d2compiler/TestCompile/dimensions_on_containers.exp.json index 9cfeaf3bb..1ce908eb3 100644 --- a/testdata/d2compiler/TestCompile/dimensions_on_containers.exp.json +++ b/testdata/d2compiler/TestCompile/dimensions_on_containers.exp.json @@ -957,9 +957,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1006,9 +1004,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1056,9 +1052,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1109,9 +1103,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1162,9 +1154,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1212,9 +1202,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1265,9 +1253,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1318,9 +1304,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1371,9 +1355,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1424,9 +1406,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/dimensions_on_nonimage.exp.json b/testdata/d2compiler/TestCompile/dimensions_on_nonimage.exp.json index 639d347d6..35a80069c 100644 --- a/testdata/d2compiler/TestCompile/dimensions_on_nonimage.exp.json +++ b/testdata/d2compiler/TestCompile/dimensions_on_nonimage.exp.json @@ -151,9 +151,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -206,9 +204,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge.exp.json b/testdata/d2compiler/TestCompile/edge.exp.json index f888ec849..2758dc7a9 100644 --- a/testdata/d2compiler/TestCompile/edge.exp.json +++ b/testdata/d2compiler/TestCompile/edge.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -105,9 +103,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -154,9 +150,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -201,9 +195,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json b/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json index b5b40590e..4ef1b9aa6 100644 --- a/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json +++ b/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json @@ -251,9 +251,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -278,9 +276,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "dst_arrow": true, "dstArrowhead": { @@ -303,9 +299,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "references": [ { @@ -328,9 +322,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -377,9 +369,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -424,9 +414,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_arrowhead_primary.exp.json b/testdata/d2compiler/TestCompile/edge_arrowhead_primary.exp.json index 8d8ed8127..56fbc9a01 100644 --- a/testdata/d2compiler/TestCompile/edge_arrowhead_primary.exp.json +++ b/testdata/d2compiler/TestCompile/edge_arrowhead_primary.exp.json @@ -111,9 +111,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -138,9 +136,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "dst_arrow": true, "references": [ @@ -164,9 +160,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -213,9 +207,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -260,9 +252,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_chain.exp.json b/testdata/d2compiler/TestCompile/edge_chain.exp.json index 539f25157..b49dbc80e 100644 --- a/testdata/d2compiler/TestCompile/edge_chain.exp.json +++ b/testdata/d2compiler/TestCompile/edge_chain.exp.json @@ -119,9 +119,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -152,9 +150,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -184,9 +180,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -233,9 +227,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -300,9 +292,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -347,9 +337,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_chain_map.exp.json b/testdata/d2compiler/TestCompile/edge_chain_map.exp.json index 79bb97959..fd4ad255a 100644 --- a/testdata/d2compiler/TestCompile/edge_chain_map.exp.json +++ b/testdata/d2compiler/TestCompile/edge_chain_map.exp.json @@ -148,9 +148,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -181,9 +179,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -213,9 +209,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -262,9 +256,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -329,9 +321,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -376,9 +366,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_column_index.exp.json b/testdata/d2compiler/TestCompile/edge_column_index.exp.json index 1921eab2b..61de9cdce 100644 --- a/testdata/d2compiler/TestCompile/edge_column_index.exp.json +++ b/testdata/d2compiler/TestCompile/edge_column_index.exp.json @@ -350,9 +350,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -385,9 +383,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -476,7 +472,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -504,7 +500,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "", + "constraint": null, "reference": "" } ] @@ -525,9 +521,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -614,7 +608,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -642,7 +636,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "", + "constraint": null, "reference": "" } ] @@ -663,9 +657,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json b/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json index 7a53845c0..f0f3c8d6a 100644 --- a/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json +++ b/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json @@ -117,9 +117,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -154,9 +152,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -203,9 +199,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -250,9 +244,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json index 650bd2797..3ebde90fc 100644 --- a/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json @@ -160,9 +160,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -187,9 +185,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "dst_arrow": true, "references": [ @@ -216,9 +212,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -285,9 +279,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -352,9 +344,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json index ad7c1b473..e058522ff 100644 --- a/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json @@ -128,9 +128,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -155,9 +153,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "dst_arrow": true, "references": [ @@ -181,9 +177,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -230,9 +224,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -277,9 +269,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_index.exp.json b/testdata/d2compiler/TestCompile/edge_index.exp.json index ca945bea7..5d41e9a8f 100644 --- a/testdata/d2compiler/TestCompile/edge_index.exp.json +++ b/testdata/d2compiler/TestCompile/edge_index.exp.json @@ -143,9 +143,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -179,9 +177,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -248,9 +244,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -315,9 +309,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_index_map.exp.json b/testdata/d2compiler/TestCompile/edge_index_map.exp.json index 0cafc323b..294aa8bab 100644 --- a/testdata/d2compiler/TestCompile/edge_index_map.exp.json +++ b/testdata/d2compiler/TestCompile/edge_index_map.exp.json @@ -162,9 +162,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -198,9 +196,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -267,9 +263,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -334,9 +328,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_index_nested.exp.json b/testdata/d2compiler/TestCompile/edge_index_nested.exp.json index d0c580715..8d8b5b5b9 100644 --- a/testdata/d2compiler/TestCompile/edge_index_nested.exp.json +++ b/testdata/d2compiler/TestCompile/edge_index_nested.exp.json @@ -172,9 +172,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -208,9 +206,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -257,9 +253,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -324,9 +318,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -391,9 +383,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json b/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json index 312d38e8d..93e05726c 100644 --- a/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json +++ b/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json @@ -188,9 +188,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -224,9 +222,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -293,9 +289,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -360,9 +354,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -427,9 +419,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.exp.json b/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.exp.json index bcad40145..27406389d 100644 --- a/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.exp.json +++ b/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.exp.json @@ -201,9 +201,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -241,9 +239,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -310,9 +306,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -377,9 +371,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -444,9 +436,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.exp.json b/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.exp.json index d3c7ca6ed..f8a4cfdcc 100644 --- a/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.exp.json +++ b/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.exp.json @@ -207,9 +207,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -247,9 +245,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -296,9 +292,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -343,9 +337,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -390,9 +382,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.exp.json b/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.exp.json index 63647e828..f445b6e7f 100644 --- a/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.exp.json +++ b/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.exp.json @@ -220,9 +220,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -260,9 +258,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -309,9 +305,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -356,9 +350,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -403,9 +395,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.exp.json b/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.exp.json index 7da55f2d6..9e0282760 100644 --- a/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.exp.json +++ b/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.exp.json @@ -238,9 +238,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -278,9 +276,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -327,9 +323,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -374,9 +368,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -421,9 +413,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_label_map.exp.json b/testdata/d2compiler/TestCompile/edge_label_map.exp.json index 4be3fe8c2..754144cf6 100644 --- a/testdata/d2compiler/TestCompile/edge_label_map.exp.json +++ b/testdata/d2compiler/TestCompile/edge_label_map.exp.json @@ -128,9 +128,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -165,9 +163,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -214,9 +210,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -261,9 +255,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_map.exp.json b/testdata/d2compiler/TestCompile/edge_map.exp.json index a5431b793..3bae02599 100644 --- a/testdata/d2compiler/TestCompile/edge_map.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map.exp.json @@ -111,9 +111,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -144,9 +142,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -193,9 +189,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -240,9 +234,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json index 88a53d3d2..ba7165ab1 100644 --- a/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json @@ -140,9 +140,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -167,9 +165,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "dst_arrow": true, "references": [ @@ -193,9 +189,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -242,9 +236,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -289,9 +281,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json b/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json index a3524f7da..3fc0fe7e6 100644 --- a/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json @@ -156,9 +156,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -196,9 +194,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -265,9 +261,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -332,9 +326,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json b/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json index 630447498..42c80b924 100644 --- a/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json @@ -174,9 +174,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -214,9 +212,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -283,9 +279,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -350,9 +344,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_map_nested.exp.json b/testdata/d2compiler/TestCompile/edge_map_nested.exp.json index ef5f4f2e8..b7a5e9a71 100644 --- a/testdata/d2compiler/TestCompile/edge_map_nested.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_nested.exp.json @@ -136,9 +136,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -173,9 +171,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -222,9 +218,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -269,9 +263,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json b/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json index 11f5a9a8e..3b9735f8b 100644 --- a/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json @@ -118,9 +118,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -155,9 +153,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -204,9 +200,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -251,9 +245,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json index 100752bf7..f84f23bab 100644 --- a/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json @@ -228,9 +228,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -255,9 +253,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "dst_arrow": true, "dstArrowhead": { @@ -276,9 +272,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "references": [ { @@ -304,9 +298,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -373,9 +365,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -440,9 +430,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json index 9684e7d9b..2f5c7b058 100644 --- a/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json @@ -122,9 +122,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -149,9 +147,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "dst_arrow": true, "references": [ @@ -175,9 +171,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -224,9 +218,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -271,9 +263,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json index e1998a59b..8c13431a6 100644 --- a/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json @@ -178,9 +178,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -205,9 +203,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "dst_arrow": true, "references": [ @@ -234,9 +230,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -303,9 +297,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -370,9 +362,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/escaped_id.exp.json b/testdata/d2compiler/TestCompile/escaped_id.exp.json index a5135358f..796618579 100644 --- a/testdata/d2compiler/TestCompile/escaped_id.exp.json +++ b/testdata/d2compiler/TestCompile/escaped_id.exp.json @@ -49,9 +49,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -98,9 +96,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/fill-pattern.exp.json b/testdata/d2compiler/TestCompile/fill-pattern.exp.json index 6b30f7fc0..63ae0bdc0 100644 --- a/testdata/d2compiler/TestCompile/fill-pattern.exp.json +++ b/testdata/d2compiler/TestCompile/fill-pattern.exp.json @@ -117,9 +117,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -170,9 +168,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/grid.exp.json b/testdata/d2compiler/TestCompile/grid.exp.json index 6c45373de..92d184f76 100644 --- a/testdata/d2compiler/TestCompile/grid.exp.json +++ b/testdata/d2compiler/TestCompile/grid.exp.json @@ -113,9 +113,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -162,9 +160,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - }, + "constraint": null, "gridRows": { "value": "200" }, diff --git a/testdata/d2compiler/TestCompile/image_style.exp.json b/testdata/d2compiler/TestCompile/image_style.exp.json index deba163ae..37a47c513 100644 --- a/testdata/d2compiler/TestCompile/image_style.exp.json +++ b/testdata/d2compiler/TestCompile/image_style.exp.json @@ -170,9 +170,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -236,9 +234,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/link-board-key-nested.exp.json b/testdata/d2compiler/TestCompile/link-board-key-nested.exp.json index a06090d29..8158ac8ca 100644 --- a/testdata/d2compiler/TestCompile/link-board-key-nested.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-key-nested.exp.json @@ -179,9 +179,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -228,9 +226,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -289,9 +285,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -477,9 +471,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -526,9 +518,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/link-board-mixed.exp.json b/testdata/d2compiler/TestCompile/link-board-mixed.exp.json index 5026294ec..ecfe17242 100644 --- a/testdata/d2compiler/TestCompile/link-board-mixed.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-mixed.exp.json @@ -329,9 +329,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -412,9 +410,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -750,9 +746,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -783,9 +777,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -832,9 +824,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -879,9 +869,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -1219,9 +1207,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1348,9 +1334,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/link-board-nested.exp.json b/testdata/d2compiler/TestCompile/link-board-nested.exp.json index 79b61eb73..05aa0f0eb 100644 --- a/testdata/d2compiler/TestCompile/link-board-nested.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-nested.exp.json @@ -208,9 +208,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -271,9 +269,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -488,9 +484,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -706,9 +700,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -755,9 +747,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/link-board-ok.exp.json b/testdata/d2compiler/TestCompile/link-board-ok.exp.json index 77fab9ab6..5d6526c97 100644 --- a/testdata/d2compiler/TestCompile/link-board-ok.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-ok.exp.json @@ -150,9 +150,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -213,9 +211,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -372,9 +368,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -421,9 +415,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/link-board-underscore.exp.json b/testdata/d2compiler/TestCompile/link-board-underscore.exp.json index 2fba9e04d..4fd1a2f08 100644 --- a/testdata/d2compiler/TestCompile/link-board-underscore.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-underscore.exp.json @@ -274,9 +274,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -323,9 +321,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -606,9 +602,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -655,9 +649,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -938,9 +930,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1001,9 +991,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1062,9 +1050,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/missing-class.exp.json b/testdata/d2compiler/TestCompile/missing-class.exp.json index 9ba720cd7..1aa7a9673 100644 --- a/testdata/d2compiler/TestCompile/missing-class.exp.json +++ b/testdata/d2compiler/TestCompile/missing-class.exp.json @@ -70,9 +70,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -130,9 +128,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - }, + "constraint": null, "classes": [ "yo" ] diff --git a/testdata/d2compiler/TestCompile/near_constant.exp.json b/testdata/d2compiler/TestCompile/near_constant.exp.json index 9d3e863ea..6139e09c5 100644 --- a/testdata/d2compiler/TestCompile/near_constant.exp.json +++ b/testdata/d2compiler/TestCompile/near_constant.exp.json @@ -70,9 +70,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -145,9 +143,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/nested_sql.exp.json b/testdata/d2compiler/TestCompile/nested_sql.exp.json index 9c3d344c9..85cd7107e 100644 --- a/testdata/d2compiler/TestCompile/nested_sql.exp.json +++ b/testdata/d2compiler/TestCompile/nested_sql.exp.json @@ -183,9 +183,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -232,9 +230,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -290,7 +286,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -318,7 +314,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "", + "constraint": null, "reference": "" } ] @@ -339,9 +335,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/nil_scope_obj_regression.exp.json b/testdata/d2compiler/TestCompile/nil_scope_obj_regression.exp.json index 92b041542..e2ab08f59 100644 --- a/testdata/d2compiler/TestCompile/nil_scope_obj_regression.exp.json +++ b/testdata/d2compiler/TestCompile/nil_scope_obj_regression.exp.json @@ -112,9 +112,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -192,9 +190,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -239,9 +235,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/null.exp.json b/testdata/d2compiler/TestCompile/null.exp.json index 65705d6c7..9781daf23 100644 --- a/testdata/d2compiler/TestCompile/null.exp.json +++ b/testdata/d2compiler/TestCompile/null.exp.json @@ -49,9 +49,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -98,9 +96,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/path_link.exp.json b/testdata/d2compiler/TestCompile/path_link.exp.json index 8d2ad1a19..69a66c765 100644 --- a/testdata/d2compiler/TestCompile/path_link.exp.json +++ b/testdata/d2compiler/TestCompile/path_link.exp.json @@ -88,9 +88,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -140,9 +138,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/positions.exp.json b/testdata/d2compiler/TestCompile/positions.exp.json index f639d6d9f..877d874c3 100644 --- a/testdata/d2compiler/TestCompile/positions.exp.json +++ b/testdata/d2compiler/TestCompile/positions.exp.json @@ -113,9 +113,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -168,9 +166,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/reordered-classes.exp.json b/testdata/d2compiler/TestCompile/reordered-classes.exp.json index 556b25462..9264f93b5 100644 --- a/testdata/d2compiler/TestCompile/reordered-classes.exp.json +++ b/testdata/d2compiler/TestCompile/reordered-classes.exp.json @@ -216,9 +216,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -276,9 +274,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - }, + "constraint": null, "classes": [ "x" ] diff --git a/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json b/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json index 3a21e6622..b1b0e5261 100644 --- a/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json +++ b/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json @@ -283,9 +283,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -401,9 +399,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -448,9 +444,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/root_direction.exp.json b/testdata/d2compiler/TestCompile/root_direction.exp.json index 64fce1459..98ba30eda 100644 --- a/testdata/d2compiler/TestCompile/root_direction.exp.json +++ b/testdata/d2compiler/TestCompile/root_direction.exp.json @@ -59,9 +59,7 @@ "direction": { "value": "right" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, diff --git a/testdata/d2compiler/TestCompile/root_sequence.exp.json b/testdata/d2compiler/TestCompile/root_sequence.exp.json index 39d523dd3..353ce9a61 100644 --- a/testdata/d2compiler/TestCompile/root_sequence.exp.json +++ b/testdata/d2compiler/TestCompile/root_sequence.exp.json @@ -59,9 +59,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, diff --git a/testdata/d2compiler/TestCompile/self-referencing.exp.json b/testdata/d2compiler/TestCompile/self-referencing.exp.json index 4529e7133..f03dfd7bc 100644 --- a/testdata/d2compiler/TestCompile/self-referencing.exp.json +++ b/testdata/d2compiler/TestCompile/self-referencing.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -105,9 +103,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -174,9 +170,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/sequence-timestamp.exp.json b/testdata/d2compiler/TestCompile/sequence-timestamp.exp.json index b72c145c3..4863b889f 100644 --- a/testdata/d2compiler/TestCompile/sequence-timestamp.exp.json +++ b/testdata/d2compiler/TestCompile/sequence-timestamp.exp.json @@ -243,9 +243,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -276,9 +274,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -376,9 +372,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -443,9 +437,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -490,9 +482,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -537,9 +527,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -595,9 +583,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/sequence_container.exp.json b/testdata/d2compiler/TestCompile/sequence_container.exp.json index e99e98406..fa20f600f 100644 --- a/testdata/d2compiler/TestCompile/sequence_container.exp.json +++ b/testdata/d2compiler/TestCompile/sequence_container.exp.json @@ -268,9 +268,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -301,9 +299,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -333,9 +329,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -446,9 +440,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -557,9 +549,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -668,9 +658,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -779,9 +767,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -890,9 +876,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1001,9 +985,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1048,9 +1030,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/sequence_container_2.exp.json b/testdata/d2compiler/TestCompile/sequence_container_2.exp.json index d243d21d7..0c16a5702 100644 --- a/testdata/d2compiler/TestCompile/sequence_container_2.exp.json +++ b/testdata/d2compiler/TestCompile/sequence_container_2.exp.json @@ -246,9 +246,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -279,9 +277,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -392,9 +388,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -503,9 +497,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -614,9 +606,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -661,9 +651,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -730,9 +718,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -799,9 +785,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -868,9 +852,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -915,9 +897,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/sequence_grouped_note.exp.json b/testdata/d2compiler/TestCompile/sequence_grouped_note.exp.json index d9046aa5e..574aaf9dd 100644 --- a/testdata/d2compiler/TestCompile/sequence_grouped_note.exp.json +++ b/testdata/d2compiler/TestCompile/sequence_grouped_note.exp.json @@ -168,9 +168,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -217,9 +215,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -295,9 +291,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -342,9 +336,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -400,9 +392,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/sequence_scoping.exp.json b/testdata/d2compiler/TestCompile/sequence_scoping.exp.json index a16a4da10..3742eb6d6 100644 --- a/testdata/d2compiler/TestCompile/sequence_scoping.exp.json +++ b/testdata/d2compiler/TestCompile/sequence_scoping.exp.json @@ -356,9 +356,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -389,9 +387,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -421,9 +417,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -453,9 +447,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -502,9 +494,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -600,9 +590,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -771,9 +759,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -818,9 +804,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -876,9 +860,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1007,9 +989,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1076,9 +1056,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/set_direction.exp.json b/testdata/d2compiler/TestCompile/set_direction.exp.json index 655ebf0ae..dc8c57b5b 100644 --- a/testdata/d2compiler/TestCompile/set_direction.exp.json +++ b/testdata/d2compiler/TestCompile/set_direction.exp.json @@ -88,9 +88,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -137,9 +135,7 @@ "direction": { "value": "left" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/single_dimension_on_circle.exp.json b/testdata/d2compiler/TestCompile/single_dimension_on_circle.exp.json index 258a6a4a5..ebca6e33c 100644 --- a/testdata/d2compiler/TestCompile/single_dimension_on_circle.exp.json +++ b/testdata/d2compiler/TestCompile/single_dimension_on_circle.exp.json @@ -122,9 +122,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -174,9 +172,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/sql-constraints.exp.json b/testdata/d2compiler/TestCompile/sql-constraints.exp.json new file mode 100644 index 000000000..8a1742a81 --- /dev/null +++ b/testdata/d2compiler/TestCompile/sql-constraints.exp.json @@ -0,0 +1,372 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,0:0:0-4:1:110", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,0:0:0-4:1:110", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,0:3:3-4:0:109", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,1:2:7-1:18:23", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,1:2:7-1:7:12", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,1:2:7-1:7:12", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,1:9:14-1:18:23", + "value": [ + { + "string": "sql_table", + "raw_string": "sql_table" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,2:2:26-2:34:58", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,2:2:26-2:3:27", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,2:2:26-2:3:27", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "primary": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,2:5:29-2:8:32", + "value": [ + { + "string": "int", + "raw_string": "int" + } + ] + } + }, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,2:9:33-2:33:57", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,2:10:34-2:33:57", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,2:10:34-2:20:44", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,2:10:34-2:20:44", + "value": [ + { + "string": "constraint", + "raw_string": "constraint" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,2:22:46-2:33:57", + "value": [ + { + "string": "primary_key", + "raw_string": "primary_key" + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,3:2:61-3:49:108", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,3:2:61-3:3:62", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,3:2:61-3:3:62", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "primary": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,3:5:64-3:8:67", + "value": [ + { + "string": "int", + "raw_string": "int" + } + ] + } + }, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,3:9:68-3:48:107", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,3:10:69-3:48:107", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,3:10:69-3:20:79", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,3:10:69-3:20:79", + "value": [ + { + "string": "constraint", + "raw_string": "constraint" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "array": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,3:22:81-3:47:106", + "nodes": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,3:23:82-3:34:93", + "value": [ + { + "string": "primary_key", + "raw_string": "primary_key" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,3:36:95-3:47:106", + "value": [ + { + "string": "foreign_key", + "raw_string": "foreign_key" + } + ] + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "x", + "id_val": "x", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "sql_table": { + "columns": [ + { + "name": { + "label": "a", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0 + }, + "type": { + "label": "int", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0 + }, + "constraint": [ + "primary_key" + ], + "reference": "" + }, + { + "name": { + "label": "b", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0 + }, + "type": { + "label": "int", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0 + }, + "constraint": [ + "primary_key", + "foreign_key" + ], + "reference": "" + } + ] + }, + "attributes": { + "label": { + "value": "x" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "sql_table" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "err": null +} diff --git a/testdata/d2compiler/TestCompile/sql-regression.exp.json b/testdata/d2compiler/TestCompile/sql-regression.exp.json index 29516d953..539adf1c0 100644 --- a/testdata/d2compiler/TestCompile/sql-regression.exp.json +++ b/testdata/d2compiler/TestCompile/sql-regression.exp.json @@ -225,9 +225,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -278,9 +276,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -336,7 +332,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "", + "constraint": null, "reference": "" } ] @@ -357,9 +353,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -404,9 +398,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/sql_paren.exp.json b/testdata/d2compiler/TestCompile/sql_paren.exp.json index 4b2e0bb0a..eba972c81 100644 --- a/testdata/d2compiler/TestCompile/sql_paren.exp.json +++ b/testdata/d2compiler/TestCompile/sql_paren.exp.json @@ -164,9 +164,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -224,7 +222,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -252,7 +250,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "", + "constraint": null, "reference": "" } ] @@ -273,9 +271,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/stroke-width.exp.json b/testdata/d2compiler/TestCompile/stroke-width.exp.json index 4f6868c69..47a541da5 100644 --- a/testdata/d2compiler/TestCompile/stroke-width.exp.json +++ b/testdata/d2compiler/TestCompile/stroke-width.exp.json @@ -95,9 +95,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -148,9 +146,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/table_connection_attr.exp.json b/testdata/d2compiler/TestCompile/table_connection_attr.exp.json index 32b14aa78..b959db14d 100644 --- a/testdata/d2compiler/TestCompile/table_connection_attr.exp.json +++ b/testdata/d2compiler/TestCompile/table_connection_attr.exp.json @@ -309,9 +309,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -348,9 +346,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -439,7 +435,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "", + "constraint": null, "reference": "" } ] @@ -460,9 +456,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -549,7 +543,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "", + "constraint": null, "reference": "" } ] @@ -570,9 +564,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/table_style.exp.json b/testdata/d2compiler/TestCompile/table_style.exp.json index 56abfa352..57da002b7 100644 --- a/testdata/d2compiler/TestCompile/table_style.exp.json +++ b/testdata/d2compiler/TestCompile/table_style.exp.json @@ -161,9 +161,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -221,7 +219,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "", + "constraint": null, "reference": "" } ] @@ -246,9 +244,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/table_style_map.exp.json b/testdata/d2compiler/TestCompile/table_style_map.exp.json index 9c2291acb..ec723d05d 100644 --- a/testdata/d2compiler/TestCompile/table_style_map.exp.json +++ b/testdata/d2compiler/TestCompile/table_style_map.exp.json @@ -212,9 +212,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -272,7 +270,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "", + "constraint": null, "reference": "" } ] @@ -300,9 +298,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/text-transform.exp.json b/testdata/d2compiler/TestCompile/text-transform.exp.json index 7a15df912..d27559b8a 100644 --- a/testdata/d2compiler/TestCompile/text-transform.exp.json +++ b/testdata/d2compiler/TestCompile/text-transform.exp.json @@ -293,9 +293,7 @@ "direction": { "value": "right" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -330,9 +328,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -425,9 +421,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -518,9 +512,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/underscore_connection.exp.json b/testdata/d2compiler/TestCompile/underscore_connection.exp.json index 0ede3dff7..65295864e 100644 --- a/testdata/d2compiler/TestCompile/underscore_connection.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_connection.exp.json @@ -145,9 +145,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -178,9 +176,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -227,9 +223,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -338,9 +332,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -407,9 +399,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -476,9 +466,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/underscore_edge.exp.json b/testdata/d2compiler/TestCompile/underscore_edge.exp.json index e2e362d3e..518dfce6a 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge.exp.json @@ -123,9 +123,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -156,9 +154,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -236,9 +232,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -294,9 +288,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json index b172abb7c..1f457aafb 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json @@ -182,9 +182,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -215,9 +213,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -247,9 +243,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -358,9 +352,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -416,9 +408,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -474,9 +464,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json index 45d5e9c44..cadedf170 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json @@ -189,9 +189,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -222,9 +220,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -254,9 +250,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -334,9 +328,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -412,9 +404,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -459,9 +449,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json index cfc16dc74..a25963442 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json @@ -194,9 +194,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -230,9 +228,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -279,9 +275,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -326,9 +320,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -373,9 +365,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json index 436f040f2..ef0e52e5e 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json @@ -163,9 +163,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -196,9 +194,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -245,9 +241,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -323,9 +317,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -392,9 +384,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/underscore_parent_create.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_create.exp.json index 4db535bae..210d82d17 100644 --- a/testdata/d2compiler/TestCompile/underscore_parent_create.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_parent_create.exp.json @@ -89,9 +89,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -138,9 +136,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -196,9 +192,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/underscore_parent_not_root.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_not_root.exp.json index fc6b50a55..61dfa7869 100644 --- a/testdata/d2compiler/TestCompile/underscore_parent_not_root.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_parent_not_root.exp.json @@ -118,9 +118,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -167,9 +165,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -214,9 +210,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -272,9 +266,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/underscore_parent_preference_1.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_preference_1.exp.json index 52086b6ae..4db434860 100644 --- a/testdata/d2compiler/TestCompile/underscore_parent_preference_1.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_parent_preference_1.exp.json @@ -132,9 +132,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -181,9 +179,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -259,9 +255,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/underscore_parent_preference_2.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_preference_2.exp.json index f3243d490..5281966f7 100644 --- a/testdata/d2compiler/TestCompile/underscore_parent_preference_2.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_parent_preference_2.exp.json @@ -132,9 +132,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -212,9 +210,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -259,9 +255,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/underscore_parent_squared.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_squared.exp.json index c81350873..ea0c6e33c 100644 --- a/testdata/d2compiler/TestCompile/underscore_parent_squared.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_parent_squared.exp.json @@ -129,9 +129,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -178,9 +176,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -225,9 +221,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -294,9 +288,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/underscore_unresolved_obj.exp.json b/testdata/d2compiler/TestCompile/underscore_unresolved_obj.exp.json index d5c56bdee..d494bc12b 100644 --- a/testdata/d2compiler/TestCompile/underscore_unresolved_obj.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_unresolved_obj.exp.json @@ -89,9 +89,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -138,9 +136,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -196,9 +192,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/unescaped_id_cr.exp.json b/testdata/d2compiler/TestCompile/unescaped_id_cr.exp.json index 7a73c0b08..2b2f1b4f8 100644 --- a/testdata/d2compiler/TestCompile/unescaped_id_cr.exp.json +++ b/testdata/d2compiler/TestCompile/unescaped_id_cr.exp.json @@ -49,9 +49,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -98,9 +96,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/url_link.exp.json b/testdata/d2compiler/TestCompile/url_link.exp.json index 6bd4fe629..ac23a6997 100644 --- a/testdata/d2compiler/TestCompile/url_link.exp.json +++ b/testdata/d2compiler/TestCompile/url_link.exp.json @@ -88,9 +88,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -140,9 +138,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/url_link_and_not_url_tooltip_concurrently.exp.json b/testdata/d2compiler/TestCompile/url_link_and_not_url_tooltip_concurrently.exp.json index eef3087ba..414c8364a 100644 --- a/testdata/d2compiler/TestCompile/url_link_and_not_url_tooltip_concurrently.exp.json +++ b/testdata/d2compiler/TestCompile/url_link_and_not_url_tooltip_concurrently.exp.json @@ -121,9 +121,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -176,9 +174,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/url_tooltip.exp.json b/testdata/d2compiler/TestCompile/url_tooltip.exp.json index 8895108bd..d59351628 100644 --- a/testdata/d2compiler/TestCompile/url_tooltip.exp.json +++ b/testdata/d2compiler/TestCompile/url_tooltip.exp.json @@ -88,9 +88,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -140,9 +138,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/wrong_column_index.exp.json b/testdata/d2compiler/TestCompile/wrong_column_index.exp.json index 1d80ecd54..5032468f6 100644 --- a/testdata/d2compiler/TestCompile/wrong_column_index.exp.json +++ b/testdata/d2compiler/TestCompile/wrong_column_index.exp.json @@ -710,9 +710,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -745,9 +743,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -836,7 +832,9 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -864,7 +862,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -892,7 +890,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -920,7 +918,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -948,7 +946,9 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" }, { @@ -976,7 +976,9 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" } ] @@ -997,9 +999,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1086,7 +1086,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -1114,7 +1114,9 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" }, { @@ -1142,7 +1144,9 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" } ] @@ -1163,9 +1167,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile2/boards/isFolderOnly.exp.json b/testdata/d2compiler/TestCompile2/boards/isFolderOnly.exp.json index 0a2c78652..4bcd01085 100644 --- a/testdata/d2compiler/TestCompile2/boards/isFolderOnly.exp.json +++ b/testdata/d2compiler/TestCompile2/boards/isFolderOnly.exp.json @@ -307,9 +307,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -624,9 +622,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -673,9 +669,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -989,9 +983,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1038,9 +1030,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -1354,9 +1344,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1403,9 +1391,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -1719,9 +1705,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1768,9 +1752,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile2/boards/recursive.exp.json b/testdata/d2compiler/TestCompile2/boards/recursive.exp.json index ffb88ac9e..5294489e9 100644 --- a/testdata/d2compiler/TestCompile2/boards/recursive.exp.json +++ b/testdata/d2compiler/TestCompile2/boards/recursive.exp.json @@ -315,9 +315,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -364,9 +362,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -688,9 +684,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -737,9 +731,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -1061,9 +1053,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1110,9 +1100,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -1434,9 +1422,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1483,9 +1469,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1530,9 +1514,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -1854,9 +1836,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1903,9 +1883,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1950,9 +1928,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1997,9 +1973,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile2/boards/root.exp.json b/testdata/d2compiler/TestCompile2/boards/root.exp.json index e53b1ebc1..782eb55ea 100644 --- a/testdata/d2compiler/TestCompile2/boards/root.exp.json +++ b/testdata/d2compiler/TestCompile2/boards/root.exp.json @@ -182,9 +182,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -231,9 +229,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -422,9 +418,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -471,9 +465,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -662,9 +654,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -711,9 +701,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.exp.json b/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.exp.json index 1ae53eaf1..8e76d61e4 100644 --- a/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.exp.json +++ b/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.exp.json @@ -214,9 +214,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -247,9 +245,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -296,9 +292,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -343,9 +337,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -566,9 +558,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -606,9 +596,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -675,9 +663,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -742,9 +728,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestCreate/base.exp.json b/testdata/d2oracle/TestCreate/base.exp.json index 00929a93d..f552f394a 100644 --- a/testdata/d2oracle/TestCreate/base.exp.json +++ b/testdata/d2oracle/TestCreate/base.exp.json @@ -49,9 +49,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -98,9 +96,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestCreate/container.exp.json b/testdata/d2oracle/TestCreate/container.exp.json index 313bc4453..26f8e503a 100644 --- a/testdata/d2oracle/TestCreate/container.exp.json +++ b/testdata/d2oracle/TestCreate/container.exp.json @@ -78,9 +78,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -127,9 +125,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -174,9 +170,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestCreate/container_edge.exp.json b/testdata/d2oracle/TestCreate/container_edge.exp.json index a27ba3057..68fd9cc28 100644 --- a/testdata/d2oracle/TestCreate/container_edge.exp.json +++ b/testdata/d2oracle/TestCreate/container_edge.exp.json @@ -101,9 +101,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -134,9 +132,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -183,9 +179,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -230,9 +224,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -277,9 +269,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestCreate/container_edge_label.exp.json b/testdata/d2oracle/TestCreate/container_edge_label.exp.json index 0a36050a2..9caf6498b 100644 --- a/testdata/d2oracle/TestCreate/container_edge_label.exp.json +++ b/testdata/d2oracle/TestCreate/container_edge_label.exp.json @@ -111,9 +111,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -144,9 +142,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -193,9 +189,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -240,9 +234,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -287,9 +279,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestCreate/edge.exp.json b/testdata/d2oracle/TestCreate/edge.exp.json index 15e79deed..df430f4d7 100644 --- a/testdata/d2oracle/TestCreate/edge.exp.json +++ b/testdata/d2oracle/TestCreate/edge.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -105,9 +103,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -154,9 +150,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -201,9 +195,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestCreate/edge_nested.exp.json b/testdata/d2oracle/TestCreate/edge_nested.exp.json index f67e5d529..2061d8072 100644 --- a/testdata/d2oracle/TestCreate/edge_nested.exp.json +++ b/testdata/d2oracle/TestCreate/edge_nested.exp.json @@ -88,9 +88,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -121,9 +119,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -170,9 +166,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -217,9 +211,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -264,9 +256,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestCreate/edge_scope.exp.json b/testdata/d2oracle/TestCreate/edge_scope.exp.json index d6026c51c..b31ac207b 100644 --- a/testdata/d2oracle/TestCreate/edge_scope.exp.json +++ b/testdata/d2oracle/TestCreate/edge_scope.exp.json @@ -101,9 +101,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -134,9 +132,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -183,9 +179,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -230,9 +224,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -277,9 +269,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json b/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json index c35a7b9bb..62c427f4a 100644 --- a/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json +++ b/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json @@ -101,9 +101,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -134,9 +132,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -183,9 +179,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -230,9 +224,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -277,9 +269,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json b/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json index 580de558b..393dade54 100644 --- a/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json +++ b/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json @@ -112,9 +112,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -145,9 +143,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -205,9 +201,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -263,9 +257,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -310,9 +302,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -357,9 +347,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestCreate/edge_unique.exp.json b/testdata/d2oracle/TestCreate/edge_unique.exp.json index d24660ebe..c110db69f 100644 --- a/testdata/d2oracle/TestCreate/edge_unique.exp.json +++ b/testdata/d2oracle/TestCreate/edge_unique.exp.json @@ -258,9 +258,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -291,9 +289,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -323,9 +319,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -355,9 +349,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -387,9 +379,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -436,9 +426,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -483,9 +471,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -570,9 +556,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -657,9 +641,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -744,9 +726,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestCreate/gen_key.exp.json b/testdata/d2oracle/TestCreate/gen_key.exp.json index 13f651219..6d3333c4f 100644 --- a/testdata/d2oracle/TestCreate/gen_key.exp.json +++ b/testdata/d2oracle/TestCreate/gen_key.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -121,9 +119,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -168,9 +164,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestCreate/gen_key_n.exp.json b/testdata/d2oracle/TestCreate/gen_key_n.exp.json index b7f76f285..a2e5c227f 100644 --- a/testdata/d2oracle/TestCreate/gen_key_n.exp.json +++ b/testdata/d2oracle/TestCreate/gen_key_n.exp.json @@ -330,9 +330,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -401,9 +399,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -470,9 +466,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -539,9 +533,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -586,9 +578,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -633,9 +623,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -680,9 +668,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -727,9 +713,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -774,9 +758,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -821,9 +803,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -868,9 +848,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -915,9 +893,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -962,9 +938,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1009,9 +983,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1056,9 +1028,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestCreate/gen_key_nested.exp.json b/testdata/d2oracle/TestCreate/gen_key_nested.exp.json index 64facd4a0..8e43202e6 100644 --- a/testdata/d2oracle/TestCreate/gen_key_nested.exp.json +++ b/testdata/d2oracle/TestCreate/gen_key_nested.exp.json @@ -138,9 +138,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -273,9 +271,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -406,9 +402,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -539,9 +533,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -619,9 +611,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -699,9 +689,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestCreate/gen_key_scope.exp.json b/testdata/d2oracle/TestCreate/gen_key_scope.exp.json index 8151a96d6..39d9d5b91 100644 --- a/testdata/d2oracle/TestCreate/gen_key_scope.exp.json +++ b/testdata/d2oracle/TestCreate/gen_key_scope.exp.json @@ -123,9 +123,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -194,9 +192,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -263,9 +259,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -332,9 +326,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -379,9 +371,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -426,9 +416,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestCreate/gen_key_suffix.exp.json b/testdata/d2oracle/TestCreate/gen_key_suffix.exp.json index fb3bda2ab..2cc74b8aa 100644 --- a/testdata/d2oracle/TestCreate/gen_key_suffix.exp.json +++ b/testdata/d2oracle/TestCreate/gen_key_suffix.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -121,9 +119,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -168,9 +164,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestCreate/make_scope_multiline.exp.json b/testdata/d2oracle/TestCreate/make_scope_multiline.exp.json index c8a266867..dfc4c5ab0 100644 --- a/testdata/d2oracle/TestCreate/make_scope_multiline.exp.json +++ b/testdata/d2oracle/TestCreate/make_scope_multiline.exp.json @@ -111,9 +111,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -160,9 +158,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -207,9 +203,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.exp.json b/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.exp.json index a3ca572b8..d66653ae1 100644 --- a/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.exp.json +++ b/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.exp.json @@ -157,9 +157,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -206,9 +204,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -253,9 +249,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -300,9 +294,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -347,9 +339,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.exp.json b/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.exp.json index 736cd373f..0d04cefa4 100644 --- a/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.exp.json +++ b/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.exp.json @@ -157,9 +157,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -206,9 +204,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -253,9 +249,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -300,9 +294,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -347,9 +339,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestCreate/nested.exp.json b/testdata/d2oracle/TestCreate/nested.exp.json index 24fc23908..aa857c317 100644 --- a/testdata/d2oracle/TestCreate/nested.exp.json +++ b/testdata/d2oracle/TestCreate/nested.exp.json @@ -71,9 +71,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -142,9 +140,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -211,9 +207,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -280,9 +274,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestCreate/scope.exp.json b/testdata/d2oracle/TestCreate/scope.exp.json index ed300d55d..f33cce3d9 100644 --- a/testdata/d2oracle/TestCreate/scope.exp.json +++ b/testdata/d2oracle/TestCreate/scope.exp.json @@ -100,9 +100,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -171,9 +169,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -240,9 +236,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -309,9 +303,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -356,9 +348,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/arrowhead.exp.json b/testdata/d2oracle/TestDelete/arrowhead.exp.json index e9c991074..5c9f8c316 100644 --- a/testdata/d2oracle/TestDelete/arrowhead.exp.json +++ b/testdata/d2oracle/TestDelete/arrowhead.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -105,9 +103,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -154,9 +150,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -201,9 +195,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/arrowhead_label.exp.json b/testdata/d2oracle/TestDelete/arrowhead_label.exp.json index ee16c6be0..000bc8a0f 100644 --- a/testdata/d2oracle/TestDelete/arrowhead_label.exp.json +++ b/testdata/d2oracle/TestDelete/arrowhead_label.exp.json @@ -122,9 +122,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -150,9 +148,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "references": [ { @@ -175,9 +171,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -224,9 +218,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -271,9 +263,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/arrowhead_map.exp.json b/testdata/d2oracle/TestDelete/arrowhead_map.exp.json index 148b37cf2..fcbab2448 100644 --- a/testdata/d2oracle/TestDelete/arrowhead_map.exp.json +++ b/testdata/d2oracle/TestDelete/arrowhead_map.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -105,9 +103,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -154,9 +150,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -201,9 +195,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/arrowhead_shape.exp.json b/testdata/d2oracle/TestDelete/arrowhead_shape.exp.json index 748dc7359..2aaf8ac4f 100644 --- a/testdata/d2oracle/TestDelete/arrowhead_shape.exp.json +++ b/testdata/d2oracle/TestDelete/arrowhead_shape.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -105,9 +103,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -154,9 +150,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -201,9 +195,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/breakup_arrowhead.exp.json b/testdata/d2oracle/TestDelete/breakup_arrowhead.exp.json index 81f128ca2..59968f1d6 100644 --- a/testdata/d2oracle/TestDelete/breakup_arrowhead.exp.json +++ b/testdata/d2oracle/TestDelete/breakup_arrowhead.exp.json @@ -49,9 +49,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -98,9 +96,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/chaos_1.exp.json b/testdata/d2oracle/TestDelete/chaos_1.exp.json index 281f52204..0beb5eec5 100644 --- a/testdata/d2oracle/TestDelete/chaos_1.exp.json +++ b/testdata/d2oracle/TestDelete/chaos_1.exp.json @@ -263,9 +263,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -290,9 +288,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "dst_arrow": true, "references": [ @@ -316,9 +312,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -425,9 +419,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -472,9 +464,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -519,9 +509,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/children.exp.json b/testdata/d2oracle/TestDelete/children.exp.json index 59151d5ca..553912d8a 100644 --- a/testdata/d2oracle/TestDelete/children.exp.json +++ b/testdata/d2oracle/TestDelete/children.exp.json @@ -95,9 +95,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -128,9 +126,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -177,9 +173,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -224,9 +218,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -271,9 +263,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/children_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_conflicts.exp.json index b98430de1..bfed5014b 100644 --- a/testdata/d2oracle/TestDelete/children_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_conflicts.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -121,9 +119,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -168,9 +164,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json index 577ecc875..222e31cae 100644 --- a/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json @@ -128,9 +128,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -161,9 +159,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -230,9 +226,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -277,9 +271,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -324,9 +316,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json index c04e1106e..7b07abca7 100644 --- a/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json @@ -221,9 +221,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -254,9 +252,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -286,9 +282,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -355,9 +349,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -422,9 +414,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -489,9 +479,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -536,9 +524,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -583,9 +569,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/children_flat_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_flat_conflicts.exp.json index 3cfa85bc2..fe212f64a 100644 --- a/testdata/d2oracle/TestDelete/children_flat_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_flat_conflicts.exp.json @@ -105,9 +105,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -174,9 +172,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -221,9 +217,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json index f1dda9f2b..3aa36137a 100644 --- a/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json @@ -197,9 +197,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -230,9 +228,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -319,9 +315,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -386,9 +380,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -433,9 +425,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -480,9 +470,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/children_nested_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_nested_conflicts.exp.json index f63710718..0cfaf5c8d 100644 --- a/testdata/d2oracle/TestDelete/children_nested_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_nested_conflicts.exp.json @@ -101,9 +101,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -150,9 +148,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -197,9 +193,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -244,9 +238,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/children_nested_referenced_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_nested_referenced_conflicts.exp.json index 6c0c07b4d..489e99551 100644 --- a/testdata/d2oracle/TestDelete/children_nested_referenced_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_nested_referenced_conflicts.exp.json @@ -160,9 +160,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -271,9 +269,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -360,9 +356,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -407,9 +401,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/children_no_self_conflict.exp.json b/testdata/d2oracle/TestDelete/children_no_self_conflict.exp.json index d2734da1d..656125a78 100644 --- a/testdata/d2oracle/TestDelete/children_no_self_conflict.exp.json +++ b/testdata/d2oracle/TestDelete/children_no_self_conflict.exp.json @@ -49,9 +49,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -98,9 +96,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/children_order.exp.json b/testdata/d2oracle/TestDelete/children_order.exp.json index c9255013d..208847bc1 100644 --- a/testdata/d2oracle/TestDelete/children_order.exp.json +++ b/testdata/d2oracle/TestDelete/children_order.exp.json @@ -124,9 +124,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -173,9 +171,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -220,9 +216,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -267,9 +261,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -314,9 +306,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/children_referenced_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_referenced_conflicts.exp.json index f9acfe369..25088c478 100644 --- a/testdata/d2oracle/TestDelete/children_referenced_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_referenced_conflicts.exp.json @@ -105,9 +105,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -174,9 +172,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -221,9 +217,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/children_scope.exp.json b/testdata/d2oracle/TestDelete/children_scope.exp.json index 7557b9508..77fec0e58 100644 --- a/testdata/d2oracle/TestDelete/children_scope.exp.json +++ b/testdata/d2oracle/TestDelete/children_scope.exp.json @@ -135,9 +135,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -168,9 +166,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -228,9 +224,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -286,9 +280,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -333,9 +325,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -380,9 +370,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -427,9 +415,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/class_refs.exp.json b/testdata/d2oracle/TestDelete/class_refs.exp.json index 7196b7cab..965ae6c65 100644 --- a/testdata/d2oracle/TestDelete/class_refs.exp.json +++ b/testdata/d2oracle/TestDelete/class_refs.exp.json @@ -25,9 +25,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, diff --git a/testdata/d2oracle/TestDelete/conflicts_generated.exp.json b/testdata/d2oracle/TestDelete/conflicts_generated.exp.json index 06b5c7bfb..295ba993d 100644 --- a/testdata/d2oracle/TestDelete/conflicts_generated.exp.json +++ b/testdata/d2oracle/TestDelete/conflicts_generated.exp.json @@ -124,9 +124,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -173,9 +171,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -220,9 +216,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -267,9 +261,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -314,9 +306,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/conflicts_generated_continued.exp.json b/testdata/d2oracle/TestDelete/conflicts_generated_continued.exp.json index c11ac7776..b6b34b741 100644 --- a/testdata/d2oracle/TestDelete/conflicts_generated_continued.exp.json +++ b/testdata/d2oracle/TestDelete/conflicts_generated_continued.exp.json @@ -95,9 +95,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -144,9 +142,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -191,9 +187,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -238,9 +232,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/container_near.exp.json b/testdata/d2oracle/TestDelete/container_near.exp.json index 9f216275b..62e53d145 100644 --- a/testdata/d2oracle/TestDelete/container_near.exp.json +++ b/testdata/d2oracle/TestDelete/container_near.exp.json @@ -173,9 +173,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -237,9 +235,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -284,9 +280,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -346,9 +340,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/delete_container_of_near.exp.json b/testdata/d2oracle/TestDelete/delete_container_of_near.exp.json index f070f1b82..7cf2ae66d 100644 --- a/testdata/d2oracle/TestDelete/delete_container_of_near.exp.json +++ b/testdata/d2oracle/TestDelete/delete_container_of_near.exp.json @@ -481,9 +481,7 @@ "direction": { "value": "down" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -514,9 +512,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -546,9 +542,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -578,9 +572,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -610,9 +602,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -642,9 +632,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -674,9 +662,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -706,9 +692,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -738,9 +722,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -770,9 +752,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -819,9 +799,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -866,9 +844,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -913,9 +889,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -960,9 +934,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1027,9 +999,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1094,9 +1064,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1181,9 +1149,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1294,9 +1260,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1361,9 +1325,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1428,9 +1390,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1475,9 +1435,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/delete_icon.exp.json b/testdata/d2oracle/TestDelete/delete_icon.exp.json index fd520cb59..016b3f03f 100644 --- a/testdata/d2oracle/TestDelete/delete_icon.exp.json +++ b/testdata/d2oracle/TestDelete/delete_icon.exp.json @@ -99,9 +99,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -159,9 +157,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -220,9 +216,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/delete_link.exp.json b/testdata/d2oracle/TestDelete/delete_link.exp.json index 8971321a5..b90432335 100644 --- a/testdata/d2oracle/TestDelete/delete_link.exp.json +++ b/testdata/d2oracle/TestDelete/delete_link.exp.json @@ -49,9 +49,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -98,9 +96,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/delete_near.exp.json b/testdata/d2oracle/TestDelete/delete_near.exp.json index 2a1816a00..123053d74 100644 --- a/testdata/d2oracle/TestDelete/delete_near.exp.json +++ b/testdata/d2oracle/TestDelete/delete_near.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -121,9 +119,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -168,9 +164,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/delete_needed_flat_near.exp.json b/testdata/d2oracle/TestDelete/delete_needed_flat_near.exp.json index 3358a6682..1572242cc 100644 --- a/testdata/d2oracle/TestDelete/delete_needed_flat_near.exp.json +++ b/testdata/d2oracle/TestDelete/delete_needed_flat_near.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -121,9 +119,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -168,9 +164,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/delete_redundant_flat_near.exp.json b/testdata/d2oracle/TestDelete/delete_redundant_flat_near.exp.json index 35cb1e9ee..dc12090dc 100644 --- a/testdata/d2oracle/TestDelete/delete_redundant_flat_near.exp.json +++ b/testdata/d2oracle/TestDelete/delete_redundant_flat_near.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -121,9 +119,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -168,9 +164,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/delete_tooltip.exp.json b/testdata/d2oracle/TestDelete/delete_tooltip.exp.json index e69deea55..374052ed6 100644 --- a/testdata/d2oracle/TestDelete/delete_tooltip.exp.json +++ b/testdata/d2oracle/TestDelete/delete_tooltip.exp.json @@ -49,9 +49,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -98,9 +96,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/drop_value.exp.json b/testdata/d2oracle/TestDelete/drop_value.exp.json index e433d441d..ffa928761 100644 --- a/testdata/d2oracle/TestDelete/drop_value.exp.json +++ b/testdata/d2oracle/TestDelete/drop_value.exp.json @@ -60,9 +60,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -120,9 +118,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -178,9 +174,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/drop_value_with_primary.exp.json b/testdata/d2oracle/TestDelete/drop_value_with_primary.exp.json index 95bfecfae..b77b63a71 100644 --- a/testdata/d2oracle/TestDelete/drop_value_with_primary.exp.json +++ b/testdata/d2oracle/TestDelete/drop_value_with_primary.exp.json @@ -49,9 +49,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -98,9 +96,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/duplicate_generated.exp.json b/testdata/d2oracle/TestDelete/duplicate_generated.exp.json index 795869ebc..c157119f0 100644 --- a/testdata/d2oracle/TestDelete/duplicate_generated.exp.json +++ b/testdata/d2oracle/TestDelete/duplicate_generated.exp.json @@ -164,9 +164,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -213,9 +211,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -260,9 +256,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -307,9 +301,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -354,9 +346,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -401,9 +391,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -448,9 +436,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/edge-only-style.exp.json b/testdata/d2oracle/TestDelete/edge-only-style.exp.json index d933367e3..fee3e930b 100644 --- a/testdata/d2oracle/TestDelete/edge-only-style.exp.json +++ b/testdata/d2oracle/TestDelete/edge-only-style.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -105,9 +103,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -154,9 +150,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -201,9 +195,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json b/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json index 6742da8ec..832bed2b7 100644 --- a/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json +++ b/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json @@ -105,9 +105,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -138,9 +136,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -240,9 +236,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -309,9 +303,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -378,9 +370,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -436,9 +426,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/edge_common.exp.json b/testdata/d2oracle/TestDelete/edge_common.exp.json index ac36a9a41..bbd0cd522 100644 --- a/testdata/d2oracle/TestDelete/edge_common.exp.json +++ b/testdata/d2oracle/TestDelete/edge_common.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -105,9 +103,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -154,9 +150,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -201,9 +195,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/edge_common_2.exp.json b/testdata/d2oracle/TestDelete/edge_common_2.exp.json index 0577b3292..a9d2f67b9 100644 --- a/testdata/d2oracle/TestDelete/edge_common_2.exp.json +++ b/testdata/d2oracle/TestDelete/edge_common_2.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -105,9 +103,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -154,9 +150,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -201,9 +195,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/edge_common_3.exp.json b/testdata/d2oracle/TestDelete/edge_common_3.exp.json index 24b5ee815..038ad6051 100644 --- a/testdata/d2oracle/TestDelete/edge_common_3.exp.json +++ b/testdata/d2oracle/TestDelete/edge_common_3.exp.json @@ -94,9 +94,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -185,9 +183,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -243,9 +239,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -301,9 +295,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/edge_common_4.exp.json b/testdata/d2oracle/TestDelete/edge_common_4.exp.json index f6af89f48..22dc9057c 100644 --- a/testdata/d2oracle/TestDelete/edge_common_4.exp.json +++ b/testdata/d2oracle/TestDelete/edge_common_4.exp.json @@ -94,9 +94,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -185,9 +183,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -243,9 +239,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -301,9 +295,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/edge_conflict.exp.json b/testdata/d2oracle/TestDelete/edge_conflict.exp.json index 8a1b3829f..5b48fa07b 100644 --- a/testdata/d2oracle/TestDelete/edge_conflict.exp.json +++ b/testdata/d2oracle/TestDelete/edge_conflict.exp.json @@ -117,9 +117,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -150,9 +148,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -241,9 +237,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -299,9 +293,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -357,9 +349,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -404,9 +394,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/edge_decrement.exp.json b/testdata/d2oracle/TestDelete/edge_decrement.exp.json index 1eaab9e89..77e73adcd 100644 --- a/testdata/d2oracle/TestDelete/edge_decrement.exp.json +++ b/testdata/d2oracle/TestDelete/edge_decrement.exp.json @@ -454,9 +454,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -490,9 +488,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -525,9 +521,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -560,9 +554,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -595,9 +587,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -784,9 +774,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -971,9 +959,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/edge_first.exp.json b/testdata/d2oracle/TestDelete/edge_first.exp.json index 2d55e252c..2aaf53d9b 100644 --- a/testdata/d2oracle/TestDelete/edge_first.exp.json +++ b/testdata/d2oracle/TestDelete/edge_first.exp.json @@ -183,9 +183,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -216,9 +214,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -248,9 +244,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -319,9 +313,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -388,9 +380,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -457,9 +447,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -504,9 +492,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -551,9 +537,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -618,9 +602,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -665,9 +647,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/edge_flat_style.exp.json b/testdata/d2oracle/TestDelete/edge_flat_style.exp.json index ef273a614..9a91e3f76 100644 --- a/testdata/d2oracle/TestDelete/edge_flat_style.exp.json +++ b/testdata/d2oracle/TestDelete/edge_flat_style.exp.json @@ -49,9 +49,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -98,9 +96,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/edge_identical_child.exp.json b/testdata/d2oracle/TestDelete/edge_identical_child.exp.json index 64b346930..3fc606cbf 100644 --- a/testdata/d2oracle/TestDelete/edge_identical_child.exp.json +++ b/testdata/d2oracle/TestDelete/edge_identical_child.exp.json @@ -105,9 +105,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -138,9 +136,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -209,9 +205,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -278,9 +272,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -347,9 +339,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -405,9 +395,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -463,9 +451,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/edge_key_style.exp.json b/testdata/d2oracle/TestDelete/edge_key_style.exp.json index b0339c5b1..167f0bb48 100644 --- a/testdata/d2oracle/TestDelete/edge_key_style.exp.json +++ b/testdata/d2oracle/TestDelete/edge_key_style.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -105,9 +103,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -154,9 +150,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -201,9 +195,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/edge_last.exp.json b/testdata/d2oracle/TestDelete/edge_last.exp.json index 116cd398e..47b0c0ff7 100644 --- a/testdata/d2oracle/TestDelete/edge_last.exp.json +++ b/testdata/d2oracle/TestDelete/edge_last.exp.json @@ -220,9 +220,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -253,9 +251,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -285,9 +281,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -317,9 +311,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -388,9 +380,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -457,9 +447,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -526,9 +514,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -573,9 +559,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -640,9 +624,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -707,9 +689,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -754,9 +734,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -801,9 +779,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/edge_map_style.exp.json b/testdata/d2oracle/TestDelete/edge_map_style.exp.json index b34908eab..2c3e64a6b 100644 --- a/testdata/d2oracle/TestDelete/edge_map_style.exp.json +++ b/testdata/d2oracle/TestDelete/edge_map_style.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -105,9 +103,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -154,9 +150,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -201,9 +195,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/edge_middle.exp.json b/testdata/d2oracle/TestDelete/edge_middle.exp.json index 5b25a1b51..50c978d8b 100644 --- a/testdata/d2oracle/TestDelete/edge_middle.exp.json +++ b/testdata/d2oracle/TestDelete/edge_middle.exp.json @@ -206,9 +206,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -239,9 +237,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -271,9 +267,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -303,9 +297,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -374,9 +366,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -443,9 +433,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -512,9 +500,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -559,9 +545,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -626,9 +610,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -673,9 +655,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -720,9 +700,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -767,9 +745,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/empty_map.exp.json b/testdata/d2oracle/TestDelete/empty_map.exp.json index fc8d49b06..948977db5 100644 --- a/testdata/d2oracle/TestDelete/empty_map.exp.json +++ b/testdata/d2oracle/TestDelete/empty_map.exp.json @@ -78,9 +78,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -127,9 +125,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -174,9 +170,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/flat.exp.json b/testdata/d2oracle/TestDelete/flat.exp.json index 60ff925c4..f40d4a886 100644 --- a/testdata/d2oracle/TestDelete/flat.exp.json +++ b/testdata/d2oracle/TestDelete/flat.exp.json @@ -25,9 +25,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, diff --git a/testdata/d2oracle/TestDelete/flat_reserved.exp.json b/testdata/d2oracle/TestDelete/flat_reserved.exp.json index 08ee89d3d..9a2d4d6ef 100644 --- a/testdata/d2oracle/TestDelete/flat_reserved.exp.json +++ b/testdata/d2oracle/TestDelete/flat_reserved.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -105,9 +103,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -154,9 +150,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -201,9 +195,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/hoist_children.exp.json b/testdata/d2oracle/TestDelete/hoist_children.exp.json index e7e88fd2e..a8fdd39cd 100644 --- a/testdata/d2oracle/TestDelete/hoist_children.exp.json +++ b/testdata/d2oracle/TestDelete/hoist_children.exp.json @@ -78,9 +78,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -127,9 +125,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -174,9 +170,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json b/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json index 20fbe284e..b0ee953db 100644 --- a/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json +++ b/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json @@ -95,9 +95,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -128,9 +126,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -177,9 +173,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -224,9 +218,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -271,9 +263,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/key_with_edges.exp.json b/testdata/d2oracle/TestDelete/key_with_edges.exp.json index bb035803a..b627b4c4c 100644 --- a/testdata/d2oracle/TestDelete/key_with_edges.exp.json +++ b/testdata/d2oracle/TestDelete/key_with_edges.exp.json @@ -94,9 +94,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -185,9 +183,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -243,9 +239,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -301,9 +295,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/key_with_edges_2.exp.json b/testdata/d2oracle/TestDelete/key_with_edges_2.exp.json index ae47c4e08..3d1f7b584 100644 --- a/testdata/d2oracle/TestDelete/key_with_edges_2.exp.json +++ b/testdata/d2oracle/TestDelete/key_with_edges_2.exp.json @@ -60,9 +60,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -120,9 +118,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -178,9 +174,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/key_with_edges_3.exp.json b/testdata/d2oracle/TestDelete/key_with_edges_3.exp.json index 6a9419684..1506c5f02 100644 --- a/testdata/d2oracle/TestDelete/key_with_edges_3.exp.json +++ b/testdata/d2oracle/TestDelete/key_with_edges_3.exp.json @@ -60,9 +60,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -120,9 +118,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -178,9 +174,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/key_with_edges_4.exp.json b/testdata/d2oracle/TestDelete/key_with_edges_4.exp.json index 98077ceb8..605af29ab 100644 --- a/testdata/d2oracle/TestDelete/key_with_edges_4.exp.json +++ b/testdata/d2oracle/TestDelete/key_with_edges_4.exp.json @@ -94,9 +94,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -185,9 +183,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -243,9 +239,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -301,9 +295,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/left.exp.json b/testdata/d2oracle/TestDelete/left.exp.json index beb1a5894..ecb9c0394 100644 --- a/testdata/d2oracle/TestDelete/left.exp.json +++ b/testdata/d2oracle/TestDelete/left.exp.json @@ -49,9 +49,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -98,9 +96,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/multi_near.exp.json b/testdata/d2oracle/TestDelete/multi_near.exp.json index 4c73064fa..270b09dfa 100644 --- a/testdata/d2oracle/TestDelete/multi_near.exp.json +++ b/testdata/d2oracle/TestDelete/multi_near.exp.json @@ -196,9 +196,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -245,9 +243,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -307,9 +303,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -369,9 +363,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -416,9 +408,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/multi_path_map_conflict.exp.json b/testdata/d2oracle/TestDelete/multi_path_map_conflict.exp.json index 41419ac2a..2ffbd61e7 100644 --- a/testdata/d2oracle/TestDelete/multi_path_map_conflict.exp.json +++ b/testdata/d2oracle/TestDelete/multi_path_map_conflict.exp.json @@ -130,9 +130,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -199,9 +197,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -246,9 +242,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -293,9 +287,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/multi_path_map_no_conflict.exp.json b/testdata/d2oracle/TestDelete/multi_path_map_no_conflict.exp.json index 7b3dcc4f0..770427f9f 100644 --- a/testdata/d2oracle/TestDelete/multi_path_map_no_conflict.exp.json +++ b/testdata/d2oracle/TestDelete/multi_path_map_no_conflict.exp.json @@ -101,9 +101,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -150,9 +148,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -197,9 +193,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -244,9 +238,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/multiple_flat_middle_container.exp.json b/testdata/d2oracle/TestDelete/multiple_flat_middle_container.exp.json index 232329175..a50fae2dd 100644 --- a/testdata/d2oracle/TestDelete/multiple_flat_middle_container.exp.json +++ b/testdata/d2oracle/TestDelete/multiple_flat_middle_container.exp.json @@ -94,9 +94,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -185,9 +183,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -243,9 +239,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -301,9 +295,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/multiple_flat_style.exp.json b/testdata/d2oracle/TestDelete/multiple_flat_style.exp.json index dfe56bd26..daca2a820 100644 --- a/testdata/d2oracle/TestDelete/multiple_flat_style.exp.json +++ b/testdata/d2oracle/TestDelete/multiple_flat_style.exp.json @@ -77,9 +77,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -152,9 +150,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/multiple_map_styles.exp.json b/testdata/d2oracle/TestDelete/multiple_map_styles.exp.json index be177a849..786326a20 100644 --- a/testdata/d2oracle/TestDelete/multiple_map_styles.exp.json +++ b/testdata/d2oracle/TestDelete/multiple_map_styles.exp.json @@ -113,9 +113,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -166,9 +164,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/near.exp.json b/testdata/d2oracle/TestDelete/near.exp.json index 66eadc967..0ce229964 100644 --- a/testdata/d2oracle/TestDelete/near.exp.json +++ b/testdata/d2oracle/TestDelete/near.exp.json @@ -49,9 +49,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -98,9 +96,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/nested.exp.json b/testdata/d2oracle/TestDelete/nested.exp.json index 0b8366219..462b1f7c6 100644 --- a/testdata/d2oracle/TestDelete/nested.exp.json +++ b/testdata/d2oracle/TestDelete/nested.exp.json @@ -71,9 +71,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -142,9 +140,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -211,9 +207,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -280,9 +274,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/nested_2.exp.json b/testdata/d2oracle/TestDelete/nested_2.exp.json index 79da6066b..d473f7e02 100644 --- a/testdata/d2oracle/TestDelete/nested_2.exp.json +++ b/testdata/d2oracle/TestDelete/nested_2.exp.json @@ -71,9 +71,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -142,9 +140,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -211,9 +207,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -280,9 +274,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json b/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json index d19aea41f..83b5b9dce 100644 --- a/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json +++ b/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json @@ -101,9 +101,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -134,9 +132,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -183,9 +179,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -230,9 +224,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -277,9 +269,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/nested_flat_style.exp.json b/testdata/d2oracle/TestDelete/nested_flat_style.exp.json index 48543dc61..6536e0ab9 100644 --- a/testdata/d2oracle/TestDelete/nested_flat_style.exp.json +++ b/testdata/d2oracle/TestDelete/nested_flat_style.exp.json @@ -49,9 +49,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -98,9 +96,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/nested_reserved.exp.json b/testdata/d2oracle/TestDelete/nested_reserved.exp.json index bd59d8373..38b307002 100644 --- a/testdata/d2oracle/TestDelete/nested_reserved.exp.json +++ b/testdata/d2oracle/TestDelete/nested_reserved.exp.json @@ -105,9 +105,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -207,9 +205,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -307,9 +303,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -376,9 +370,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/nested_underscore_update.exp.json b/testdata/d2oracle/TestDelete/nested_underscore_update.exp.json index ae69040d8..075d9a1ac 100644 --- a/testdata/d2oracle/TestDelete/nested_underscore_update.exp.json +++ b/testdata/d2oracle/TestDelete/nested_underscore_update.exp.json @@ -89,9 +89,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -138,9 +136,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -196,9 +192,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/node_in_edge.exp.json b/testdata/d2oracle/TestDelete/node_in_edge.exp.json index 691e5ab52..8f4726d3c 100644 --- a/testdata/d2oracle/TestDelete/node_in_edge.exp.json +++ b/testdata/d2oracle/TestDelete/node_in_edge.exp.json @@ -170,9 +170,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -203,9 +201,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -235,9 +231,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -284,9 +278,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -331,9 +323,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -378,9 +368,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -425,9 +413,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -472,9 +458,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -519,9 +503,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json b/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json index 8dc6bd161..2bfddb865 100644 --- a/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json +++ b/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json @@ -209,9 +209,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -242,9 +240,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -274,9 +270,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -306,9 +300,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -355,9 +347,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -422,9 +412,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -489,9 +477,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -536,9 +522,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -594,9 +578,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -652,9 +634,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -699,9 +679,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/only-underscore-nested.exp.json b/testdata/d2oracle/TestDelete/only-underscore-nested.exp.json index 0a3a1ad73..f82d339c6 100644 --- a/testdata/d2oracle/TestDelete/only-underscore-nested.exp.json +++ b/testdata/d2oracle/TestDelete/only-underscore-nested.exp.json @@ -101,9 +101,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -150,9 +148,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -197,9 +193,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -244,9 +238,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/only-underscore.exp.json b/testdata/d2oracle/TestDelete/only-underscore.exp.json index 675240729..c5893a70c 100644 --- a/testdata/d2oracle/TestDelete/only-underscore.exp.json +++ b/testdata/d2oracle/TestDelete/only-underscore.exp.json @@ -78,9 +78,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -127,9 +125,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -174,9 +170,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json b/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json index fdbb6c2d5..76471937a 100644 --- a/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json +++ b/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json @@ -168,9 +168,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -201,9 +199,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -274,9 +270,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -341,9 +335,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json b/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json index 34ac25510..70fa358cf 100644 --- a/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json +++ b/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json @@ -168,9 +168,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -205,9 +203,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -274,9 +270,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -341,9 +335,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/order_1.exp.json b/testdata/d2oracle/TestDelete/order_1.exp.json index 11726eded..97813befe 100644 --- a/testdata/d2oracle/TestDelete/order_1.exp.json +++ b/testdata/d2oracle/TestDelete/order_1.exp.json @@ -95,9 +95,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -128,9 +126,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -177,9 +173,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -224,9 +218,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -271,9 +263,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/order_2.exp.json b/testdata/d2oracle/TestDelete/order_2.exp.json index 03170d8fa..fb792b501 100644 --- a/testdata/d2oracle/TestDelete/order_2.exp.json +++ b/testdata/d2oracle/TestDelete/order_2.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -121,9 +119,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -168,9 +164,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/order_3.exp.json b/testdata/d2oracle/TestDelete/order_3.exp.json index 70949b8f9..3d12f9941 100644 --- a/testdata/d2oracle/TestDelete/order_3.exp.json +++ b/testdata/d2oracle/TestDelete/order_3.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -121,9 +119,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -168,9 +164,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/order_4.exp.json b/testdata/d2oracle/TestDelete/order_4.exp.json index 6a678dd41..b742e3635 100644 --- a/testdata/d2oracle/TestDelete/order_4.exp.json +++ b/testdata/d2oracle/TestDelete/order_4.exp.json @@ -49,9 +49,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -98,9 +96,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/order_5.exp.json b/testdata/d2oracle/TestDelete/order_5.exp.json index 144fd9070..e444a45fd 100644 --- a/testdata/d2oracle/TestDelete/order_5.exp.json +++ b/testdata/d2oracle/TestDelete/order_5.exp.json @@ -147,9 +147,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -180,9 +178,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -212,9 +208,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -261,9 +255,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -308,9 +300,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -355,9 +345,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -402,9 +390,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -449,9 +435,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/order_6.exp.json b/testdata/d2oracle/TestDelete/order_6.exp.json index 982b01acc..b34decb23 100644 --- a/testdata/d2oracle/TestDelete/order_6.exp.json +++ b/testdata/d2oracle/TestDelete/order_6.exp.json @@ -123,9 +123,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -214,9 +212,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -261,9 +257,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -330,9 +324,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -399,9 +391,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/order_7.exp.json b/testdata/d2oracle/TestDelete/order_7.exp.json index b4aaa8cf5..021a65f8c 100644 --- a/testdata/d2oracle/TestDelete/order_7.exp.json +++ b/testdata/d2oracle/TestDelete/order_7.exp.json @@ -134,9 +134,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -236,9 +234,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -283,9 +279,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -363,9 +357,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -443,9 +435,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -523,9 +513,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/order_8.exp.json b/testdata/d2oracle/TestDelete/order_8.exp.json index 670615295..962ecad45 100644 --- a/testdata/d2oracle/TestDelete/order_8.exp.json +++ b/testdata/d2oracle/TestDelete/order_8.exp.json @@ -141,9 +141,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -190,9 +188,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -237,9 +233,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -284,9 +278,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -331,9 +323,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -378,9 +368,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/save_map.exp.json b/testdata/d2oracle/TestDelete/save_map.exp.json index 90e716053..52ae16215 100644 --- a/testdata/d2oracle/TestDelete/save_map.exp.json +++ b/testdata/d2oracle/TestDelete/save_map.exp.json @@ -88,9 +88,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -137,9 +135,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/save_map_with_primary.exp.json b/testdata/d2oracle/TestDelete/save_map_with_primary.exp.json index 548eacac3..bbfef6014 100644 --- a/testdata/d2oracle/TestDelete/save_map_with_primary.exp.json +++ b/testdata/d2oracle/TestDelete/save_map_with_primary.exp.json @@ -98,9 +98,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -147,9 +145,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/shape_class.exp.json b/testdata/d2oracle/TestDelete/shape_class.exp.json index 30a5cbbf9..e5f1f7ea9 100644 --- a/testdata/d2oracle/TestDelete/shape_class.exp.json +++ b/testdata/d2oracle/TestDelete/shape_class.exp.json @@ -49,9 +49,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -98,9 +96,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/shape_sql_table.exp.json b/testdata/d2oracle/TestDelete/shape_sql_table.exp.json index 7b51e91f9..ed75f0a6f 100644 --- a/testdata/d2oracle/TestDelete/shape_sql_table.exp.json +++ b/testdata/d2oracle/TestDelete/shape_sql_table.exp.json @@ -269,9 +269,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -302,9 +300,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -351,9 +347,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -460,7 +454,9 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" } ] @@ -481,9 +477,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -528,9 +522,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/singular_flat_style.exp.json b/testdata/d2oracle/TestDelete/singular_flat_style.exp.json index ceb705b2d..4468c2179 100644 --- a/testdata/d2oracle/TestDelete/singular_flat_style.exp.json +++ b/testdata/d2oracle/TestDelete/singular_flat_style.exp.json @@ -49,9 +49,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -98,9 +96,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/singular_map_style.exp.json b/testdata/d2oracle/TestDelete/singular_map_style.exp.json index 8c846d60e..341dfb3c4 100644 --- a/testdata/d2oracle/TestDelete/singular_map_style.exp.json +++ b/testdata/d2oracle/TestDelete/singular_map_style.exp.json @@ -49,9 +49,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -98,9 +96,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/table_refs.exp.json b/testdata/d2oracle/TestDelete/table_refs.exp.json index 7cd4b6e1a..3f8867f6f 100644 --- a/testdata/d2oracle/TestDelete/table_refs.exp.json +++ b/testdata/d2oracle/TestDelete/table_refs.exp.json @@ -145,9 +145,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -236,7 +234,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "", + "constraint": null, "reference": "" } ] @@ -257,9 +255,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/underscore_no_conflict.exp.json b/testdata/d2oracle/TestDelete/underscore_no_conflict.exp.json index ba51e7d5a..0d57688ed 100644 --- a/testdata/d2oracle/TestDelete/underscore_no_conflict.exp.json +++ b/testdata/d2oracle/TestDelete/underscore_no_conflict.exp.json @@ -112,9 +112,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -161,9 +159,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -219,9 +215,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -266,9 +260,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/underscore_remove.exp.json b/testdata/d2oracle/TestDelete/underscore_remove.exp.json index d05524d74..5036b08e4 100644 --- a/testdata/d2oracle/TestDelete/underscore_remove.exp.json +++ b/testdata/d2oracle/TestDelete/underscore_remove.exp.json @@ -141,9 +141,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -174,9 +172,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -206,9 +202,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -255,9 +249,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -302,9 +294,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -349,9 +339,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -396,9 +384,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -443,9 +429,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/width.exp.json b/testdata/d2oracle/TestDelete/width.exp.json index 9f0aea140..9b46cd396 100644 --- a/testdata/d2oracle/TestDelete/width.exp.json +++ b/testdata/d2oracle/TestDelete/width.exp.json @@ -49,9 +49,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -98,9 +96,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/append_multiple_styles.exp.json b/testdata/d2oracle/TestMove/append_multiple_styles.exp.json index 4ae722c82..c85307811 100644 --- a/testdata/d2oracle/TestMove/append_multiple_styles.exp.json +++ b/testdata/d2oracle/TestMove/append_multiple_styles.exp.json @@ -233,9 +233,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -282,9 +280,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -356,9 +352,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/basic.exp.json b/testdata/d2oracle/TestMove/basic.exp.json index 395accc11..cf783246e 100644 --- a/testdata/d2oracle/TestMove/basic.exp.json +++ b/testdata/d2oracle/TestMove/basic.exp.json @@ -49,9 +49,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -98,9 +96,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/basic_nested.exp.json b/testdata/d2oracle/TestMove/basic_nested.exp.json index 3d50e422a..416933111 100644 --- a/testdata/d2oracle/TestMove/basic_nested.exp.json +++ b/testdata/d2oracle/TestMove/basic_nested.exp.json @@ -78,9 +78,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -127,9 +125,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -174,9 +170,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/basic_out_of_container.exp.json b/testdata/d2oracle/TestMove/basic_out_of_container.exp.json index 72d30748b..fbe57ba9f 100644 --- a/testdata/d2oracle/TestMove/basic_out_of_container.exp.json +++ b/testdata/d2oracle/TestMove/basic_out_of_container.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -121,9 +119,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -168,9 +164,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/between_containers.exp.json b/testdata/d2oracle/TestMove/between_containers.exp.json index 76f5a3554..539d1eb0f 100644 --- a/testdata/d2oracle/TestMove/between_containers.exp.json +++ b/testdata/d2oracle/TestMove/between_containers.exp.json @@ -101,9 +101,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -150,9 +148,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -197,9 +193,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -244,9 +238,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/chain_connected_nested.exp.json b/testdata/d2oracle/TestMove/chain_connected_nested.exp.json index 031cbc070..3f2051aba 100644 --- a/testdata/d2oracle/TestMove/chain_connected_nested.exp.json +++ b/testdata/d2oracle/TestMove/chain_connected_nested.exp.json @@ -132,9 +132,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -165,9 +163,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -197,9 +193,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -266,9 +260,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -333,9 +325,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -380,9 +370,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.exp.json b/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.exp.json index 5810e288e..30e25898c 100644 --- a/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.exp.json +++ b/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.exp.json @@ -120,9 +120,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -153,9 +151,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -185,9 +181,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -245,9 +239,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -303,9 +295,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -370,9 +360,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -417,9 +405,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/connected_nested.exp.json b/testdata/d2oracle/TestMove/connected_nested.exp.json index de374c82f..a8295f2bf 100644 --- a/testdata/d2oracle/TestMove/connected_nested.exp.json +++ b/testdata/d2oracle/TestMove/connected_nested.exp.json @@ -95,9 +95,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -128,9 +126,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -177,9 +173,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -224,9 +218,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -271,9 +263,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/container_conflicts_generated.exp.json b/testdata/d2oracle/TestMove/container_conflicts_generated.exp.json index 5e3a6e282..0c7173d53 100644 --- a/testdata/d2oracle/TestMove/container_conflicts_generated.exp.json +++ b/testdata/d2oracle/TestMove/container_conflicts_generated.exp.json @@ -139,9 +139,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -188,9 +186,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -235,9 +231,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -282,9 +276,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -329,9 +321,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/container_multiple_refs_with_underscore.exp.json b/testdata/d2oracle/TestMove/container_multiple_refs_with_underscore.exp.json index 1d6a6ebc1..24692953a 100644 --- a/testdata/d2oracle/TestMove/container_multiple_refs_with_underscore.exp.json +++ b/testdata/d2oracle/TestMove/container_multiple_refs_with_underscore.exp.json @@ -78,9 +78,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -127,9 +125,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -174,9 +170,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/container_near.exp.json b/testdata/d2oracle/TestMove/container_near.exp.json index 05201a9b6..2ea7eccbb 100644 --- a/testdata/d2oracle/TestMove/container_near.exp.json +++ b/testdata/d2oracle/TestMove/container_near.exp.json @@ -203,9 +203,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -252,9 +250,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -336,9 +332,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -394,9 +388,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -452,9 +444,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -499,9 +489,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -546,9 +534,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/duplicate.exp.json b/testdata/d2oracle/TestMove/duplicate.exp.json index aeb168979..6ea0399ea 100644 --- a/testdata/d2oracle/TestMove/duplicate.exp.json +++ b/testdata/d2oracle/TestMove/duplicate.exp.json @@ -134,9 +134,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -203,9 +201,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -250,9 +246,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/duplicate_generated.exp.json b/testdata/d2oracle/TestMove/duplicate_generated.exp.json index 22654afcc..4412a6bb0 100644 --- a/testdata/d2oracle/TestMove/duplicate_generated.exp.json +++ b/testdata/d2oracle/TestMove/duplicate_generated.exp.json @@ -193,9 +193,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -242,9 +240,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -289,9 +285,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -336,9 +330,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -383,9 +375,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -430,9 +420,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -477,9 +465,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -524,9 +510,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/edge_across_containers.exp.json b/testdata/d2oracle/TestMove/edge_across_containers.exp.json index bc9126e8a..c8bc7c1ed 100644 --- a/testdata/d2oracle/TestMove/edge_across_containers.exp.json +++ b/testdata/d2oracle/TestMove/edge_across_containers.exp.json @@ -146,9 +146,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -179,9 +177,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -228,9 +224,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -317,9 +311,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -386,9 +378,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -433,9 +423,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/edge_basic.exp.json b/testdata/d2oracle/TestMove/edge_basic.exp.json index c8b153273..5ac3d39dc 100644 --- a/testdata/d2oracle/TestMove/edge_basic.exp.json +++ b/testdata/d2oracle/TestMove/edge_basic.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -105,9 +103,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -154,9 +150,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -201,9 +195,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/edge_chain_basic.exp.json b/testdata/d2oracle/TestMove/edge_chain_basic.exp.json index ce721c308..16bc91df2 100644 --- a/testdata/d2oracle/TestMove/edge_chain_basic.exp.json +++ b/testdata/d2oracle/TestMove/edge_chain_basic.exp.json @@ -109,9 +109,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -142,9 +140,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -174,9 +170,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -223,9 +217,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -290,9 +282,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -337,9 +327,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/edge_chain_circular.exp.json b/testdata/d2oracle/TestMove/edge_chain_circular.exp.json index 653ab7d08..eee4a6c53 100644 --- a/testdata/d2oracle/TestMove/edge_chain_circular.exp.json +++ b/testdata/d2oracle/TestMove/edge_chain_circular.exp.json @@ -160,9 +160,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -193,9 +191,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -225,9 +221,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -274,9 +268,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -363,9 +355,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -430,9 +420,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json b/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json index d49f6a447..7e6bab461 100644 --- a/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json +++ b/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json @@ -143,9 +143,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -176,9 +174,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -208,9 +204,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -288,9 +282,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -346,9 +338,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -413,9 +403,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -460,9 +448,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json b/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json index 575675351..9458469ea 100644 --- a/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json +++ b/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json @@ -160,9 +160,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -193,9 +191,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -225,9 +221,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -274,9 +268,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -321,9 +313,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -410,9 +400,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -457,9 +445,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/edge_conflict.exp.json b/testdata/d2oracle/TestMove/edge_conflict.exp.json index a908608d3..e10a2cb4d 100644 --- a/testdata/d2oracle/TestMove/edge_conflict.exp.json +++ b/testdata/d2oracle/TestMove/edge_conflict.exp.json @@ -146,9 +146,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -179,9 +177,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -270,9 +266,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -328,9 +322,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -386,9 +378,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -433,9 +423,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -480,9 +468,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/edge_into_container.exp.json b/testdata/d2oracle/TestMove/edge_into_container.exp.json index 8c1cfb37a..ebb40a815 100644 --- a/testdata/d2oracle/TestMove/edge_into_container.exp.json +++ b/testdata/d2oracle/TestMove/edge_into_container.exp.json @@ -135,9 +135,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -168,9 +166,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -248,9 +244,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -295,9 +289,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -353,9 +345,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -400,9 +390,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/edge_nested_basic.exp.json b/testdata/d2oracle/TestMove/edge_nested_basic.exp.json index 24a4ba70e..1ae49d92e 100644 --- a/testdata/d2oracle/TestMove/edge_nested_basic.exp.json +++ b/testdata/d2oracle/TestMove/edge_nested_basic.exp.json @@ -101,9 +101,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -134,9 +132,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -183,9 +179,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -230,9 +224,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -277,9 +269,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/edge_out_of_container.exp.json b/testdata/d2oracle/TestMove/edge_out_of_container.exp.json index fbf01a18f..da6e089a8 100644 --- a/testdata/d2oracle/TestMove/edge_out_of_container.exp.json +++ b/testdata/d2oracle/TestMove/edge_out_of_container.exp.json @@ -112,9 +112,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -145,9 +143,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -194,9 +190,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -252,9 +246,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -299,9 +291,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/extend_map.exp.json b/testdata/d2oracle/TestMove/extend_map.exp.json index a9bc27742..5883a2402 100644 --- a/testdata/d2oracle/TestMove/extend_map.exp.json +++ b/testdata/d2oracle/TestMove/extend_map.exp.json @@ -159,9 +159,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -228,9 +226,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -275,9 +271,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -322,9 +316,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -369,9 +361,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/extend_stationary_path.exp.json b/testdata/d2oracle/TestMove/extend_stationary_path.exp.json index c1388762e..f65c5ef79 100644 --- a/testdata/d2oracle/TestMove/extend_stationary_path.exp.json +++ b/testdata/d2oracle/TestMove/extend_stationary_path.exp.json @@ -152,9 +152,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -243,9 +241,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -332,9 +328,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -421,9 +415,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/flat_between_containers.exp.json b/testdata/d2oracle/TestMove/flat_between_containers.exp.json index f383bbd08..ed420bc52 100644 --- a/testdata/d2oracle/TestMove/flat_between_containers.exp.json +++ b/testdata/d2oracle/TestMove/flat_between_containers.exp.json @@ -101,9 +101,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -150,9 +148,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -197,9 +193,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -244,9 +238,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/flat_merge.exp.json b/testdata/d2oracle/TestMove/flat_merge.exp.json index 1a71d4059..f9404e9b9 100644 --- a/testdata/d2oracle/TestMove/flat_merge.exp.json +++ b/testdata/d2oracle/TestMove/flat_merge.exp.json @@ -134,9 +134,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -183,9 +181,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -230,9 +226,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -277,9 +271,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -324,9 +316,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/flat_middle_container.exp.json b/testdata/d2oracle/TestMove/flat_middle_container.exp.json index 7ee1856dc..fe7060966 100644 --- a/testdata/d2oracle/TestMove/flat_middle_container.exp.json +++ b/testdata/d2oracle/TestMove/flat_middle_container.exp.json @@ -112,9 +112,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -172,9 +170,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -230,9 +226,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -277,9 +271,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -324,9 +316,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/flat_nested_merge.exp.json b/testdata/d2oracle/TestMove/flat_nested_merge.exp.json index 455a2f981..12346aca8 100644 --- a/testdata/d2oracle/TestMove/flat_nested_merge.exp.json +++ b/testdata/d2oracle/TestMove/flat_nested_merge.exp.json @@ -190,9 +190,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -272,9 +270,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -352,9 +348,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -432,9 +426,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -512,9 +504,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -570,9 +560,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -628,9 +616,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -697,9 +683,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -766,9 +750,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -835,9 +817,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -882,9 +862,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/flat_nested_merge_multiple_refs.exp.json b/testdata/d2oracle/TestMove/flat_nested_merge_multiple_refs.exp.json index 177336e19..9eda1abc2 100644 --- a/testdata/d2oracle/TestMove/flat_nested_merge_multiple_refs.exp.json +++ b/testdata/d2oracle/TestMove/flat_nested_merge_multiple_refs.exp.json @@ -288,9 +288,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -432,9 +430,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -585,9 +581,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -738,9 +732,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -785,9 +777,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -832,9 +822,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -879,9 +867,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -926,9 +912,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1006,9 +990,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/flat_reparent_with_map_value.exp.json b/testdata/d2oracle/TestMove/flat_reparent_with_map_value.exp.json index 6da1ee6d5..f587d63fd 100644 --- a/testdata/d2oracle/TestMove/flat_reparent_with_map_value.exp.json +++ b/testdata/d2oracle/TestMove/flat_reparent_with_map_value.exp.json @@ -111,9 +111,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -160,9 +158,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -207,9 +203,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/flat_reparent_with_mixed_map_value.exp.json b/testdata/d2oracle/TestMove/flat_reparent_with_mixed_map_value.exp.json index c5c8e6e7d..4210e6a2a 100644 --- a/testdata/d2oracle/TestMove/flat_reparent_with_mixed_map_value.exp.json +++ b/testdata/d2oracle/TestMove/flat_reparent_with_mixed_map_value.exp.json @@ -152,9 +152,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -201,9 +199,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -248,9 +244,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -295,9 +289,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/flat_reparent_with_value.exp.json b/testdata/d2oracle/TestMove/flat_reparent_with_value.exp.json index f17aff8a0..936069718 100644 --- a/testdata/d2oracle/TestMove/flat_reparent_with_value.exp.json +++ b/testdata/d2oracle/TestMove/flat_reparent_with_value.exp.json @@ -82,9 +82,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -131,9 +129,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -178,9 +174,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/flat_style.exp.json b/testdata/d2oracle/TestMove/flat_style.exp.json index 66f168b08..9a3353650 100644 --- a/testdata/d2oracle/TestMove/flat_style.exp.json +++ b/testdata/d2oracle/TestMove/flat_style.exp.json @@ -161,9 +161,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -210,9 +208,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -328,9 +324,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/full_edge_slice.exp.json b/testdata/d2oracle/TestMove/full_edge_slice.exp.json index 9ae346bc4..7b5c9799d 100644 --- a/testdata/d2oracle/TestMove/full_edge_slice.exp.json +++ b/testdata/d2oracle/TestMove/full_edge_slice.exp.json @@ -215,9 +215,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -248,9 +246,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -280,9 +276,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -360,9 +354,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -407,9 +399,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -505,9 +495,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -583,9 +571,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/full_slice.exp.json b/testdata/d2oracle/TestMove/full_slice.exp.json index bd3bf0e72..5264e53dd 100644 --- a/testdata/d2oracle/TestMove/full_slice.exp.json +++ b/testdata/d2oracle/TestMove/full_slice.exp.json @@ -101,9 +101,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -150,9 +148,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -197,9 +193,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -244,9 +238,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/gnarly_1.exp.json b/testdata/d2oracle/TestMove/gnarly_1.exp.json index 7f572e447..ae3f67e35 100644 --- a/testdata/d2oracle/TestMove/gnarly_1.exp.json +++ b/testdata/d2oracle/TestMove/gnarly_1.exp.json @@ -359,9 +359,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -392,9 +390,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -424,9 +420,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -456,9 +450,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -527,9 +519,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -596,9 +586,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -665,9 +653,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -774,9 +760,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -843,9 +827,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -912,9 +894,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -959,9 +939,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1068,9 +1046,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1146,9 +1122,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1204,9 +1178,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1262,9 +1234,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1320,9 +1290,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/hoist_container_children.exp.json b/testdata/d2oracle/TestMove/hoist_container_children.exp.json index da7bbfa2f..828b515b7 100644 --- a/testdata/d2oracle/TestMove/hoist_container_children.exp.json +++ b/testdata/d2oracle/TestMove/hoist_container_children.exp.json @@ -124,9 +124,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -173,9 +171,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -220,9 +216,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -267,9 +261,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -314,9 +306,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/into_container_existing_map.exp.json b/testdata/d2oracle/TestMove/into_container_existing_map.exp.json index d693f7bd4..fdb447e25 100644 --- a/testdata/d2oracle/TestMove/into_container_existing_map.exp.json +++ b/testdata/d2oracle/TestMove/into_container_existing_map.exp.json @@ -101,9 +101,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -150,9 +148,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -197,9 +193,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -244,9 +238,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/into_container_nonexisting_map.exp.json b/testdata/d2oracle/TestMove/into_container_nonexisting_map.exp.json index 406d1ef9f..787da3561 100644 --- a/testdata/d2oracle/TestMove/into_container_nonexisting_map.exp.json +++ b/testdata/d2oracle/TestMove/into_container_nonexisting_map.exp.json @@ -78,9 +78,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -127,9 +125,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -174,9 +170,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/into_container_with_flat_keys.exp.json b/testdata/d2oracle/TestMove/into_container_with_flat_keys.exp.json index 135a83ef7..7ed84d7a5 100644 --- a/testdata/d2oracle/TestMove/into_container_with_flat_keys.exp.json +++ b/testdata/d2oracle/TestMove/into_container_with_flat_keys.exp.json @@ -212,9 +212,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -261,9 +259,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -318,9 +314,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/into_container_with_flat_style.exp.json b/testdata/d2oracle/TestMove/into_container_with_flat_style.exp.json index bba5f98b6..22709097f 100644 --- a/testdata/d2oracle/TestMove/into_container_with_flat_style.exp.json +++ b/testdata/d2oracle/TestMove/into_container_with_flat_style.exp.json @@ -118,9 +118,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -171,9 +169,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -218,9 +214,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/map_transplant.exp.json b/testdata/d2oracle/TestMove/map_transplant.exp.json index 586e8b616..223c5c8d3 100644 --- a/testdata/d2oracle/TestMove/map_transplant.exp.json +++ b/testdata/d2oracle/TestMove/map_transplant.exp.json @@ -221,9 +221,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -270,9 +268,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -317,9 +313,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -364,9 +358,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -415,9 +407,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/map_with_label.exp.json b/testdata/d2oracle/TestMove/map_with_label.exp.json index 7a1c7fd9f..45253ad5f 100644 --- a/testdata/d2oracle/TestMove/map_with_label.exp.json +++ b/testdata/d2oracle/TestMove/map_with_label.exp.json @@ -111,9 +111,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -160,9 +158,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -207,9 +203,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -254,9 +248,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/merge_nested_maps.exp.json b/testdata/d2oracle/TestMove/merge_nested_maps.exp.json index b6c858933..54b97c569 100644 --- a/testdata/d2oracle/TestMove/merge_nested_maps.exp.json +++ b/testdata/d2oracle/TestMove/merge_nested_maps.exp.json @@ -272,9 +272,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -321,9 +319,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -472,9 +468,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -530,9 +524,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -608,9 +600,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -677,9 +667,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -746,9 +734,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -793,9 +779,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -840,9 +824,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/merge_reserved.exp.json b/testdata/d2oracle/TestMove/merge_reserved.exp.json index 59eadcb67..15bad681f 100644 --- a/testdata/d2oracle/TestMove/merge_reserved.exp.json +++ b/testdata/d2oracle/TestMove/merge_reserved.exp.json @@ -263,9 +263,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -312,9 +310,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -452,9 +448,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -510,9 +504,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -568,9 +560,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -626,9 +616,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -673,9 +661,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/middle_container.exp.json b/testdata/d2oracle/TestMove/middle_container.exp.json index 12bae318b..1b3c7ee23 100644 --- a/testdata/d2oracle/TestMove/middle_container.exp.json +++ b/testdata/d2oracle/TestMove/middle_container.exp.json @@ -101,9 +101,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -150,9 +148,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -197,9 +193,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -244,9 +238,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/middle_container_generated_conflict.exp.json b/testdata/d2oracle/TestMove/middle_container_generated_conflict.exp.json index a309e0c34..71050570c 100644 --- a/testdata/d2oracle/TestMove/middle_container_generated_conflict.exp.json +++ b/testdata/d2oracle/TestMove/middle_container_generated_conflict.exp.json @@ -295,9 +295,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -328,9 +326,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -360,9 +356,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -502,9 +496,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -580,9 +572,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -658,9 +648,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -725,9 +713,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -803,9 +789,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -850,9 +834,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/move_container_children.exp.json b/testdata/d2oracle/TestMove/move_container_children.exp.json index 3a76c1c31..4df2648ca 100644 --- a/testdata/d2oracle/TestMove/move_container_children.exp.json +++ b/testdata/d2oracle/TestMove/move_container_children.exp.json @@ -147,9 +147,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -196,9 +194,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -243,9 +239,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -290,9 +284,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -337,9 +329,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -384,9 +374,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/move_container_conflict_children.exp.json b/testdata/d2oracle/TestMove/move_container_conflict_children.exp.json index 1f7889425..513f59915 100644 --- a/testdata/d2oracle/TestMove/move_container_conflict_children.exp.json +++ b/testdata/d2oracle/TestMove/move_container_conflict_children.exp.json @@ -147,9 +147,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -196,9 +194,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -243,9 +239,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -290,9 +284,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -337,9 +329,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -384,9 +374,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/move_into_key_with_value.exp.json b/testdata/d2oracle/TestMove/move_into_key_with_value.exp.json index 2feb2e4b4..4f3b67fa0 100644 --- a/testdata/d2oracle/TestMove/move_into_key_with_value.exp.json +++ b/testdata/d2oracle/TestMove/move_into_key_with_value.exp.json @@ -88,9 +88,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -137,9 +135,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -184,9 +180,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/move_out_of_edge.exp.json b/testdata/d2oracle/TestMove/move_out_of_edge.exp.json index a8f68bf18..0e30a304a 100644 --- a/testdata/d2oracle/TestMove/move_out_of_edge.exp.json +++ b/testdata/d2oracle/TestMove/move_out_of_edge.exp.json @@ -128,9 +128,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -161,9 +159,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -221,9 +217,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -279,9 +273,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -348,9 +340,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -417,9 +407,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -486,9 +474,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -533,9 +519,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/move_out_of_nested_edge.exp.json b/testdata/d2oracle/TestMove/move_out_of_nested_edge.exp.json index 45411b8f5..a27cfd89f 100644 --- a/testdata/d2oracle/TestMove/move_out_of_nested_edge.exp.json +++ b/testdata/d2oracle/TestMove/move_out_of_nested_edge.exp.json @@ -168,9 +168,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -201,9 +199,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -261,9 +257,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -319,9 +313,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -419,9 +411,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -519,9 +509,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -588,9 +576,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -635,9 +621,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/multiple_nesting_levels.exp.json b/testdata/d2oracle/TestMove/multiple_nesting_levels.exp.json index 3bfdd13a4..a954f0406 100644 --- a/testdata/d2oracle/TestMove/multiple_nesting_levels.exp.json +++ b/testdata/d2oracle/TestMove/multiple_nesting_levels.exp.json @@ -283,9 +283,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -385,9 +383,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -527,9 +523,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -689,9 +683,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -736,9 +728,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -783,9 +773,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -852,9 +840,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -932,9 +918,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/near.exp.json b/testdata/d2oracle/TestMove/near.exp.json index 31cde246f..852a73b54 100644 --- a/testdata/d2oracle/TestMove/near.exp.json +++ b/testdata/d2oracle/TestMove/near.exp.json @@ -140,9 +140,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -215,9 +213,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -262,9 +258,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -309,9 +303,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/nested-underscore-move-out.exp.json b/testdata/d2oracle/TestMove/nested-underscore-move-out.exp.json index 1dc1b90c3..b0c57105a 100644 --- a/testdata/d2oracle/TestMove/nested-underscore-move-out.exp.json +++ b/testdata/d2oracle/TestMove/nested-underscore-move-out.exp.json @@ -101,9 +101,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -150,9 +148,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -197,9 +193,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -244,9 +238,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/nhooyr_one.exp.json b/testdata/d2oracle/TestMove/nhooyr_one.exp.json index 59cd0e06b..d66f6960c 100644 --- a/testdata/d2oracle/TestMove/nhooyr_one.exp.json +++ b/testdata/d2oracle/TestMove/nhooyr_one.exp.json @@ -130,9 +130,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -179,9 +177,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -226,9 +222,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -273,9 +267,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -320,9 +312,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/nhooyr_two.exp.json b/testdata/d2oracle/TestMove/nhooyr_two.exp.json index 3faa27f08..f5c587e61 100644 --- a/testdata/d2oracle/TestMove/nhooyr_two.exp.json +++ b/testdata/d2oracle/TestMove/nhooyr_two.exp.json @@ -176,9 +176,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -209,9 +207,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -258,9 +254,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -305,9 +299,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -352,9 +344,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -399,9 +389,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -446,9 +434,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -493,9 +479,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/out_of_newline_container.exp.json b/testdata/d2oracle/TestMove/out_of_newline_container.exp.json index b4979b03d..406266d42 100644 --- a/testdata/d2oracle/TestMove/out_of_newline_container.exp.json +++ b/testdata/d2oracle/TestMove/out_of_newline_container.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -121,9 +119,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -168,9 +164,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/parentheses.exp.json b/testdata/d2oracle/TestMove/parentheses.exp.json index d59d54b5f..cf72f932a 100644 --- a/testdata/d2oracle/TestMove/parentheses.exp.json +++ b/testdata/d2oracle/TestMove/parentheses.exp.json @@ -111,9 +111,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -144,9 +142,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -193,9 +189,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -271,9 +265,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -329,9 +321,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/partial_edge_slice.exp.json b/testdata/d2oracle/TestMove/partial_edge_slice.exp.json index aee09a349..710b71d9b 100644 --- a/testdata/d2oracle/TestMove/partial_edge_slice.exp.json +++ b/testdata/d2oracle/TestMove/partial_edge_slice.exp.json @@ -118,9 +118,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -151,9 +149,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -200,9 +196,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -267,9 +261,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -314,9 +306,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/partial_slice.exp.json b/testdata/d2oracle/TestMove/partial_slice.exp.json index b2ff45583..adc1a450c 100644 --- a/testdata/d2oracle/TestMove/partial_slice.exp.json +++ b/testdata/d2oracle/TestMove/partial_slice.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -121,9 +119,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -168,9 +164,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/rename_2.exp.json b/testdata/d2oracle/TestMove/rename_2.exp.json index c998f5188..4d9afd231 100644 --- a/testdata/d2oracle/TestMove/rename_2.exp.json +++ b/testdata/d2oracle/TestMove/rename_2.exp.json @@ -147,9 +147,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -196,9 +194,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -243,9 +239,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -290,9 +284,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -337,9 +329,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -384,9 +374,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/reuse_map.exp.json b/testdata/d2oracle/TestMove/reuse_map.exp.json index 4913ec646..d50ff4940 100644 --- a/testdata/d2oracle/TestMove/reuse_map.exp.json +++ b/testdata/d2oracle/TestMove/reuse_map.exp.json @@ -164,9 +164,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -213,9 +211,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -291,9 +287,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -338,9 +332,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -385,9 +377,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -443,9 +433,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/slice_style.exp.json b/testdata/d2oracle/TestMove/slice_style.exp.json index 364a1ec65..b0f40fb09 100644 --- a/testdata/d2oracle/TestMove/slice_style.exp.json +++ b/testdata/d2oracle/TestMove/slice_style.exp.json @@ -116,9 +116,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -165,9 +163,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -256,9 +252,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/underscore-connection.exp.json b/testdata/d2oracle/TestMove/underscore-connection.exp.json index 45a2ba38c..ffa45addb 100644 --- a/testdata/d2oracle/TestMove/underscore-connection.exp.json +++ b/testdata/d2oracle/TestMove/underscore-connection.exp.json @@ -220,9 +220,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -253,9 +251,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -302,9 +298,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -433,9 +427,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -522,9 +514,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -611,9 +601,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/underscore_children.exp.json b/testdata/d2oracle/TestMove/underscore_children.exp.json index 34035e86c..e12a60427 100644 --- a/testdata/d2oracle/TestMove/underscore_children.exp.json +++ b/testdata/d2oracle/TestMove/underscore_children.exp.json @@ -112,9 +112,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -161,9 +159,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -239,9 +235,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/underscore_edge_children.exp.json b/testdata/d2oracle/TestMove/underscore_edge_children.exp.json index 720b01ae2..da36792ce 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_children.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_children.exp.json @@ -135,9 +135,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -168,9 +166,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -217,9 +213,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -295,9 +289,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -342,9 +334,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json index 7c6bb7452..a1ec31cc3 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json @@ -101,9 +101,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -134,9 +132,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -183,9 +179,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -230,9 +224,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -277,9 +269,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json index 6c97bcbec..dd300395c 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json @@ -112,9 +112,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -145,9 +143,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -194,9 +190,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -272,9 +266,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -330,9 +322,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json index daa84062c..f3d86845a 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json @@ -112,9 +112,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -145,9 +143,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -194,9 +190,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -252,9 +246,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -299,9 +291,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json index 66b9b06c8..09588a797 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json @@ -101,9 +101,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -134,9 +132,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -183,9 +179,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -230,9 +224,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -277,9 +269,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json index 7b1a4901d..68957c378 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json @@ -134,9 +134,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -167,9 +165,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -216,9 +212,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -316,9 +310,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -385,9 +377,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/underscore_edge_split.exp.json b/testdata/d2oracle/TestMove/underscore_edge_split.exp.json index 777d6ba3e..316581086 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_split.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_split.exp.json @@ -164,9 +164,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -197,9 +195,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -246,9 +242,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -293,9 +287,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -351,9 +343,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -398,9 +388,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -445,9 +433,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/underscore_merge.exp.json b/testdata/d2oracle/TestMove/underscore_merge.exp.json index 6c3414052..853d19030 100644 --- a/testdata/d2oracle/TestMove/underscore_merge.exp.json +++ b/testdata/d2oracle/TestMove/underscore_merge.exp.json @@ -144,9 +144,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -193,9 +191,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -240,9 +236,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -307,9 +301,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/underscore_split.exp.json b/testdata/d2oracle/TestMove/underscore_split.exp.json index e190dfd0e..46394f97a 100644 --- a/testdata/d2oracle/TestMove/underscore_split.exp.json +++ b/testdata/d2oracle/TestMove/underscore_split.exp.json @@ -141,9 +141,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -190,9 +188,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -237,9 +233,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -295,9 +289,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -342,9 +334,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/underscore_split_out.exp.json b/testdata/d2oracle/TestMove/underscore_split_out.exp.json index 2656b7b49..502f2ad3b 100644 --- a/testdata/d2oracle/TestMove/underscore_split_out.exp.json +++ b/testdata/d2oracle/TestMove/underscore_split_out.exp.json @@ -199,9 +199,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -248,9 +246,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -295,9 +291,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -373,9 +367,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -420,9 +412,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -467,9 +457,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/underscore_transplant.exp.json b/testdata/d2oracle/TestMove/underscore_transplant.exp.json index 1c92d49c1..3f94db4a3 100644 --- a/testdata/d2oracle/TestMove/underscore_transplant.exp.json +++ b/testdata/d2oracle/TestMove/underscore_transplant.exp.json @@ -101,9 +101,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -150,9 +148,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -197,9 +193,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -244,9 +238,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/unique_name.exp.json b/testdata/d2oracle/TestMove/unique_name.exp.json index 7f676ea29..db79c3a90 100644 --- a/testdata/d2oracle/TestMove/unique_name.exp.json +++ b/testdata/d2oracle/TestMove/unique_name.exp.json @@ -158,9 +158,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -238,9 +236,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -316,9 +312,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -363,9 +357,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -410,9 +402,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/unique_name_with_references.exp.json b/testdata/d2oracle/TestMove/unique_name_with_references.exp.json index 504797987..75ef2e6c3 100644 --- a/testdata/d2oracle/TestMove/unique_name_with_references.exp.json +++ b/testdata/d2oracle/TestMove/unique_name_with_references.exp.json @@ -181,9 +181,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -214,9 +212,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -294,9 +290,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -341,9 +335,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -419,9 +411,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -466,9 +456,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -513,9 +501,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestRename/arrows.exp.json b/testdata/d2oracle/TestRename/arrows.exp.json index 65601ceb2..053fc2385 100644 --- a/testdata/d2oracle/TestRename/arrows.exp.json +++ b/testdata/d2oracle/TestRename/arrows.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -105,9 +103,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -154,9 +150,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -201,9 +195,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestRename/arrows_chain.exp.json b/testdata/d2oracle/TestRename/arrows_chain.exp.json index ebbc0754c..dea6f70fe 100644 --- a/testdata/d2oracle/TestRename/arrows_chain.exp.json +++ b/testdata/d2oracle/TestRename/arrows_chain.exp.json @@ -146,9 +146,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -179,9 +177,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -211,9 +207,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -243,9 +237,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -292,9 +284,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -359,9 +349,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -426,9 +414,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -473,9 +459,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestRename/arrows_complex.exp.json b/testdata/d2oracle/TestRename/arrows_complex.exp.json index 92260d221..71ad234df 100644 --- a/testdata/d2oracle/TestRename/arrows_complex.exp.json +++ b/testdata/d2oracle/TestRename/arrows_complex.exp.json @@ -126,9 +126,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -159,9 +157,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -219,9 +215,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -277,9 +271,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -324,9 +316,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -371,9 +361,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestRename/arrows_trim_common.exp.json b/testdata/d2oracle/TestRename/arrows_trim_common.exp.json index bda0cfb12..249395f9d 100644 --- a/testdata/d2oracle/TestRename/arrows_trim_common.exp.json +++ b/testdata/d2oracle/TestRename/arrows_trim_common.exp.json @@ -162,9 +162,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -195,9 +193,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -227,9 +223,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -259,9 +253,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -308,9 +300,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -355,9 +345,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -422,9 +410,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -489,9 +475,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -536,9 +520,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json b/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json index d5603eef6..ee47fe5d2 100644 --- a/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json +++ b/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json @@ -212,9 +212,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -245,9 +243,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -277,9 +273,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -309,9 +303,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -524,9 +516,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -582,9 +572,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -671,9 +659,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -760,9 +746,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -818,9 +802,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestRename/complex_edge_1.exp.json b/testdata/d2oracle/TestRename/complex_edge_1.exp.json index 1fb5764c4..f9331bf08 100644 --- a/testdata/d2oracle/TestRename/complex_edge_1.exp.json +++ b/testdata/d2oracle/TestRename/complex_edge_1.exp.json @@ -126,9 +126,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -159,9 +157,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -219,9 +215,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -277,9 +271,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -324,9 +316,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -371,9 +361,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestRename/complex_edge_2.exp.json b/testdata/d2oracle/TestRename/complex_edge_2.exp.json index d060f7c14..ff471c689 100644 --- a/testdata/d2oracle/TestRename/complex_edge_2.exp.json +++ b/testdata/d2oracle/TestRename/complex_edge_2.exp.json @@ -126,9 +126,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -159,9 +157,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -219,9 +215,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -277,9 +271,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -324,9 +316,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -371,9 +361,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestRename/conflict.exp.json b/testdata/d2oracle/TestRename/conflict.exp.json index bda1da047..c882e1f56 100644 --- a/testdata/d2oracle/TestRename/conflict.exp.json +++ b/testdata/d2oracle/TestRename/conflict.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -121,9 +119,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -168,9 +164,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestRename/conflict_2.exp.json b/testdata/d2oracle/TestRename/conflict_2.exp.json index dd888cf03..3fbd503aa 100644 --- a/testdata/d2oracle/TestRename/conflict_2.exp.json +++ b/testdata/d2oracle/TestRename/conflict_2.exp.json @@ -123,9 +123,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -194,9 +192,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -263,9 +259,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -332,9 +326,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -379,9 +371,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -426,9 +416,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestRename/conflict_with_dots.exp.json b/testdata/d2oracle/TestRename/conflict_with_dots.exp.json index 09834764a..229aff72e 100644 --- a/testdata/d2oracle/TestRename/conflict_with_dots.exp.json +++ b/testdata/d2oracle/TestRename/conflict_with_dots.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -121,9 +119,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -168,9 +164,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestRename/conflict_with_numbers.exp.json b/testdata/d2oracle/TestRename/conflict_with_numbers.exp.json index 73c080df8..85b87e0db 100644 --- a/testdata/d2oracle/TestRename/conflict_with_numbers.exp.json +++ b/testdata/d2oracle/TestRename/conflict_with_numbers.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -121,9 +119,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -168,9 +164,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestRename/container.exp.json b/testdata/d2oracle/TestRename/container.exp.json index 830fb8025..c8585d3f3 100644 --- a/testdata/d2oracle/TestRename/container.exp.json +++ b/testdata/d2oracle/TestRename/container.exp.json @@ -751,9 +751,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -787,9 +785,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -819,9 +815,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -851,9 +845,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -883,9 +875,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -915,9 +905,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -947,9 +935,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -979,9 +965,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -1269,9 +1253,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1557,9 +1539,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1834,9 +1814,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1954,9 +1932,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -2074,9 +2050,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -2163,9 +2137,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -2252,9 +2224,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -2299,9 +2269,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -2366,9 +2334,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -2413,9 +2379,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -2460,9 +2424,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -2529,9 +2491,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -2598,9 +2558,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -2667,9 +2625,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -2725,9 +2681,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -2783,9 +2737,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestRename/edges.exp.json b/testdata/d2oracle/TestRename/edges.exp.json index 678a43a46..3c353fee3 100644 --- a/testdata/d2oracle/TestRename/edges.exp.json +++ b/testdata/d2oracle/TestRename/edges.exp.json @@ -416,9 +416,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -449,9 +447,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -481,9 +477,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -513,9 +507,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -545,9 +537,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -577,9 +567,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -609,9 +597,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -782,9 +768,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -973,9 +957,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1062,9 +1044,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1151,9 +1131,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1240,9 +1218,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1329,9 +1305,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1376,9 +1350,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1443,9 +1415,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestRename/flat.exp.json b/testdata/d2oracle/TestRename/flat.exp.json index f8921a5c2..028991927 100644 --- a/testdata/d2oracle/TestRename/flat.exp.json +++ b/testdata/d2oracle/TestRename/flat.exp.json @@ -49,9 +49,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -98,9 +96,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestRename/generated.exp.json b/testdata/d2oracle/TestRename/generated.exp.json index 443c2a35e..7d2554939 100644 --- a/testdata/d2oracle/TestRename/generated.exp.json +++ b/testdata/d2oracle/TestRename/generated.exp.json @@ -49,9 +49,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -98,9 +96,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestRename/near.exp.json b/testdata/d2oracle/TestRename/near.exp.json index 13468f6f7..50bf9b91d 100644 --- a/testdata/d2oracle/TestRename/near.exp.json +++ b/testdata/d2oracle/TestRename/near.exp.json @@ -111,9 +111,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -175,9 +173,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -222,9 +218,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestRename/nested.exp.json b/testdata/d2oracle/TestRename/nested.exp.json index 710fc49b7..9fde64d16 100644 --- a/testdata/d2oracle/TestRename/nested.exp.json +++ b/testdata/d2oracle/TestRename/nested.exp.json @@ -178,9 +178,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -324,9 +322,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -468,9 +464,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -612,9 +606,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -756,9 +748,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -867,9 +857,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/base.exp.json b/testdata/d2oracle/TestSet/base.exp.json index f7f02cc90..18dbe52f0 100644 --- a/testdata/d2oracle/TestSet/base.exp.json +++ b/testdata/d2oracle/TestSet/base.exp.json @@ -49,9 +49,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -98,9 +96,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/block_string_multiline.exp.json b/testdata/d2oracle/TestSet/block_string_multiline.exp.json index 700fc13d6..b42981de5 100644 --- a/testdata/d2oracle/TestSet/block_string_multiline.exp.json +++ b/testdata/d2oracle/TestSet/block_string_multiline.exp.json @@ -56,9 +56,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -106,9 +104,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/block_string_oneline.exp.json b/testdata/d2oracle/TestSet/block_string_oneline.exp.json index 4e6c158d4..2324b55be 100644 --- a/testdata/d2oracle/TestSet/block_string_oneline.exp.json +++ b/testdata/d2oracle/TestSet/block_string_oneline.exp.json @@ -56,9 +56,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -106,9 +104,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/classes-style.exp.json b/testdata/d2oracle/TestSet/classes-style.exp.json index 7606c8653..bd8c593c8 100644 --- a/testdata/d2oracle/TestSet/classes-style.exp.json +++ b/testdata/d2oracle/TestSet/classes-style.exp.json @@ -227,9 +227,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -333,9 +331,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - }, + "constraint": null, "classes": [ "a" ] diff --git a/testdata/d2oracle/TestSet/dupe-classes-style.exp.json b/testdata/d2oracle/TestSet/dupe-classes-style.exp.json index 50a62f7bf..04d724c19 100644 --- a/testdata/d2oracle/TestSet/dupe-classes-style.exp.json +++ b/testdata/d2oracle/TestSet/dupe-classes-style.exp.json @@ -227,9 +227,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -333,9 +331,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - }, + "constraint": null, "classes": [ "a" ] diff --git a/testdata/d2oracle/TestSet/edge.exp.json b/testdata/d2oracle/TestSet/edge.exp.json index 2c76cca83..cbc71edfb 100644 --- a/testdata/d2oracle/TestSet/edge.exp.json +++ b/testdata/d2oracle/TestSet/edge.exp.json @@ -82,9 +82,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -115,9 +113,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -164,9 +160,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -211,9 +205,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/edge_append_style.exp.json b/testdata/d2oracle/TestSet/edge_append_style.exp.json index c8f216c65..d3fe03683 100644 --- a/testdata/d2oracle/TestSet/edge_append_style.exp.json +++ b/testdata/d2oracle/TestSet/edge_append_style.exp.json @@ -117,9 +117,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -154,9 +152,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -203,9 +199,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -250,9 +244,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/edge_chain.exp.json b/testdata/d2oracle/TestSet/edge_chain.exp.json index 51b4137c9..37845d039 100644 --- a/testdata/d2oracle/TestSet/edge_chain.exp.json +++ b/testdata/d2oracle/TestSet/edge_chain.exp.json @@ -209,9 +209,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -245,9 +243,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -277,9 +273,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -326,9 +320,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -393,9 +385,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -480,9 +470,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -527,9 +515,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json b/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json index 301659aa6..d43649e4c 100644 --- a/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json +++ b/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json @@ -192,9 +192,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -232,9 +230,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -264,9 +260,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -333,9 +327,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -420,9 +412,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -467,9 +457,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json b/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json index 7e2d1bd9e..ac3a85f1f 100644 --- a/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json +++ b/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json @@ -276,9 +276,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -309,9 +307,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -354,9 +350,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -403,9 +397,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -510,9 +502,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -597,9 +587,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json b/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json index 672a3f564..64642fa83 100644 --- a/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json +++ b/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json @@ -232,9 +232,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -272,9 +270,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -304,9 +300,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -353,9 +347,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -420,9 +412,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -507,9 +497,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -554,9 +542,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.exp.json b/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.exp.json index ded67e709..c3607a42e 100644 --- a/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.exp.json +++ b/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.exp.json @@ -197,9 +197,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -225,9 +223,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "references": [ { @@ -253,9 +249,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -285,9 +279,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -354,9 +346,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -441,9 +431,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -488,9 +476,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/edge_index_case.exp.json b/testdata/d2oracle/TestSet/edge_index_case.exp.json index f0ae94d5d..4f6183aac 100644 --- a/testdata/d2oracle/TestSet/edge_index_case.exp.json +++ b/testdata/d2oracle/TestSet/edge_index_case.exp.json @@ -186,9 +186,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -219,9 +217,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -251,9 +247,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -300,9 +294,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -347,9 +339,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -394,9 +384,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -441,9 +429,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -488,9 +474,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -535,9 +519,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/edge_index_merge_style.exp.json b/testdata/d2oracle/TestSet/edge_index_merge_style.exp.json index c1c983fad..c3a27950a 100644 --- a/testdata/d2oracle/TestSet/edge_index_merge_style.exp.json +++ b/testdata/d2oracle/TestSet/edge_index_merge_style.exp.json @@ -193,9 +193,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -233,9 +231,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -265,9 +261,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -334,9 +328,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -421,9 +413,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -468,9 +458,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/edge_index_nested.exp.json b/testdata/d2oracle/TestSet/edge_index_nested.exp.json index be7387a8d..e9b1ced7c 100644 --- a/testdata/d2oracle/TestSet/edge_index_nested.exp.json +++ b/testdata/d2oracle/TestSet/edge_index_nested.exp.json @@ -111,9 +111,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -144,9 +142,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -193,9 +189,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -240,9 +234,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -287,9 +279,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/edge_key_and_key.exp.json b/testdata/d2oracle/TestSet/edge_key_and_key.exp.json index ab67c717c..01df66472 100644 --- a/testdata/d2oracle/TestSet/edge_key_and_key.exp.json +++ b/testdata/d2oracle/TestSet/edge_key_and_key.exp.json @@ -162,9 +162,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -199,9 +197,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -310,9 +306,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -368,9 +362,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -426,9 +418,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/edge_label.exp.json b/testdata/d2oracle/TestSet/edge_label.exp.json index a55c91c0a..b7ad2f213 100644 --- a/testdata/d2oracle/TestSet/edge_label.exp.json +++ b/testdata/d2oracle/TestSet/edge_label.exp.json @@ -127,9 +127,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -164,9 +162,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -213,9 +209,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -260,9 +254,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/edge_merge_arrowhead.exp.json b/testdata/d2oracle/TestSet/edge_merge_arrowhead.exp.json index 124ccee33..d57cb0b28 100644 --- a/testdata/d2oracle/TestSet/edge_merge_arrowhead.exp.json +++ b/testdata/d2oracle/TestSet/edge_merge_arrowhead.exp.json @@ -169,9 +169,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -197,9 +195,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "references": [ { @@ -222,9 +218,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -271,9 +265,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -318,9 +310,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/edge_merge_style.exp.json b/testdata/d2oracle/TestSet/edge_merge_style.exp.json index cc5c9b6eb..57edaa2e2 100644 --- a/testdata/d2oracle/TestSet/edge_merge_style.exp.json +++ b/testdata/d2oracle/TestSet/edge_merge_style.exp.json @@ -164,9 +164,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -204,9 +202,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -253,9 +249,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -300,9 +294,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json b/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json index 73a1c5b79..21e350ee7 100644 --- a/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json +++ b/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json @@ -111,9 +111,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -144,9 +142,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -193,9 +189,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -240,9 +234,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -287,9 +279,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json b/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json index 4781ea1c7..275675bb2 100644 --- a/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json +++ b/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json @@ -157,9 +157,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -194,9 +192,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -243,9 +239,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -290,9 +284,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -337,9 +329,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/edge_replace_arrowhead.exp.json b/testdata/d2oracle/TestSet/edge_replace_arrowhead.exp.json index ed0a6baff..fbe9611da 100644 --- a/testdata/d2oracle/TestSet/edge_replace_arrowhead.exp.json +++ b/testdata/d2oracle/TestSet/edge_replace_arrowhead.exp.json @@ -122,9 +122,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -150,9 +148,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "references": [ { @@ -175,9 +171,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -224,9 +218,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -271,9 +263,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.exp.json b/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.exp.json index da49006e5..79cab4cf1 100644 --- a/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.exp.json +++ b/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.exp.json @@ -160,9 +160,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -188,9 +186,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "references": [ { @@ -216,9 +212,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -285,9 +279,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -352,9 +344,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/edge_set_arrowhead.exp.json b/testdata/d2oracle/TestSet/edge_set_arrowhead.exp.json index e3c6f6c31..989d7fd47 100644 --- a/testdata/d2oracle/TestSet/edge_set_arrowhead.exp.json +++ b/testdata/d2oracle/TestSet/edge_set_arrowhead.exp.json @@ -122,9 +122,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -150,9 +148,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "references": [ { @@ -175,9 +171,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -224,9 +218,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -271,9 +263,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/expanded_map_style.exp.json b/testdata/d2oracle/TestSet/expanded_map_style.exp.json index 0ce80a7cf..eab037808 100644 --- a/testdata/d2oracle/TestSet/expanded_map_style.exp.json +++ b/testdata/d2oracle/TestSet/expanded_map_style.exp.json @@ -113,9 +113,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -166,9 +164,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/icon.exp.json b/testdata/d2oracle/TestSet/icon.exp.json index 529342cc8..1ccc50dfe 100644 --- a/testdata/d2oracle/TestSet/icon.exp.json +++ b/testdata/d2oracle/TestSet/icon.exp.json @@ -88,9 +88,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -150,9 +148,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/inline_style.exp.json b/testdata/d2oracle/TestSet/inline_style.exp.json index 25d9c3795..2d9c5fe49 100644 --- a/testdata/d2oracle/TestSet/inline_style.exp.json +++ b/testdata/d2oracle/TestSet/inline_style.exp.json @@ -139,9 +139,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -195,9 +193,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/label.exp.json b/testdata/d2oracle/TestSet/label.exp.json index c6f1534ec..b091d0d7e 100644 --- a/testdata/d2oracle/TestSet/label.exp.json +++ b/testdata/d2oracle/TestSet/label.exp.json @@ -59,9 +59,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -108,9 +106,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/label_primary.exp.json b/testdata/d2oracle/TestSet/label_primary.exp.json index 5d048c690..b8b0c6533 100644 --- a/testdata/d2oracle/TestSet/label_primary.exp.json +++ b/testdata/d2oracle/TestSet/label_primary.exp.json @@ -107,9 +107,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -140,9 +138,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -189,9 +185,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -236,9 +230,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -283,9 +275,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/label_replace.exp.json b/testdata/d2oracle/TestSet/label_replace.exp.json index 81e138012..976aa222f 100644 --- a/testdata/d2oracle/TestSet/label_replace.exp.json +++ b/testdata/d2oracle/TestSet/label_replace.exp.json @@ -59,9 +59,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -108,9 +106,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/label_unset.exp.json b/testdata/d2oracle/TestSet/label_unset.exp.json index dc2d78f06..c1cd12102 100644 --- a/testdata/d2oracle/TestSet/label_unset.exp.json +++ b/testdata/d2oracle/TestSet/label_unset.exp.json @@ -49,9 +49,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -98,9 +96,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/map_key_missing.exp.json b/testdata/d2oracle/TestSet/map_key_missing.exp.json index 03123bb2c..d1b913626 100644 --- a/testdata/d2oracle/TestSet/map_key_missing.exp.json +++ b/testdata/d2oracle/TestSet/map_key_missing.exp.json @@ -105,9 +105,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -138,9 +136,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -207,9 +203,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -254,9 +248,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/nested_alex.exp.json b/testdata/d2oracle/TestSet/nested_alex.exp.json index da163d796..edcad2764 100644 --- a/testdata/d2oracle/TestSet/nested_alex.exp.json +++ b/testdata/d2oracle/TestSet/nested_alex.exp.json @@ -177,9 +177,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -210,9 +208,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -259,9 +255,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -306,9 +300,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -373,9 +365,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/new_style.exp.json b/testdata/d2oracle/TestSet/new_style.exp.json index ca0879f88..79c6afd5d 100644 --- a/testdata/d2oracle/TestSet/new_style.exp.json +++ b/testdata/d2oracle/TestSet/new_style.exp.json @@ -95,9 +95,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -148,9 +146,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/replace_arrowhead.exp.json b/testdata/d2oracle/TestSet/replace_arrowhead.exp.json index 248870e77..a932bd7a8 100644 --- a/testdata/d2oracle/TestSet/replace_arrowhead.exp.json +++ b/testdata/d2oracle/TestSet/replace_arrowhead.exp.json @@ -122,9 +122,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -150,9 +148,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "references": [ { @@ -175,9 +171,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -224,9 +218,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -271,9 +263,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/replace_arrowhead_map.exp.json b/testdata/d2oracle/TestSet/replace_arrowhead_map.exp.json index 3de2bb5bc..846722df0 100644 --- a/testdata/d2oracle/TestSet/replace_arrowhead_map.exp.json +++ b/testdata/d2oracle/TestSet/replace_arrowhead_map.exp.json @@ -140,9 +140,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -168,9 +166,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "references": [ { @@ -193,9 +189,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -242,9 +236,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -289,9 +281,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/replace_dimensions.exp.json b/testdata/d2oracle/TestSet/replace_dimensions.exp.json index b999b3e57..958b2baa9 100644 --- a/testdata/d2oracle/TestSet/replace_dimensions.exp.json +++ b/testdata/d2oracle/TestSet/replace_dimensions.exp.json @@ -84,9 +84,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -136,9 +134,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/replace_edge_style.exp.json b/testdata/d2oracle/TestSet/replace_edge_style.exp.json index f5ce4d7f6..caaec8158 100644 --- a/testdata/d2oracle/TestSet/replace_edge_style.exp.json +++ b/testdata/d2oracle/TestSet/replace_edge_style.exp.json @@ -158,9 +158,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -198,9 +196,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -247,9 +243,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -294,9 +288,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/replace_edge_style_map.exp.json b/testdata/d2oracle/TestSet/replace_edge_style_map.exp.json index 4499d37b8..ab62815ba 100644 --- a/testdata/d2oracle/TestSet/replace_edge_style_map.exp.json +++ b/testdata/d2oracle/TestSet/replace_edge_style_map.exp.json @@ -136,9 +136,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -173,9 +171,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -222,9 +218,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -269,9 +263,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/replace_fill_pattern.exp.json b/testdata/d2oracle/TestSet/replace_fill_pattern.exp.json index c783b3862..876fd7eac 100644 --- a/testdata/d2oracle/TestSet/replace_fill_pattern.exp.json +++ b/testdata/d2oracle/TestSet/replace_fill_pattern.exp.json @@ -99,9 +99,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -152,9 +150,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/replace_link.exp.json b/testdata/d2oracle/TestSet/replace_link.exp.json index 24e0ad009..028881270 100644 --- a/testdata/d2oracle/TestSet/replace_link.exp.json +++ b/testdata/d2oracle/TestSet/replace_link.exp.json @@ -88,9 +88,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -140,9 +138,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/replace_position.exp.json b/testdata/d2oracle/TestSet/replace_position.exp.json index eb08e4668..e41ab8f9a 100644 --- a/testdata/d2oracle/TestSet/replace_position.exp.json +++ b/testdata/d2oracle/TestSet/replace_position.exp.json @@ -142,9 +142,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -200,9 +198,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/replace_shape.exp.json b/testdata/d2oracle/TestSet/replace_shape.exp.json index 93089429f..9fa391b04 100644 --- a/testdata/d2oracle/TestSet/replace_shape.exp.json +++ b/testdata/d2oracle/TestSet/replace_shape.exp.json @@ -70,9 +70,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -130,9 +128,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/replace_style.exp.json b/testdata/d2oracle/TestSet/replace_style.exp.json index 424697d3c..47a623194 100644 --- a/testdata/d2oracle/TestSet/replace_style.exp.json +++ b/testdata/d2oracle/TestSet/replace_style.exp.json @@ -77,9 +77,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -152,9 +150,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/replace_style_edgecase.exp.json b/testdata/d2oracle/TestSet/replace_style_edgecase.exp.json index 346ff1af8..197c9461b 100644 --- a/testdata/d2oracle/TestSet/replace_style_edgecase.exp.json +++ b/testdata/d2oracle/TestSet/replace_style_edgecase.exp.json @@ -132,9 +132,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -252,9 +250,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/replace_tooltip.exp.json b/testdata/d2oracle/TestSet/replace_tooltip.exp.json index a5d18437f..323a44945 100644 --- a/testdata/d2oracle/TestSet/replace_tooltip.exp.json +++ b/testdata/d2oracle/TestSet/replace_tooltip.exp.json @@ -88,9 +88,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -140,9 +138,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/set_dimensions.exp.json b/testdata/d2oracle/TestSet/set_dimensions.exp.json index adfb943b6..ee588adbb 100644 --- a/testdata/d2oracle/TestSet/set_dimensions.exp.json +++ b/testdata/d2oracle/TestSet/set_dimensions.exp.json @@ -84,9 +84,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -136,9 +134,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/set_fill_pattern.exp.json b/testdata/d2oracle/TestSet/set_fill_pattern.exp.json index 6984ebd04..3f1377fda 100644 --- a/testdata/d2oracle/TestSet/set_fill_pattern.exp.json +++ b/testdata/d2oracle/TestSet/set_fill_pattern.exp.json @@ -99,9 +99,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -152,9 +150,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/set_position.exp.json b/testdata/d2oracle/TestSet/set_position.exp.json index 5b0379637..7ae4b113f 100644 --- a/testdata/d2oracle/TestSet/set_position.exp.json +++ b/testdata/d2oracle/TestSet/set_position.exp.json @@ -84,9 +84,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -136,9 +134,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/set_tooltip.exp.json b/testdata/d2oracle/TestSet/set_tooltip.exp.json index ac8684a61..c8bc0b3b1 100644 --- a/testdata/d2oracle/TestSet/set_tooltip.exp.json +++ b/testdata/d2oracle/TestSet/set_tooltip.exp.json @@ -88,9 +88,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -140,9 +138,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/shape.exp.json b/testdata/d2oracle/TestSet/shape.exp.json index b972a20aa..96f6dc008 100644 --- a/testdata/d2oracle/TestSet/shape.exp.json +++ b/testdata/d2oracle/TestSet/shape.exp.json @@ -88,9 +88,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -137,9 +135,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/shape_nested_style_set.exp.json b/testdata/d2oracle/TestSet/shape_nested_style_set.exp.json index 301e3e04b..1b73a82ac 100644 --- a/testdata/d2oracle/TestSet/shape_nested_style_set.exp.json +++ b/testdata/d2oracle/TestSet/shape_nested_style_set.exp.json @@ -95,9 +95,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -148,9 +146,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/unapplied-classes-style-2.exp.json b/testdata/d2oracle/TestSet/unapplied-classes-style-2.exp.json index 9821f6bd4..cc1895eef 100644 --- a/testdata/d2oracle/TestSet/unapplied-classes-style-2.exp.json +++ b/testdata/d2oracle/TestSet/unapplied-classes-style-2.exp.json @@ -201,9 +201,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -254,9 +252,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/unapplied-classes-style.exp.json b/testdata/d2oracle/TestSet/unapplied-classes-style.exp.json index 003a21036..e8fb954b9 100644 --- a/testdata/d2oracle/TestSet/unapplied-classes-style.exp.json +++ b/testdata/d2oracle/TestSet/unapplied-classes-style.exp.json @@ -183,9 +183,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -258,9 +256,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } From c9517b1978f07a78710137f1f5f3a2a2cd783a76 Mon Sep 17 00:00:00 2001 From: satoqz Date: Mon, 1 May 2023 14:13:52 +0200 Subject: [PATCH 03/62] tweak constraint width calculation --- d2graph/d2graph.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/d2graph/d2graph.go b/d2graph/d2graph.go index b427bc9e1..56647269f 100644 --- a/d2graph/d2graph.go +++ b/d2graph/d2graph.go @@ -1036,8 +1036,9 @@ func (obj *Object) GetDefaultSize(mtexts []*d2target.MText, ruler *textmeasure.R } maxTypeWidth = go2.Max(maxTypeWidth, typeDims.Width) - if len(c.Constraint) > 0 { - constraintWidth = 60 + // 60 covers UNQ constraint with padding, 50 for further constraints covers UNQ + space + if newWidth := 60 + 50*(len(c.Constraint)-1); newWidth > constraintWidth { + constraintWidth = newWidth } } From c0839c76bfdf61a6fec13acaf23aa7e45e204ef3 Mon Sep 17 00:00:00 2001 From: satoqz Date: Mon, 1 May 2023 14:21:47 +0200 Subject: [PATCH 04/62] revert updating testdata --- .../sketch.exp.svg | 160 ++--- .../d2sketch/testdata/opacity/sketch.exp.svg | 560 ++++++++--------- .../testdata/opacity_dark/sketch.exp.svg | 560 ++++++++--------- .../testdata/sql_tables/sketch.exp.svg | 154 ++--- .../testdata/sql_tables_dark/sketch.exp.svg | 154 ++--- .../testdata/opacity/dark_theme.exp.svg | 560 ++++++++--------- .../testdata/sql_tables/dark_theme.exp.svg | 152 ++--- .../TestCLI_E2E/internal_linked_pdf.exp.pdf | Bin 79993 -> 79993 bytes .../patterns/real-lines/dagre/board.exp.json | 20 +- .../patterns/real-lines/dagre/sketch.exp.svg | 166 ++--- .../dagre/board.exp.json | 2 +- .../dagre/sketch.exp.svg | 158 ++--- .../elk/board.exp.json | 2 +- .../elk/sketch.exp.svg | 158 ++--- .../sql_table_overflow/dagre/board.exp.json | 12 +- .../sql_table_overflow/dagre/sketch.exp.svg | 152 ++--- .../sql_table_overflow/elk/board.exp.json | 12 +- .../sql_table_overflow/elk/sketch.exp.svg | 152 ++--- .../dagre/board.exp.json | 10 +- .../dagre/sketch.exp.svg | 166 ++--- .../elk/board.exp.json | 10 +- .../elk/sketch.exp.svg | 166 ++--- .../stable/array-classes/dagre/board.exp.json | 8 - .../stable/array-classes/dagre/sketch.exp.svg | 152 ++--- .../stable/array-classes/elk/board.exp.json | 8 - .../stable/array-classes/elk/sketch.exp.svg | 152 ++--- .../dagre/board.exp.json | 14 +- .../dagre/sketch.exp.svg | 158 ++--- .../elk/board.exp.json | 14 +- .../elk/sketch.exp.svg | 158 ++--- .../stable/ent2d2_basic/dagre/board.exp.json | 50 +- .../stable/ent2d2_basic/dagre/sketch.exp.svg | 158 ++--- .../stable/ent2d2_basic/elk/board.exp.json | 50 +- .../stable/ent2d2_basic/elk/sketch.exp.svg | 158 ++--- .../stable/ent2d2_right/dagre/board.exp.json | 50 +- .../stable/ent2d2_right/dagre/sketch.exp.svg | 158 ++--- .../stable/ent2d2_right/elk/board.exp.json | 50 +- .../stable/ent2d2_right/elk/sketch.exp.svg | 158 ++--- .../dagre/board.exp.json | 4 +- .../dagre/sketch.exp.svg | 172 +++--- .../elk/board.exp.json | 4 +- .../elk/sketch.exp.svg | 172 +++--- .../dagre/board.exp.json | 8 +- .../dagre/sketch.exp.svg | 158 ++--- .../elk/board.exp.json | 8 +- .../elk/sketch.exp.svg | 158 ++--- .../dagre/board.exp.json | 4 +- .../dagre/sketch.exp.svg | 154 ++--- .../elk/board.exp.json | 4 +- .../elk/sketch.exp.svg | 154 ++--- .../stable/sql_tables/dagre/board.exp.json | 34 +- .../stable/sql_tables/dagre/sketch.exp.svg | 152 ++--- .../stable/sql_tables/elk/board.exp.json | 34 +- .../stable/sql_tables/elk/sketch.exp.svg | 152 ++--- .../unnamed_only_height/dagre/board.exp.json | 10 +- .../unnamed_only_height/dagre/sketch.exp.svg | 166 ++--- .../unnamed_only_height/elk/board.exp.json | 10 +- .../unnamed_only_height/elk/sketch.exp.svg | 166 ++--- .../unnamed_only_width/dagre/board.exp.json | 10 +- .../unnamed_only_width/dagre/sketch.exp.svg | 166 ++--- .../unnamed_only_width/elk/board.exp.json | 10 +- .../unnamed_only_width/elk/sketch.exp.svg | 166 ++--- .../dagre/board.exp.json | 10 +- .../dagre/sketch.exp.svg | 572 +++++++++--------- .../elk/board.exp.json | 10 +- .../elk/sketch.exp.svg | 572 +++++++++--------- .../themes/terminal/dagre/board.exp.json | 10 +- .../themes/terminal/dagre/sketch.exp.svg | 566 ++++++++--------- .../themes/terminal/elk/board.exp.json | 10 +- .../themes/terminal/elk/sketch.exp.svg | 566 ++++++++--------- .../dagre/board.exp.json | 10 +- .../dagre/sketch.exp.svg | 566 ++++++++--------- .../shape_set_width_height/elk/board.exp.json | 10 +- .../shape_set_width_height/elk/sketch.exp.svg | 566 ++++++++--------- test.d2 | 7 + test.png | Bin 0 -> 41263 bytes test.svg | 95 +++ .../TestCompile/array-classes.exp.json | 28 +- .../TestCompile/basic_icon.exp.json | 8 +- .../TestCompile/basic_sequence.exp.json | 8 +- .../TestCompile/basic_shape.exp.json | 8 +- .../TestCompile/basic_style.exp.json | 8 +- .../TestCompile/class-shape-class.exp.json | 8 +- .../TestCompile/class_paren.exp.json | 8 +- .../TestCompile/class_style.exp.json | 8 +- .../d2compiler/TestCompile/classes.exp.json | 20 +- .../TestCompile/constraint_label.exp.json | 10 +- .../TestCompile/default_direction.exp.json | 8 +- .../TestCompile/dimension_with_style.exp.json | 8 +- .../dimensions_on_containers.exp.json | 40 +- .../dimensions_on_nonimage.exp.json | 8 +- testdata/d2compiler/TestCompile/edge.exp.json | 16 +- .../edge_arrowhead_fields.exp.json | 24 +- .../edge_arrowhead_primary.exp.json | 20 +- .../TestCompile/edge_chain.exp.json | 24 +- .../TestCompile/edge_chain_map.exp.json | 24 +- .../TestCompile/edge_column_index.exp.json | 24 +- .../TestCompile/edge_exclusive_style.exp.json | 16 +- .../TestCompile/edge_flat_arrowhead.exp.json | 20 +- .../edge_flat_label_arrowhead.exp.json | 20 +- .../TestCompile/edge_index.exp.json | 16 +- .../TestCompile/edge_index_map.exp.json | 16 +- .../TestCompile/edge_index_nested.exp.json | 20 +- .../edge_index_nested_cross_scope.exp.json | 20 +- .../edge_key_group_flat_nested.exp.json | 20 +- ..._key_group_flat_nested_underscore.exp.json | 20 +- ..._group_map_flat_nested_underscore.exp.json | 20 +- ...e_key_group_map_nested_underscore.exp.json | 20 +- .../TestCompile/edge_label_map.exp.json | 16 +- .../d2compiler/TestCompile/edge_map.exp.json | 16 +- .../TestCompile/edge_map_arrowhead.exp.json | 20 +- .../TestCompile/edge_map_group_flat.exp.json | 16 +- .../edge_map_group_semiflat.exp.json | 16 +- .../TestCompile/edge_map_nested.exp.json | 16 +- .../TestCompile/edge_map_nested_flat.exp.json | 16 +- .../TestCompile/edge_mixed_arrowhead.exp.json | 24 +- .../edge_non_shape_arrowhead.exp.json | 20 +- .../edge_semiflat_arrowhead.exp.json | 20 +- .../TestCompile/escaped_id.exp.json | 8 +- .../TestCompile/fill-pattern.exp.json | 8 +- testdata/d2compiler/TestCompile/grid.exp.json | 8 +- .../TestCompile/image_style.exp.json | 8 +- .../link-board-key-nested.exp.json | 20 +- .../TestCompile/link-board-mixed.exp.json | 32 +- .../TestCompile/link-board-nested.exp.json | 20 +- .../TestCompile/link-board-ok.exp.json | 16 +- .../link-board-underscore.exp.json | 28 +- .../TestCompile/missing-class.exp.json | 8 +- .../TestCompile/near_constant.exp.json | 8 +- .../TestCompile/nested_sql.exp.json | 16 +- .../nil_scope_obj_regression.exp.json | 12 +- testdata/d2compiler/TestCompile/null.exp.json | 8 +- .../d2compiler/TestCompile/path_link.exp.json | 8 +- .../d2compiler/TestCompile/positions.exp.json | 8 +- .../TestCompile/reordered-classes.exp.json | 8 +- .../reserved_icon_near_style.exp.json | 12 +- .../TestCompile/root_direction.exp.json | 4 +- .../TestCompile/root_sequence.exp.json | 4 +- .../TestCompile/self-referencing.exp.json | 12 +- .../TestCompile/sequence-timestamp.exp.json | 28 +- .../TestCompile/sequence_container.exp.json | 40 +- .../TestCompile/sequence_container_2.exp.json | 40 +- .../sequence_grouped_note.exp.json | 20 +- .../TestCompile/sequence_scoping.exp.json | 44 +- .../TestCompile/set_direction.exp.json | 8 +- .../single_dimension_on_circle.exp.json | 8 +- .../TestCompile/sql-constraints.exp.json | 372 ------------ .../TestCompile/sql-regression.exp.json | 18 +- .../d2compiler/TestCompile/sql_paren.exp.json | 12 +- .../TestCompile/stroke-width.exp.json | 8 +- .../table_connection_attr.exp.json | 20 +- .../TestCompile/table_style.exp.json | 10 +- .../TestCompile/table_style_map.exp.json | 10 +- .../TestCompile/text-transform.exp.json | 16 +- .../underscore_connection.exp.json | 24 +- .../TestCompile/underscore_edge.exp.json | 16 +- .../underscore_edge_chain.exp.json | 24 +- .../underscore_edge_existing.exp.json | 24 +- .../underscore_edge_index.exp.json | 20 +- .../underscore_edge_nested.exp.json | 20 +- .../underscore_parent_create.exp.json | 12 +- .../underscore_parent_not_root.exp.json | 16 +- .../underscore_parent_preference_1.exp.json | 12 +- .../underscore_parent_preference_2.exp.json | 12 +- .../underscore_parent_squared.exp.json | 16 +- .../underscore_unresolved_obj.exp.json | 12 +- .../TestCompile/unescaped_id_cr.exp.json | 8 +- .../d2compiler/TestCompile/url_link.exp.json | 8 +- ..._and_not_url_tooltip_concurrently.exp.json | 8 +- .../TestCompile/url_tooltip.exp.json | 8 +- .../TestCompile/wrong_column_index.exp.json | 44 +- .../TestCompile2/boards/isFolderOnly.exp.json | 36 +- .../TestCompile2/boards/recursive.exp.json | 52 +- .../TestCompile2/boards/root.exp.json | 24 +- .../boards/scenarios_edge_index.exp.json | 32 +- testdata/d2oracle/TestCreate/base.exp.json | 8 +- .../d2oracle/TestCreate/container.exp.json | 12 +- .../TestCreate/container_edge.exp.json | 20 +- .../TestCreate/container_edge_label.exp.json | 20 +- testdata/d2oracle/TestCreate/edge.exp.json | 16 +- .../d2oracle/TestCreate/edge_nested.exp.json | 20 +- .../d2oracle/TestCreate/edge_scope.exp.json | 20 +- .../TestCreate/edge_scope_flat.exp.json | 20 +- .../TestCreate/edge_scope_nested.exp.json | 24 +- .../d2oracle/TestCreate/edge_unique.exp.json | 40 +- testdata/d2oracle/TestCreate/gen_key.exp.json | 12 +- .../d2oracle/TestCreate/gen_key_n.exp.json | 60 +- .../TestCreate/gen_key_nested.exp.json | 24 +- .../TestCreate/gen_key_scope.exp.json | 24 +- .../TestCreate/gen_key_suffix.exp.json | 12 +- .../TestCreate/make_scope_multiline.exp.json | 12 +- .../make_scope_multiline_spacing_1.exp.json | 20 +- .../make_scope_multiline_spacing_2.exp.json | 20 +- testdata/d2oracle/TestCreate/nested.exp.json | 16 +- testdata/d2oracle/TestCreate/scope.exp.json | 20 +- .../d2oracle/TestDelete/arrowhead.exp.json | 16 +- .../TestDelete/arrowhead_label.exp.json | 20 +- .../TestDelete/arrowhead_map.exp.json | 16 +- .../TestDelete/arrowhead_shape.exp.json | 16 +- .../TestDelete/breakup_arrowhead.exp.json | 8 +- testdata/d2oracle/TestDelete/chaos_1.exp.json | 24 +- .../d2oracle/TestDelete/children.exp.json | 20 +- .../TestDelete/children_conflicts.exp.json | 12 +- .../children_edge_conflicts.exp.json | 20 +- .../children_edges_flat_conflicts.exp.json | 32 +- .../children_flat_conflicts.exp.json | 12 +- .../children_multiple_conflicts.exp.json | 24 +- .../children_nested_conflicts.exp.json | 16 +- ...ldren_nested_referenced_conflicts.exp.json | 16 +- .../children_no_self_conflict.exp.json | 8 +- .../TestDelete/children_order.exp.json | 20 +- .../children_referenced_conflicts.exp.json | 12 +- .../TestDelete/children_scope.exp.json | 28 +- .../d2oracle/TestDelete/class_refs.exp.json | 4 +- .../TestDelete/conflicts_generated.exp.json | 20 +- .../conflicts_generated_continued.exp.json | 16 +- .../TestDelete/container_near.exp.json | 16 +- .../delete_container_of_near.exp.json | 84 ++- .../d2oracle/TestDelete/delete_icon.exp.json | 12 +- .../d2oracle/TestDelete/delete_link.exp.json | 8 +- .../d2oracle/TestDelete/delete_near.exp.json | 12 +- .../delete_needed_flat_near.exp.json | 12 +- .../delete_redundant_flat_near.exp.json | 12 +- .../TestDelete/delete_tooltip.exp.json | 8 +- .../d2oracle/TestDelete/drop_value.exp.json | 12 +- .../drop_value_with_primary.exp.json | 8 +- .../TestDelete/duplicate_generated.exp.json | 28 +- .../TestDelete/edge-only-style.exp.json | 16 +- .../edge_both_identical_childs.exp.json | 24 +- .../d2oracle/TestDelete/edge_common.exp.json | 16 +- .../TestDelete/edge_common_2.exp.json | 16 +- .../TestDelete/edge_common_3.exp.json | 16 +- .../TestDelete/edge_common_4.exp.json | 16 +- .../TestDelete/edge_conflict.exp.json | 24 +- .../TestDelete/edge_decrement.exp.json | 28 +- .../d2oracle/TestDelete/edge_first.exp.json | 40 +- .../TestDelete/edge_flat_style.exp.json | 8 +- .../TestDelete/edge_identical_child.exp.json | 28 +- .../TestDelete/edge_key_style.exp.json | 16 +- .../d2oracle/TestDelete/edge_last.exp.json | 48 +- .../TestDelete/edge_map_style.exp.json | 16 +- .../d2oracle/TestDelete/edge_middle.exp.json | 48 +- .../d2oracle/TestDelete/empty_map.exp.json | 12 +- testdata/d2oracle/TestDelete/flat.exp.json | 4 +- .../TestDelete/flat_reserved.exp.json | 16 +- .../TestDelete/hoist_children.exp.json | 12 +- .../TestDelete/hoist_edge_children.exp.json | 20 +- .../TestDelete/key_with_edges.exp.json | 16 +- .../TestDelete/key_with_edges_2.exp.json | 12 +- .../TestDelete/key_with_edges_3.exp.json | 12 +- .../TestDelete/key_with_edges_4.exp.json | 16 +- testdata/d2oracle/TestDelete/left.exp.json | 8 +- .../d2oracle/TestDelete/multi_near.exp.json | 20 +- .../multi_path_map_conflict.exp.json | 16 +- .../multi_path_map_no_conflict.exp.json | 16 +- .../multiple_flat_middle_container.exp.json | 16 +- .../TestDelete/multiple_flat_style.exp.json | 8 +- .../TestDelete/multiple_map_styles.exp.json | 8 +- testdata/d2oracle/TestDelete/near.exp.json | 8 +- testdata/d2oracle/TestDelete/nested.exp.json | 16 +- .../d2oracle/TestDelete/nested_2.exp.json | 16 +- .../TestDelete/nested_edge_key_style.exp.json | 20 +- .../TestDelete/nested_flat_style.exp.json | 8 +- .../TestDelete/nested_reserved.exp.json | 16 +- .../nested_underscore_update.exp.json | 12 +- .../d2oracle/TestDelete/node_in_edge.exp.json | 36 +- .../TestDelete/node_in_edge_last.exp.json | 44 +- .../only-underscore-nested.exp.json | 16 +- .../TestDelete/only-underscore.exp.json | 12 +- .../only_delete_edge_reserved.exp.json | 16 +- .../only_delete_obj_reserved.exp.json | 16 +- testdata/d2oracle/TestDelete/order_1.exp.json | 20 +- testdata/d2oracle/TestDelete/order_2.exp.json | 12 +- testdata/d2oracle/TestDelete/order_3.exp.json | 12 +- testdata/d2oracle/TestDelete/order_4.exp.json | 8 +- testdata/d2oracle/TestDelete/order_5.exp.json | 32 +- testdata/d2oracle/TestDelete/order_6.exp.json | 20 +- testdata/d2oracle/TestDelete/order_7.exp.json | 24 +- testdata/d2oracle/TestDelete/order_8.exp.json | 24 +- .../d2oracle/TestDelete/save_map.exp.json | 8 +- .../TestDelete/save_map_with_primary.exp.json | 8 +- .../d2oracle/TestDelete/shape_class.exp.json | 8 +- .../TestDelete/shape_sql_table.exp.json | 24 +- .../TestDelete/singular_flat_style.exp.json | 8 +- .../TestDelete/singular_map_style.exp.json | 8 +- .../d2oracle/TestDelete/table_refs.exp.json | 10 +- .../underscore_no_conflict.exp.json | 16 +- .../TestDelete/underscore_remove.exp.json | 32 +- testdata/d2oracle/TestDelete/width.exp.json | 8 +- .../TestMove/append_multiple_styles.exp.json | 12 +- testdata/d2oracle/TestMove/basic.exp.json | 8 +- .../d2oracle/TestMove/basic_nested.exp.json | 12 +- .../TestMove/basic_out_of_container.exp.json | 12 +- .../TestMove/between_containers.exp.json | 16 +- .../TestMove/chain_connected_nested.exp.json | 24 +- ..._connected_nested_no_extra_create.exp.json | 28 +- .../TestMove/connected_nested.exp.json | 20 +- .../container_conflicts_generated.exp.json | 20 +- ...ner_multiple_refs_with_underscore.exp.json | 12 +- .../d2oracle/TestMove/container_near.exp.json | 28 +- testdata/d2oracle/TestMove/duplicate.exp.json | 12 +- .../TestMove/duplicate_generated.exp.json | 32 +- .../TestMove/edge_across_containers.exp.json | 24 +- .../d2oracle/TestMove/edge_basic.exp.json | 16 +- .../TestMove/edge_chain_basic.exp.json | 24 +- .../TestMove/edge_chain_circular.exp.json | 24 +- .../edge_chain_into_container.exp.json | 28 +- .../edge_chain_out_container.exp.json | 28 +- .../d2oracle/TestMove/edge_conflict.exp.json | 28 +- .../TestMove/edge_into_container.exp.json | 24 +- .../TestMove/edge_nested_basic.exp.json | 20 +- .../TestMove/edge_out_of_container.exp.json | 20 +- .../d2oracle/TestMove/extend_map.exp.json | 20 +- .../TestMove/extend_stationary_path.exp.json | 16 +- .../TestMove/flat_between_containers.exp.json | 16 +- .../d2oracle/TestMove/flat_merge.exp.json | 20 +- .../TestMove/flat_middle_container.exp.json | 20 +- .../TestMove/flat_nested_merge.exp.json | 44 +- .../flat_nested_merge_multiple_refs.exp.json | 36 +- .../flat_reparent_with_map_value.exp.json | 12 +- ...lat_reparent_with_mixed_map_value.exp.json | 16 +- .../flat_reparent_with_value.exp.json | 12 +- .../d2oracle/TestMove/flat_style.exp.json | 12 +- .../TestMove/full_edge_slice.exp.json | 28 +- .../d2oracle/TestMove/full_slice.exp.json | 16 +- testdata/d2oracle/TestMove/gnarly_1.exp.json | 64 +- .../hoist_container_children.exp.json | 20 +- .../into_container_existing_map.exp.json | 16 +- .../into_container_nonexisting_map.exp.json | 12 +- .../into_container_with_flat_keys.exp.json | 12 +- .../into_container_with_flat_style.exp.json | 12 +- .../d2oracle/TestMove/map_transplant.exp.json | 20 +- .../d2oracle/TestMove/map_with_label.exp.json | 16 +- .../TestMove/merge_nested_maps.exp.json | 36 +- .../d2oracle/TestMove/merge_reserved.exp.json | 28 +- .../TestMove/middle_container.exp.json | 16 +- ...ddle_container_generated_conflict.exp.json | 36 +- .../TestMove/move_container_children.exp.json | 24 +- .../move_container_conflict_children.exp.json | 24 +- .../move_into_key_with_value.exp.json | 12 +- .../TestMove/move_out_of_edge.exp.json | 32 +- .../TestMove/move_out_of_nested_edge.exp.json | 32 +- .../TestMove/multiple_nesting_levels.exp.json | 32 +- testdata/d2oracle/TestMove/near.exp.json | 16 +- .../nested-underscore-move-out.exp.json | 16 +- .../d2oracle/TestMove/nhooyr_one.exp.json | 20 +- .../d2oracle/TestMove/nhooyr_two.exp.json | 32 +- .../out_of_newline_container.exp.json | 12 +- .../d2oracle/TestMove/parentheses.exp.json | 20 +- .../TestMove/partial_edge_slice.exp.json | 20 +- .../d2oracle/TestMove/partial_slice.exp.json | 12 +- testdata/d2oracle/TestMove/rename_2.exp.json | 24 +- testdata/d2oracle/TestMove/reuse_map.exp.json | 24 +- .../d2oracle/TestMove/slice_style.exp.json | 12 +- .../TestMove/underscore-connection.exp.json | 24 +- .../TestMove/underscore_children.exp.json | 12 +- .../underscore_edge_children.exp.json | 20 +- .../underscore_edge_container_1.exp.json | 20 +- .../underscore_edge_container_2.exp.json | 20 +- .../underscore_edge_container_3.exp.json | 20 +- .../underscore_edge_container_4.exp.json | 20 +- .../underscore_edge_container_5.exp.json | 20 +- .../TestMove/underscore_edge_split.exp.json | 28 +- .../TestMove/underscore_merge.exp.json | 16 +- .../TestMove/underscore_split.exp.json | 20 +- .../TestMove/underscore_split_out.exp.json | 24 +- .../TestMove/underscore_transplant.exp.json | 16 +- .../d2oracle/TestMove/unique_name.exp.json | 20 +- .../unique_name_with_references.exp.json | 28 +- testdata/d2oracle/TestRename/arrows.exp.json | 16 +- .../d2oracle/TestRename/arrows_chain.exp.json | 32 +- .../TestRename/arrows_complex.exp.json | 24 +- .../TestRename/arrows_trim_common.exp.json | 36 +- .../TestRename/arrows_trim_common_2.exp.json | 36 +- .../TestRename/complex_edge_1.exp.json | 24 +- .../TestRename/complex_edge_2.exp.json | 24 +- .../d2oracle/TestRename/conflict.exp.json | 12 +- .../d2oracle/TestRename/conflict_2.exp.json | 24 +- .../TestRename/conflict_with_dots.exp.json | 12 +- .../TestRename/conflict_with_numbers.exp.json | 12 +- .../d2oracle/TestRename/container.exp.json | 96 ++- testdata/d2oracle/TestRename/edges.exp.json | 60 +- testdata/d2oracle/TestRename/flat.exp.json | 8 +- .../d2oracle/TestRename/generated.exp.json | 8 +- testdata/d2oracle/TestRename/near.exp.json | 12 +- testdata/d2oracle/TestRename/nested.exp.json | 24 +- testdata/d2oracle/TestSet/base.exp.json | 8 +- .../TestSet/block_string_multiline.exp.json | 8 +- .../TestSet/block_string_oneline.exp.json | 8 +- .../d2oracle/TestSet/classes-style.exp.json | 8 +- .../TestSet/dupe-classes-style.exp.json | 8 +- testdata/d2oracle/TestSet/edge.exp.json | 16 +- .../TestSet/edge_append_style.exp.json | 16 +- testdata/d2oracle/TestSet/edge_chain.exp.json | 28 +- .../TestSet/edge_chain_append_style.exp.json | 24 +- .../edge_chain_existing_style.exp.json | 24 +- .../TestSet/edge_chain_nested_set.exp.json | 28 +- .../edge_flat_merge_arrowhead.exp.json | 28 +- .../d2oracle/TestSet/edge_index_case.exp.json | 36 +- .../TestSet/edge_index_merge_style.exp.json | 24 +- .../TestSet/edge_index_nested.exp.json | 20 +- .../TestSet/edge_key_and_key.exp.json | 20 +- testdata/d2oracle/TestSet/edge_label.exp.json | 16 +- .../TestSet/edge_merge_arrowhead.exp.json | 20 +- .../TestSet/edge_merge_style.exp.json | 16 +- .../TestSet/edge_nested_label_set.exp.json | 20 +- .../TestSet/edge_nested_style_set.exp.json | 20 +- .../TestSet/edge_replace_arrowhead.exp.json | 20 +- .../edge_replace_arrowhead_indexed.exp.json | 20 +- .../TestSet/edge_set_arrowhead.exp.json | 20 +- .../TestSet/expanded_map_style.exp.json | 8 +- testdata/d2oracle/TestSet/icon.exp.json | 8 +- .../d2oracle/TestSet/inline_style.exp.json | 8 +- testdata/d2oracle/TestSet/label.exp.json | 8 +- .../d2oracle/TestSet/label_primary.exp.json | 20 +- .../d2oracle/TestSet/label_replace.exp.json | 8 +- .../d2oracle/TestSet/label_unset.exp.json | 8 +- .../d2oracle/TestSet/map_key_missing.exp.json | 16 +- .../d2oracle/TestSet/nested_alex.exp.json | 20 +- testdata/d2oracle/TestSet/new_style.exp.json | 8 +- .../TestSet/replace_arrowhead.exp.json | 20 +- .../TestSet/replace_arrowhead_map.exp.json | 20 +- .../TestSet/replace_dimensions.exp.json | 8 +- .../TestSet/replace_edge_style.exp.json | 16 +- .../TestSet/replace_edge_style_map.exp.json | 16 +- .../TestSet/replace_fill_pattern.exp.json | 8 +- .../d2oracle/TestSet/replace_link.exp.json | 8 +- .../TestSet/replace_position.exp.json | 8 +- .../d2oracle/TestSet/replace_shape.exp.json | 8 +- .../d2oracle/TestSet/replace_style.exp.json | 8 +- .../TestSet/replace_style_edgecase.exp.json | 8 +- .../d2oracle/TestSet/replace_tooltip.exp.json | 8 +- .../d2oracle/TestSet/set_dimensions.exp.json | 8 +- .../TestSet/set_fill_pattern.exp.json | 8 +- .../d2oracle/TestSet/set_position.exp.json | 8 +- .../d2oracle/TestSet/set_tooltip.exp.json | 8 +- testdata/d2oracle/TestSet/shape.exp.json | 8 +- .../TestSet/shape_nested_style_set.exp.json | 8 +- .../unapplied-classes-style-2.exp.json | 8 +- .../TestSet/unapplied-classes-style.exp.json | 8 +- 440 files changed, 10273 insertions(+), 7401 deletions(-) create mode 100644 test.d2 create mode 100644 test.png create mode 100644 test.svg delete mode 100644 testdata/d2compiler/TestCompile/sql-constraints.exp.json diff --git a/d2renderers/d2sketch/testdata/class_and_sqlTable_border_radius/sketch.exp.svg b/d2renderers/d2sketch/testdata/class_and_sqlTable_border_radius/sketch.exp.svg index edb1a93a6..3b7ed9ae0 100644 --- a/d2renderers/d2sketch/testdata/class_and_sqlTable_border_radius/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/class_and_sqlTable_border_radius/sketch.exp.svg @@ -1,16 +1,16 @@ - + .d2-2363156786 .fill-N1{fill:#0A0F25;} + .d2-2363156786 .fill-N2{fill:#676C7E;} + .d2-2363156786 .fill-N3{fill:#9499AB;} + .d2-2363156786 .fill-N4{fill:#CFD2DD;} + .d2-2363156786 .fill-N5{fill:#DEE1EB;} + .d2-2363156786 .fill-N6{fill:#EEF1F8;} + .d2-2363156786 .fill-N7{fill:#FFFFFF;} + .d2-2363156786 .fill-B1{fill:#0D32B2;} + .d2-2363156786 .fill-B2{fill:#0D32B2;} + .d2-2363156786 .fill-B3{fill:#E3E9FD;} + .d2-2363156786 .fill-B4{fill:#E3E9FD;} + .d2-2363156786 .fill-B5{fill:#EDF0FD;} + .d2-2363156786 .fill-B6{fill:#F7F8FE;} + .d2-2363156786 .fill-AA2{fill:#4A6FF3;} + .d2-2363156786 .fill-AA4{fill:#EDF0FD;} + .d2-2363156786 .fill-AA5{fill:#F7F8FE;} + .d2-2363156786 .fill-AB4{fill:#EDF0FD;} + .d2-2363156786 .fill-AB5{fill:#F7F8FE;} + .d2-2363156786 .stroke-N1{stroke:#0A0F25;} + .d2-2363156786 .stroke-N2{stroke:#676C7E;} + .d2-2363156786 .stroke-N3{stroke:#9499AB;} + .d2-2363156786 .stroke-N4{stroke:#CFD2DD;} + .d2-2363156786 .stroke-N5{stroke:#DEE1EB;} + .d2-2363156786 .stroke-N6{stroke:#EEF1F8;} + .d2-2363156786 .stroke-N7{stroke:#FFFFFF;} + .d2-2363156786 .stroke-B1{stroke:#0D32B2;} + .d2-2363156786 .stroke-B2{stroke:#0D32B2;} + .d2-2363156786 .stroke-B3{stroke:#E3E9FD;} + .d2-2363156786 .stroke-B4{stroke:#E3E9FD;} + .d2-2363156786 .stroke-B5{stroke:#EDF0FD;} + .d2-2363156786 .stroke-B6{stroke:#F7F8FE;} + .d2-2363156786 .stroke-AA2{stroke:#4A6FF3;} + .d2-2363156786 .stroke-AA4{stroke:#EDF0FD;} + .d2-2363156786 .stroke-AA5{stroke:#F7F8FE;} + .d2-2363156786 .stroke-AB4{stroke:#EDF0FD;} + .d2-2363156786 .stroke-AB5{stroke:#F7F8FE;} + .d2-2363156786 .background-color-N1{background-color:#0A0F25;} + .d2-2363156786 .background-color-N2{background-color:#676C7E;} + .d2-2363156786 .background-color-N3{background-color:#9499AB;} + .d2-2363156786 .background-color-N4{background-color:#CFD2DD;} + .d2-2363156786 .background-color-N5{background-color:#DEE1EB;} + .d2-2363156786 .background-color-N6{background-color:#EEF1F8;} + .d2-2363156786 .background-color-N7{background-color:#FFFFFF;} + .d2-2363156786 .background-color-B1{background-color:#0D32B2;} + .d2-2363156786 .background-color-B2{background-color:#0D32B2;} + .d2-2363156786 .background-color-B3{background-color:#E3E9FD;} + .d2-2363156786 .background-color-B4{background-color:#E3E9FD;} + .d2-2363156786 .background-color-B5{background-color:#EDF0FD;} + .d2-2363156786 .background-color-B6{background-color:#F7F8FE;} + .d2-2363156786 .background-color-AA2{background-color:#4A6FF3;} + .d2-2363156786 .background-color-AA4{background-color:#EDF0FD;} + .d2-2363156786 .background-color-AA5{background-color:#F7F8FE;} + .d2-2363156786 .background-color-AB4{background-color:#EDF0FD;} + .d2-2363156786 .background-color-AB5{background-color:#F7F8FE;} + .d2-2363156786 .color-N1{color:#0A0F25;} + .d2-2363156786 .color-N2{color:#676C7E;} + .d2-2363156786 .color-N3{color:#9499AB;} + .d2-2363156786 .color-N4{color:#CFD2DD;} + .d2-2363156786 .color-N5{color:#DEE1EB;} + .d2-2363156786 .color-N6{color:#EEF1F8;} + .d2-2363156786 .color-N7{color:#FFFFFF;} + .d2-2363156786 .color-B1{color:#0D32B2;} + .d2-2363156786 .color-B2{color:#0D32B2;} + .d2-2363156786 .color-B3{color:#E3E9FD;} + .d2-2363156786 .color-B4{color:#E3E9FD;} + .d2-2363156786 .color-B5{color:#EDF0FD;} + .d2-2363156786 .color-B6{color:#F7F8FE;} + .d2-2363156786 .color-AA2{color:#4A6FF3;} + .d2-2363156786 .color-AA4{color:#EDF0FD;} + .d2-2363156786 .color-AA5{color:#F7F8FE;} + .d2-2363156786 .color-AB4{color:#EDF0FD;} + .d2-2363156786 .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}]]> @@ -112,7 +112,7 @@ -aidintPKdiskintFKjsonjsonbUNQlast_updatedtimestamp with time zoneb+field[]string+method(a uint64)(x, y int)cd +aidintPKdiskintFKjsonjsonbUNQlast_updatedtimestamp with time zoneb+field[]string+method(a uint64)(x, y int)cd \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/opacity/sketch.exp.svg b/d2renderers/d2sketch/testdata/opacity/sketch.exp.svg index 58e63f5d4..673f5d04e 100644 --- a/d2renderers/d2sketch/testdata/opacity/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/opacity/sketch.exp.svg @@ -1,27 +1,27 @@ - @@ -852,7 +852,7 @@ x

linux: because a PC is a terrible thing to waste

-
auserslast_logindatetime You don't have to know how the computer works,just how to work the computer. +
auserslast_logindatetime You don't have to know how the computer works,just how to work the computer. \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/opacity_dark/sketch.exp.svg b/d2renderers/d2sketch/testdata/opacity_dark/sketch.exp.svg index 78a74ab1c..69d3809cd 100644 --- a/d2renderers/d2sketch/testdata/opacity_dark/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/opacity_dark/sketch.exp.svg @@ -1,27 +1,27 @@ - @@ -850,7 +850,7 @@ x

linux: because a PC is a terrible thing to waste

-
auserslast_logindatetime You don't have to know how the computer works,just how to work the computer. +
auserslast_logindatetime You don't have to know how the computer works,just how to work the computer. \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/sql_tables/sketch.exp.svg b/d2renderers/d2sketch/testdata/sql_tables/sketch.exp.svg index e403c60d9..85c566b37 100644 --- a/d2renderers/d2sketch/testdata/sql_tables/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/sql_tables/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-3566570178 .fill-N1{fill:#0A0F25;} + .d2-3566570178 .fill-N2{fill:#676C7E;} + .d2-3566570178 .fill-N3{fill:#9499AB;} + .d2-3566570178 .fill-N4{fill:#CFD2DD;} + .d2-3566570178 .fill-N5{fill:#DEE1EB;} + .d2-3566570178 .fill-N6{fill:#EEF1F8;} + .d2-3566570178 .fill-N7{fill:#FFFFFF;} + .d2-3566570178 .fill-B1{fill:#0D32B2;} + .d2-3566570178 .fill-B2{fill:#0D32B2;} + .d2-3566570178 .fill-B3{fill:#E3E9FD;} + .d2-3566570178 .fill-B4{fill:#E3E9FD;} + .d2-3566570178 .fill-B5{fill:#EDF0FD;} + .d2-3566570178 .fill-B6{fill:#F7F8FE;} + .d2-3566570178 .fill-AA2{fill:#4A6FF3;} + .d2-3566570178 .fill-AA4{fill:#EDF0FD;} + .d2-3566570178 .fill-AA5{fill:#F7F8FE;} + .d2-3566570178 .fill-AB4{fill:#EDF0FD;} + .d2-3566570178 .fill-AB5{fill:#F7F8FE;} + .d2-3566570178 .stroke-N1{stroke:#0A0F25;} + .d2-3566570178 .stroke-N2{stroke:#676C7E;} + .d2-3566570178 .stroke-N3{stroke:#9499AB;} + .d2-3566570178 .stroke-N4{stroke:#CFD2DD;} + .d2-3566570178 .stroke-N5{stroke:#DEE1EB;} + .d2-3566570178 .stroke-N6{stroke:#EEF1F8;} + .d2-3566570178 .stroke-N7{stroke:#FFFFFF;} + .d2-3566570178 .stroke-B1{stroke:#0D32B2;} + .d2-3566570178 .stroke-B2{stroke:#0D32B2;} + .d2-3566570178 .stroke-B3{stroke:#E3E9FD;} + .d2-3566570178 .stroke-B4{stroke:#E3E9FD;} + .d2-3566570178 .stroke-B5{stroke:#EDF0FD;} + .d2-3566570178 .stroke-B6{stroke:#F7F8FE;} + .d2-3566570178 .stroke-AA2{stroke:#4A6FF3;} + .d2-3566570178 .stroke-AA4{stroke:#EDF0FD;} + .d2-3566570178 .stroke-AA5{stroke:#F7F8FE;} + .d2-3566570178 .stroke-AB4{stroke:#EDF0FD;} + .d2-3566570178 .stroke-AB5{stroke:#F7F8FE;} + .d2-3566570178 .background-color-N1{background-color:#0A0F25;} + .d2-3566570178 .background-color-N2{background-color:#676C7E;} + .d2-3566570178 .background-color-N3{background-color:#9499AB;} + .d2-3566570178 .background-color-N4{background-color:#CFD2DD;} + .d2-3566570178 .background-color-N5{background-color:#DEE1EB;} + .d2-3566570178 .background-color-N6{background-color:#EEF1F8;} + .d2-3566570178 .background-color-N7{background-color:#FFFFFF;} + .d2-3566570178 .background-color-B1{background-color:#0D32B2;} + .d2-3566570178 .background-color-B2{background-color:#0D32B2;} + .d2-3566570178 .background-color-B3{background-color:#E3E9FD;} + .d2-3566570178 .background-color-B4{background-color:#E3E9FD;} + .d2-3566570178 .background-color-B5{background-color:#EDF0FD;} + .d2-3566570178 .background-color-B6{background-color:#F7F8FE;} + .d2-3566570178 .background-color-AA2{background-color:#4A6FF3;} + .d2-3566570178 .background-color-AA4{background-color:#EDF0FD;} + .d2-3566570178 .background-color-AA5{background-color:#F7F8FE;} + .d2-3566570178 .background-color-AB4{background-color:#EDF0FD;} + .d2-3566570178 .background-color-AB5{background-color:#F7F8FE;} + .d2-3566570178 .color-N1{color:#0A0F25;} + .d2-3566570178 .color-N2{color:#676C7E;} + .d2-3566570178 .color-N3{color:#9499AB;} + .d2-3566570178 .color-N4{color:#CFD2DD;} + .d2-3566570178 .color-N5{color:#DEE1EB;} + .d2-3566570178 .color-N6{color:#EEF1F8;} + .d2-3566570178 .color-N7{color:#FFFFFF;} + .d2-3566570178 .color-B1{color:#0D32B2;} + .d2-3566570178 .color-B2{color:#0D32B2;} + .d2-3566570178 .color-B3{color:#E3E9FD;} + .d2-3566570178 .color-B4{color:#E3E9FD;} + .d2-3566570178 .color-B5{color:#EDF0FD;} + .d2-3566570178 .color-B6{color:#F7F8FE;} + .d2-3566570178 .color-AA2{color:#4A6FF3;} + .d2-3566570178 .color-AA4{color:#EDF0FD;} + .d2-3566570178 .color-AA5{color:#F7F8FE;} + .d2-3566570178 .color-AB4{color:#EDF0FD;} + .d2-3566570178 .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}]]> @@ -97,7 +97,7 @@ -usersidintnamestringemailstringpasswordstringlast_logindatetimeproductsidintpricedecimalskustringnamestringordersidintuser_idintproduct_idintshipmentsidintorder_idinttracking_numberstringPKstatusstring +usersidintnamestringemailstringpasswordstringlast_logindatetimeproductsidintpricedecimalskustringnamestringordersidintuser_idintproduct_idintshipmentsidintorder_idinttracking_numberstringPKstatusstring \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/sql_tables_dark/sketch.exp.svg b/d2renderers/d2sketch/testdata/sql_tables_dark/sketch.exp.svg index d49db6427..4b933e55a 100644 --- a/d2renderers/d2sketch/testdata/sql_tables_dark/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/sql_tables_dark/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-3566570178 .fill-N1{fill:#CDD6F4;} + .d2-3566570178 .fill-N2{fill:#BAC2DE;} + .d2-3566570178 .fill-N3{fill:#A6ADC8;} + .d2-3566570178 .fill-N4{fill:#585B70;} + .d2-3566570178 .fill-N5{fill:#45475A;} + .d2-3566570178 .fill-N6{fill:#313244;} + .d2-3566570178 .fill-N7{fill:#1E1E2E;} + .d2-3566570178 .fill-B1{fill:#CBA6f7;} + .d2-3566570178 .fill-B2{fill:#CBA6f7;} + .d2-3566570178 .fill-B3{fill:#6C7086;} + .d2-3566570178 .fill-B4{fill:#585B70;} + .d2-3566570178 .fill-B5{fill:#45475A;} + .d2-3566570178 .fill-B6{fill:#313244;} + .d2-3566570178 .fill-AA2{fill:#f38BA8;} + .d2-3566570178 .fill-AA4{fill:#45475A;} + .d2-3566570178 .fill-AA5{fill:#313244;} + .d2-3566570178 .fill-AB4{fill:#45475A;} + .d2-3566570178 .fill-AB5{fill:#313244;} + .d2-3566570178 .stroke-N1{stroke:#CDD6F4;} + .d2-3566570178 .stroke-N2{stroke:#BAC2DE;} + .d2-3566570178 .stroke-N3{stroke:#A6ADC8;} + .d2-3566570178 .stroke-N4{stroke:#585B70;} + .d2-3566570178 .stroke-N5{stroke:#45475A;} + .d2-3566570178 .stroke-N6{stroke:#313244;} + .d2-3566570178 .stroke-N7{stroke:#1E1E2E;} + .d2-3566570178 .stroke-B1{stroke:#CBA6f7;} + .d2-3566570178 .stroke-B2{stroke:#CBA6f7;} + .d2-3566570178 .stroke-B3{stroke:#6C7086;} + .d2-3566570178 .stroke-B4{stroke:#585B70;} + .d2-3566570178 .stroke-B5{stroke:#45475A;} + .d2-3566570178 .stroke-B6{stroke:#313244;} + .d2-3566570178 .stroke-AA2{stroke:#f38BA8;} + .d2-3566570178 .stroke-AA4{stroke:#45475A;} + .d2-3566570178 .stroke-AA5{stroke:#313244;} + .d2-3566570178 .stroke-AB4{stroke:#45475A;} + .d2-3566570178 .stroke-AB5{stroke:#313244;} + .d2-3566570178 .background-color-N1{background-color:#CDD6F4;} + .d2-3566570178 .background-color-N2{background-color:#BAC2DE;} + .d2-3566570178 .background-color-N3{background-color:#A6ADC8;} + .d2-3566570178 .background-color-N4{background-color:#585B70;} + .d2-3566570178 .background-color-N5{background-color:#45475A;} + .d2-3566570178 .background-color-N6{background-color:#313244;} + .d2-3566570178 .background-color-N7{background-color:#1E1E2E;} + .d2-3566570178 .background-color-B1{background-color:#CBA6f7;} + .d2-3566570178 .background-color-B2{background-color:#CBA6f7;} + .d2-3566570178 .background-color-B3{background-color:#6C7086;} + .d2-3566570178 .background-color-B4{background-color:#585B70;} + .d2-3566570178 .background-color-B5{background-color:#45475A;} + .d2-3566570178 .background-color-B6{background-color:#313244;} + .d2-3566570178 .background-color-AA2{background-color:#f38BA8;} + .d2-3566570178 .background-color-AA4{background-color:#45475A;} + .d2-3566570178 .background-color-AA5{background-color:#313244;} + .d2-3566570178 .background-color-AB4{background-color:#45475A;} + .d2-3566570178 .background-color-AB5{background-color:#313244;} + .d2-3566570178 .color-N1{color:#CDD6F4;} + .d2-3566570178 .color-N2{color:#BAC2DE;} + .d2-3566570178 .color-N3{color:#A6ADC8;} + .d2-3566570178 .color-N4{color:#585B70;} + .d2-3566570178 .color-N5{color:#45475A;} + .d2-3566570178 .color-N6{color:#313244;} + .d2-3566570178 .color-N7{color:#1E1E2E;} + .d2-3566570178 .color-B1{color:#CBA6f7;} + .d2-3566570178 .color-B2{color:#CBA6f7;} + .d2-3566570178 .color-B3{color:#6C7086;} + .d2-3566570178 .color-B4{color:#585B70;} + .d2-3566570178 .color-B5{color:#45475A;} + .d2-3566570178 .color-B6{color:#313244;} + .d2-3566570178 .color-AA2{color:#f38BA8;} + .d2-3566570178 .color-AA4{color:#45475A;} + .d2-3566570178 .color-AA5{color:#313244;} + .d2-3566570178 .color-AB4{color:#45475A;} + .d2-3566570178 .color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker);mix-blend-mode:lighten}.light-code{display: none}.dark-code{display: block}]]> -usersidintnamestringemailstringpasswordstringlast_logindatetimeproductsidintpricedecimalskustringnamestringordersidintuser_idintproduct_idintshipmentsidintorder_idinttracking_numberstringPKstatusstring +usersidintnamestringemailstringpasswordstringlast_logindatetimeproductsidintpricedecimalskustringnamestringordersidintuser_idintproduct_idintshipmentsidintorder_idinttracking_numberstringPKstatusstring \ No newline at end of file diff --git a/d2renderers/d2svg/dark_theme/testdata/opacity/dark_theme.exp.svg b/d2renderers/d2svg/dark_theme/testdata/opacity/dark_theme.exp.svg index 7259a474a..de6dc7cde 100644 --- a/d2renderers/d2svg/dark_theme/testdata/opacity/dark_theme.exp.svg +++ b/d2renderers/d2svg/dark_theme/testdata/opacity/dark_theme.exp.svg @@ -1,27 +1,27 @@ -x

linux: because a PC is a terrible thing to waste

-
auserslast_logindatetime You don't have to know how the computer works,just how to work the computer. +
auserslast_logindatetime You don't have to know how the computer works,just how to work the computer. \ No newline at end of file diff --git a/d2renderers/d2svg/dark_theme/testdata/sql_tables/dark_theme.exp.svg b/d2renderers/d2svg/dark_theme/testdata/sql_tables/dark_theme.exp.svg index 9016809d3..39797d3ee 100644 --- a/d2renderers/d2svg/dark_theme/testdata/sql_tables/dark_theme.exp.svg +++ b/d2renderers/d2svg/dark_theme/testdata/sql_tables/dark_theme.exp.svg @@ -1,9 +1,9 @@ -usersidintnamestringemailstringpasswordstringlast_logindatetimeproductsidintpricedecimalskustringnamestringordersidintuser_idintproduct_idintshipmentsidintorder_idinttracking_numberstringPKstatusstring + .d2-3566570178 .fill-N1{fill:#CDD6F4;} + .d2-3566570178 .fill-N2{fill:#BAC2DE;} + .d2-3566570178 .fill-N3{fill:#A6ADC8;} + .d2-3566570178 .fill-N4{fill:#585B70;} + .d2-3566570178 .fill-N5{fill:#45475A;} + .d2-3566570178 .fill-N6{fill:#313244;} + .d2-3566570178 .fill-N7{fill:#1E1E2E;} + .d2-3566570178 .fill-B1{fill:#CBA6f7;} + .d2-3566570178 .fill-B2{fill:#CBA6f7;} + .d2-3566570178 .fill-B3{fill:#6C7086;} + .d2-3566570178 .fill-B4{fill:#585B70;} + .d2-3566570178 .fill-B5{fill:#45475A;} + .d2-3566570178 .fill-B6{fill:#313244;} + .d2-3566570178 .fill-AA2{fill:#f38BA8;} + .d2-3566570178 .fill-AA4{fill:#45475A;} + .d2-3566570178 .fill-AA5{fill:#313244;} + .d2-3566570178 .fill-AB4{fill:#45475A;} + .d2-3566570178 .fill-AB5{fill:#313244;} + .d2-3566570178 .stroke-N1{stroke:#CDD6F4;} + .d2-3566570178 .stroke-N2{stroke:#BAC2DE;} + .d2-3566570178 .stroke-N3{stroke:#A6ADC8;} + .d2-3566570178 .stroke-N4{stroke:#585B70;} + .d2-3566570178 .stroke-N5{stroke:#45475A;} + .d2-3566570178 .stroke-N6{stroke:#313244;} + .d2-3566570178 .stroke-N7{stroke:#1E1E2E;} + .d2-3566570178 .stroke-B1{stroke:#CBA6f7;} + .d2-3566570178 .stroke-B2{stroke:#CBA6f7;} + .d2-3566570178 .stroke-B3{stroke:#6C7086;} + .d2-3566570178 .stroke-B4{stroke:#585B70;} + .d2-3566570178 .stroke-B5{stroke:#45475A;} + .d2-3566570178 .stroke-B6{stroke:#313244;} + .d2-3566570178 .stroke-AA2{stroke:#f38BA8;} + .d2-3566570178 .stroke-AA4{stroke:#45475A;} + .d2-3566570178 .stroke-AA5{stroke:#313244;} + .d2-3566570178 .stroke-AB4{stroke:#45475A;} + .d2-3566570178 .stroke-AB5{stroke:#313244;} + .d2-3566570178 .background-color-N1{background-color:#CDD6F4;} + .d2-3566570178 .background-color-N2{background-color:#BAC2DE;} + .d2-3566570178 .background-color-N3{background-color:#A6ADC8;} + .d2-3566570178 .background-color-N4{background-color:#585B70;} + .d2-3566570178 .background-color-N5{background-color:#45475A;} + .d2-3566570178 .background-color-N6{background-color:#313244;} + .d2-3566570178 .background-color-N7{background-color:#1E1E2E;} + .d2-3566570178 .background-color-B1{background-color:#CBA6f7;} + .d2-3566570178 .background-color-B2{background-color:#CBA6f7;} + .d2-3566570178 .background-color-B3{background-color:#6C7086;} + .d2-3566570178 .background-color-B4{background-color:#585B70;} + .d2-3566570178 .background-color-B5{background-color:#45475A;} + .d2-3566570178 .background-color-B6{background-color:#313244;} + .d2-3566570178 .background-color-AA2{background-color:#f38BA8;} + .d2-3566570178 .background-color-AA4{background-color:#45475A;} + .d2-3566570178 .background-color-AA5{background-color:#313244;} + .d2-3566570178 .background-color-AB4{background-color:#45475A;} + .d2-3566570178 .background-color-AB5{background-color:#313244;} + .d2-3566570178 .color-N1{color:#CDD6F4;} + .d2-3566570178 .color-N2{color:#BAC2DE;} + .d2-3566570178 .color-N3{color:#A6ADC8;} + .d2-3566570178 .color-N4{color:#585B70;} + .d2-3566570178 .color-N5{color:#45475A;} + .d2-3566570178 .color-N6{color:#313244;} + .d2-3566570178 .color-N7{color:#1E1E2E;} + .d2-3566570178 .color-B1{color:#CBA6f7;} + .d2-3566570178 .color-B2{color:#CBA6f7;} + .d2-3566570178 .color-B3{color:#6C7086;} + .d2-3566570178 .color-B4{color:#585B70;} + .d2-3566570178 .color-B5{color:#45475A;} + .d2-3566570178 .color-B6{color:#313244;} + .d2-3566570178 .color-AA2{color:#f38BA8;} + .d2-3566570178 .color-AA4{color:#45475A;} + .d2-3566570178 .color-AA5{color:#313244;} + .d2-3566570178 .color-AB4{color:#45475A;} + .d2-3566570178 .color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker);mix-blend-mode:lighten}.light-code{display: none}.dark-code{display: block}]]>usersidintnamestringemailstringpasswordstringlast_logindatetimeproductsidintpricedecimalskustringnamestringordersidintuser_idintproduct_idintshipmentsidintorder_idinttracking_numberstringPKstatusstring \ No newline at end of file diff --git a/e2etests-cli/testdata/TestCLI_E2E/internal_linked_pdf.exp.pdf b/e2etests-cli/testdata/TestCLI_E2E/internal_linked_pdf.exp.pdf index 1308362ad1e2d2c9f1d997963cb23391c640719b..f9cb8c74eb1959df0a27e92b9049dfe8d96b7813 100644 GIT binary patch delta 70 zcmezQf#v51mWC~it|rsVOc)KOJDV^XPG4ricv;oN$iUFR)XdmilS|(>KgA`nBvnDf T#mdOQ$k+fbw|$-|<83AYQW+Iu delta 70 zcmezQf#v51mWC~it|rsVO&Im3JDV^XOKgA`nBvnDf T#mdOQ$k+fbw|$-|<83AYQZyA| diff --git a/e2etests/testdata/patterns/real-lines/dagre/board.exp.json b/e2etests/testdata/patterns/real-lines/dagre/board.exp.json index e3df67344..0999249c0 100644 --- a/e2etests/testdata/patterns/real-lines/dagre/board.exp.json +++ b/e2etests/testdata/patterns/real-lines/dagre/board.exp.json @@ -222,9 +222,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": [ - "primary_key" - ], + "constraint": "primary_key", "reference": "" }, { @@ -252,7 +250,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -280,7 +278,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -308,7 +306,7 @@ "labelWidth": 91, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" } ], @@ -381,9 +379,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": [ - "primary_key" - ], + "constraint": "primary_key", "reference": "" }, { @@ -411,7 +407,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -439,7 +435,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -467,7 +463,7 @@ "labelWidth": 91, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" } ], diff --git a/e2etests/testdata/patterns/real-lines/dagre/sketch.exp.svg b/e2etests/testdata/patterns/real-lines/dagre/sketch.exp.svg index dbaed70da..68ca35418 100644 --- a/e2etests/testdata/patterns/real-lines/dagre/sketch.exp.svg +++ b/e2etests/testdata/patterns/real-lines/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ -RefreshAuthorizationPolicyProtocolServerSideTranslatorProtocolBufferRefreshAuthorizationPolicyCacheRefreshAuthorizationPolicyCacheok + .d2-2693736715 .fill-N1{fill:#0A0F25;} + .d2-2693736715 .fill-N2{fill:#676C7E;} + .d2-2693736715 .fill-N3{fill:#9499AB;} + .d2-2693736715 .fill-N4{fill:#CFD2DD;} + .d2-2693736715 .fill-N5{fill:#DEE1EB;} + .d2-2693736715 .fill-N6{fill:#EEF1F8;} + .d2-2693736715 .fill-N7{fill:#FFFFFF;} + .d2-2693736715 .fill-B1{fill:#0D32B2;} + .d2-2693736715 .fill-B2{fill:#0D32B2;} + .d2-2693736715 .fill-B3{fill:#E3E9FD;} + .d2-2693736715 .fill-B4{fill:#E3E9FD;} + .d2-2693736715 .fill-B5{fill:#EDF0FD;} + .d2-2693736715 .fill-B6{fill:#F7F8FE;} + .d2-2693736715 .fill-AA2{fill:#4A6FF3;} + .d2-2693736715 .fill-AA4{fill:#EDF0FD;} + .d2-2693736715 .fill-AA5{fill:#F7F8FE;} + .d2-2693736715 .fill-AB4{fill:#EDF0FD;} + .d2-2693736715 .fill-AB5{fill:#F7F8FE;} + .d2-2693736715 .stroke-N1{stroke:#0A0F25;} + .d2-2693736715 .stroke-N2{stroke:#676C7E;} + .d2-2693736715 .stroke-N3{stroke:#9499AB;} + .d2-2693736715 .stroke-N4{stroke:#CFD2DD;} + .d2-2693736715 .stroke-N5{stroke:#DEE1EB;} + .d2-2693736715 .stroke-N6{stroke:#EEF1F8;} + .d2-2693736715 .stroke-N7{stroke:#FFFFFF;} + .d2-2693736715 .stroke-B1{stroke:#0D32B2;} + .d2-2693736715 .stroke-B2{stroke:#0D32B2;} + .d2-2693736715 .stroke-B3{stroke:#E3E9FD;} + .d2-2693736715 .stroke-B4{stroke:#E3E9FD;} + .d2-2693736715 .stroke-B5{stroke:#EDF0FD;} + .d2-2693736715 .stroke-B6{stroke:#F7F8FE;} + .d2-2693736715 .stroke-AA2{stroke:#4A6FF3;} + .d2-2693736715 .stroke-AA4{stroke:#EDF0FD;} + .d2-2693736715 .stroke-AA5{stroke:#F7F8FE;} + .d2-2693736715 .stroke-AB4{stroke:#EDF0FD;} + .d2-2693736715 .stroke-AB5{stroke:#F7F8FE;} + .d2-2693736715 .background-color-N1{background-color:#0A0F25;} + .d2-2693736715 .background-color-N2{background-color:#676C7E;} + .d2-2693736715 .background-color-N3{background-color:#9499AB;} + .d2-2693736715 .background-color-N4{background-color:#CFD2DD;} + .d2-2693736715 .background-color-N5{background-color:#DEE1EB;} + .d2-2693736715 .background-color-N6{background-color:#EEF1F8;} + .d2-2693736715 .background-color-N7{background-color:#FFFFFF;} + .d2-2693736715 .background-color-B1{background-color:#0D32B2;} + .d2-2693736715 .background-color-B2{background-color:#0D32B2;} + .d2-2693736715 .background-color-B3{background-color:#E3E9FD;} + .d2-2693736715 .background-color-B4{background-color:#E3E9FD;} + .d2-2693736715 .background-color-B5{background-color:#EDF0FD;} + .d2-2693736715 .background-color-B6{background-color:#F7F8FE;} + .d2-2693736715 .background-color-AA2{background-color:#4A6FF3;} + .d2-2693736715 .background-color-AA4{background-color:#EDF0FD;} + .d2-2693736715 .background-color-AA5{background-color:#F7F8FE;} + .d2-2693736715 .background-color-AB4{background-color:#EDF0FD;} + .d2-2693736715 .background-color-AB5{background-color:#F7F8FE;} + .d2-2693736715 .color-N1{color:#0A0F25;} + .d2-2693736715 .color-N2{color:#676C7E;} + .d2-2693736715 .color-N3{color:#9499AB;} + .d2-2693736715 .color-N4{color:#CFD2DD;} + .d2-2693736715 .color-N5{color:#DEE1EB;} + .d2-2693736715 .color-N6{color:#EEF1F8;} + .d2-2693736715 .color-N7{color:#FFFFFF;} + .d2-2693736715 .color-B1{color:#0D32B2;} + .d2-2693736715 .color-B2{color:#0D32B2;} + .d2-2693736715 .color-B3{color:#E3E9FD;} + .d2-2693736715 .color-B4{color:#E3E9FD;} + .d2-2693736715 .color-B5{color:#EDF0FD;} + .d2-2693736715 .color-B6{color:#F7F8FE;} + .d2-2693736715 .color-AA2{color:#4A6FF3;} + .d2-2693736715 .color-AA4{color:#EDF0FD;} + .d2-2693736715 .color-AA5{color:#F7F8FE;} + .d2-2693736715 .color-AB4{color:#EDF0FD;} + .d2-2693736715 .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}]]>RefreshAuthorizationPolicyProtocolServerSideTranslatorProtocolBufferRefreshAuthorizationPolicyCacheRefreshAuthorizationPolicyCacheok \ No newline at end of file diff --git a/e2etests/testdata/regression/only_header_class_table/elk/board.exp.json b/e2etests/testdata/regression/only_header_class_table/elk/board.exp.json index 978739f12..d30ca4428 100644 --- a/e2etests/testdata/regression/only_header_class_table/elk/board.exp.json +++ b/e2etests/testdata/regression/only_header_class_table/elk/board.exp.json @@ -141,7 +141,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": null, + "constraint": "", "reference": "" } ], diff --git a/e2etests/testdata/regression/only_header_class_table/elk/sketch.exp.svg b/e2etests/testdata/regression/only_header_class_table/elk/sketch.exp.svg index dc59f1ece..85939bdfc 100644 --- a/e2etests/testdata/regression/only_header_class_table/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/only_header_class_table/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -RefreshAuthorizationPolicyProtocolServerSideTranslatorProtocolBufferRefreshAuthorizationPolicyCacheRefreshAuthorizationPolicyCacheok + .d2-3532718440 .fill-N1{fill:#0A0F25;} + .d2-3532718440 .fill-N2{fill:#676C7E;} + .d2-3532718440 .fill-N3{fill:#9499AB;} + .d2-3532718440 .fill-N4{fill:#CFD2DD;} + .d2-3532718440 .fill-N5{fill:#DEE1EB;} + .d2-3532718440 .fill-N6{fill:#EEF1F8;} + .d2-3532718440 .fill-N7{fill:#FFFFFF;} + .d2-3532718440 .fill-B1{fill:#0D32B2;} + .d2-3532718440 .fill-B2{fill:#0D32B2;} + .d2-3532718440 .fill-B3{fill:#E3E9FD;} + .d2-3532718440 .fill-B4{fill:#E3E9FD;} + .d2-3532718440 .fill-B5{fill:#EDF0FD;} + .d2-3532718440 .fill-B6{fill:#F7F8FE;} + .d2-3532718440 .fill-AA2{fill:#4A6FF3;} + .d2-3532718440 .fill-AA4{fill:#EDF0FD;} + .d2-3532718440 .fill-AA5{fill:#F7F8FE;} + .d2-3532718440 .fill-AB4{fill:#EDF0FD;} + .d2-3532718440 .fill-AB5{fill:#F7F8FE;} + .d2-3532718440 .stroke-N1{stroke:#0A0F25;} + .d2-3532718440 .stroke-N2{stroke:#676C7E;} + .d2-3532718440 .stroke-N3{stroke:#9499AB;} + .d2-3532718440 .stroke-N4{stroke:#CFD2DD;} + .d2-3532718440 .stroke-N5{stroke:#DEE1EB;} + .d2-3532718440 .stroke-N6{stroke:#EEF1F8;} + .d2-3532718440 .stroke-N7{stroke:#FFFFFF;} + .d2-3532718440 .stroke-B1{stroke:#0D32B2;} + .d2-3532718440 .stroke-B2{stroke:#0D32B2;} + .d2-3532718440 .stroke-B3{stroke:#E3E9FD;} + .d2-3532718440 .stroke-B4{stroke:#E3E9FD;} + .d2-3532718440 .stroke-B5{stroke:#EDF0FD;} + .d2-3532718440 .stroke-B6{stroke:#F7F8FE;} + .d2-3532718440 .stroke-AA2{stroke:#4A6FF3;} + .d2-3532718440 .stroke-AA4{stroke:#EDF0FD;} + .d2-3532718440 .stroke-AA5{stroke:#F7F8FE;} + .d2-3532718440 .stroke-AB4{stroke:#EDF0FD;} + .d2-3532718440 .stroke-AB5{stroke:#F7F8FE;} + .d2-3532718440 .background-color-N1{background-color:#0A0F25;} + .d2-3532718440 .background-color-N2{background-color:#676C7E;} + .d2-3532718440 .background-color-N3{background-color:#9499AB;} + .d2-3532718440 .background-color-N4{background-color:#CFD2DD;} + .d2-3532718440 .background-color-N5{background-color:#DEE1EB;} + .d2-3532718440 .background-color-N6{background-color:#EEF1F8;} + .d2-3532718440 .background-color-N7{background-color:#FFFFFF;} + .d2-3532718440 .background-color-B1{background-color:#0D32B2;} + .d2-3532718440 .background-color-B2{background-color:#0D32B2;} + .d2-3532718440 .background-color-B3{background-color:#E3E9FD;} + .d2-3532718440 .background-color-B4{background-color:#E3E9FD;} + .d2-3532718440 .background-color-B5{background-color:#EDF0FD;} + .d2-3532718440 .background-color-B6{background-color:#F7F8FE;} + .d2-3532718440 .background-color-AA2{background-color:#4A6FF3;} + .d2-3532718440 .background-color-AA4{background-color:#EDF0FD;} + .d2-3532718440 .background-color-AA5{background-color:#F7F8FE;} + .d2-3532718440 .background-color-AB4{background-color:#EDF0FD;} + .d2-3532718440 .background-color-AB5{background-color:#F7F8FE;} + .d2-3532718440 .color-N1{color:#0A0F25;} + .d2-3532718440 .color-N2{color:#676C7E;} + .d2-3532718440 .color-N3{color:#9499AB;} + .d2-3532718440 .color-N4{color:#CFD2DD;} + .d2-3532718440 .color-N5{color:#DEE1EB;} + .d2-3532718440 .color-N6{color:#EEF1F8;} + .d2-3532718440 .color-N7{color:#FFFFFF;} + .d2-3532718440 .color-B1{color:#0D32B2;} + .d2-3532718440 .color-B2{color:#0D32B2;} + .d2-3532718440 .color-B3{color:#E3E9FD;} + .d2-3532718440 .color-B4{color:#E3E9FD;} + .d2-3532718440 .color-B5{color:#EDF0FD;} + .d2-3532718440 .color-B6{color:#F7F8FE;} + .d2-3532718440 .color-AA2{color:#4A6FF3;} + .d2-3532718440 .color-AA4{color:#EDF0FD;} + .d2-3532718440 .color-AA5{color:#F7F8FE;} + .d2-3532718440 .color-AB4{color:#EDF0FD;} + .d2-3532718440 .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}]]>RefreshAuthorizationPolicyProtocolServerSideTranslatorProtocolBufferRefreshAuthorizationPolicyCacheRefreshAuthorizationPolicyCacheok \ No newline at end of file diff --git a/e2etests/testdata/regression/sql_table_overflow/dagre/board.exp.json b/e2etests/testdata/regression/sql_table_overflow/dagre/board.exp.json index 937116c15..4433d76ae 100644 --- a/e2etests/testdata/regression/sql_table_overflow/dagre/board.exp.json +++ b/e2etests/testdata/regression/sql_table_overflow/dagre/board.exp.json @@ -55,7 +55,7 @@ "labelWidth": 242, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -83,7 +83,7 @@ "labelWidth": 45, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" } ], @@ -155,9 +155,7 @@ "labelWidth": 242, "labelHeight": 26 }, - "constraint": [ - "unique" - ], + "constraint": "unique", "reference": "" }, { @@ -185,9 +183,7 @@ "labelWidth": 45, "labelHeight": 26 }, - "constraint": [ - "foreign_key" - ], + "constraint": "foreign_key", "reference": "" } ], diff --git a/e2etests/testdata/regression/sql_table_overflow/dagre/sketch.exp.svg b/e2etests/testdata/regression/sql_table_overflow/dagre/sketch.exp.svg index 6504e9f42..abfa1f184 100644 --- a/e2etests/testdata/regression/sql_table_overflow/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/sql_table_overflow/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -sql_table_overflowshortloooooooooooooooooooongloooooooooooooooooooongshortsql_table_constrained_overflowshortloooooooooooooooooooongUNQloooooooooooooooooooongshortFK + .d2-1114961276 .fill-N1{fill:#0A0F25;} + .d2-1114961276 .fill-N2{fill:#676C7E;} + .d2-1114961276 .fill-N3{fill:#9499AB;} + .d2-1114961276 .fill-N4{fill:#CFD2DD;} + .d2-1114961276 .fill-N5{fill:#DEE1EB;} + .d2-1114961276 .fill-N6{fill:#EEF1F8;} + .d2-1114961276 .fill-N7{fill:#FFFFFF;} + .d2-1114961276 .fill-B1{fill:#0D32B2;} + .d2-1114961276 .fill-B2{fill:#0D32B2;} + .d2-1114961276 .fill-B3{fill:#E3E9FD;} + .d2-1114961276 .fill-B4{fill:#E3E9FD;} + .d2-1114961276 .fill-B5{fill:#EDF0FD;} + .d2-1114961276 .fill-B6{fill:#F7F8FE;} + .d2-1114961276 .fill-AA2{fill:#4A6FF3;} + .d2-1114961276 .fill-AA4{fill:#EDF0FD;} + .d2-1114961276 .fill-AA5{fill:#F7F8FE;} + .d2-1114961276 .fill-AB4{fill:#EDF0FD;} + .d2-1114961276 .fill-AB5{fill:#F7F8FE;} + .d2-1114961276 .stroke-N1{stroke:#0A0F25;} + .d2-1114961276 .stroke-N2{stroke:#676C7E;} + .d2-1114961276 .stroke-N3{stroke:#9499AB;} + .d2-1114961276 .stroke-N4{stroke:#CFD2DD;} + .d2-1114961276 .stroke-N5{stroke:#DEE1EB;} + .d2-1114961276 .stroke-N6{stroke:#EEF1F8;} + .d2-1114961276 .stroke-N7{stroke:#FFFFFF;} + .d2-1114961276 .stroke-B1{stroke:#0D32B2;} + .d2-1114961276 .stroke-B2{stroke:#0D32B2;} + .d2-1114961276 .stroke-B3{stroke:#E3E9FD;} + .d2-1114961276 .stroke-B4{stroke:#E3E9FD;} + .d2-1114961276 .stroke-B5{stroke:#EDF0FD;} + .d2-1114961276 .stroke-B6{stroke:#F7F8FE;} + .d2-1114961276 .stroke-AA2{stroke:#4A6FF3;} + .d2-1114961276 .stroke-AA4{stroke:#EDF0FD;} + .d2-1114961276 .stroke-AA5{stroke:#F7F8FE;} + .d2-1114961276 .stroke-AB4{stroke:#EDF0FD;} + .d2-1114961276 .stroke-AB5{stroke:#F7F8FE;} + .d2-1114961276 .background-color-N1{background-color:#0A0F25;} + .d2-1114961276 .background-color-N2{background-color:#676C7E;} + .d2-1114961276 .background-color-N3{background-color:#9499AB;} + .d2-1114961276 .background-color-N4{background-color:#CFD2DD;} + .d2-1114961276 .background-color-N5{background-color:#DEE1EB;} + .d2-1114961276 .background-color-N6{background-color:#EEF1F8;} + .d2-1114961276 .background-color-N7{background-color:#FFFFFF;} + .d2-1114961276 .background-color-B1{background-color:#0D32B2;} + .d2-1114961276 .background-color-B2{background-color:#0D32B2;} + .d2-1114961276 .background-color-B3{background-color:#E3E9FD;} + .d2-1114961276 .background-color-B4{background-color:#E3E9FD;} + .d2-1114961276 .background-color-B5{background-color:#EDF0FD;} + .d2-1114961276 .background-color-B6{background-color:#F7F8FE;} + .d2-1114961276 .background-color-AA2{background-color:#4A6FF3;} + .d2-1114961276 .background-color-AA4{background-color:#EDF0FD;} + .d2-1114961276 .background-color-AA5{background-color:#F7F8FE;} + .d2-1114961276 .background-color-AB4{background-color:#EDF0FD;} + .d2-1114961276 .background-color-AB5{background-color:#F7F8FE;} + .d2-1114961276 .color-N1{color:#0A0F25;} + .d2-1114961276 .color-N2{color:#676C7E;} + .d2-1114961276 .color-N3{color:#9499AB;} + .d2-1114961276 .color-N4{color:#CFD2DD;} + .d2-1114961276 .color-N5{color:#DEE1EB;} + .d2-1114961276 .color-N6{color:#EEF1F8;} + .d2-1114961276 .color-N7{color:#FFFFFF;} + .d2-1114961276 .color-B1{color:#0D32B2;} + .d2-1114961276 .color-B2{color:#0D32B2;} + .d2-1114961276 .color-B3{color:#E3E9FD;} + .d2-1114961276 .color-B4{color:#E3E9FD;} + .d2-1114961276 .color-B5{color:#EDF0FD;} + .d2-1114961276 .color-B6{color:#F7F8FE;} + .d2-1114961276 .color-AA2{color:#4A6FF3;} + .d2-1114961276 .color-AA4{color:#EDF0FD;} + .d2-1114961276 .color-AA5{color:#F7F8FE;} + .d2-1114961276 .color-AB4{color:#EDF0FD;} + .d2-1114961276 .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}]]>sql_table_overflowshortloooooooooooooooooooongloooooooooooooooooooongshortsql_table_constrained_overflowshortloooooooooooooooooooongUNQloooooooooooooooooooongshortFK \ No newline at end of file diff --git a/e2etests/testdata/regression/sql_table_overflow/elk/board.exp.json b/e2etests/testdata/regression/sql_table_overflow/elk/board.exp.json index c4ddc7c1b..b68be23ec 100644 --- a/e2etests/testdata/regression/sql_table_overflow/elk/board.exp.json +++ b/e2etests/testdata/regression/sql_table_overflow/elk/board.exp.json @@ -55,7 +55,7 @@ "labelWidth": 242, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -83,7 +83,7 @@ "labelWidth": 45, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" } ], @@ -155,9 +155,7 @@ "labelWidth": 242, "labelHeight": 26 }, - "constraint": [ - "unique" - ], + "constraint": "unique", "reference": "" }, { @@ -185,9 +183,7 @@ "labelWidth": 45, "labelHeight": 26 }, - "constraint": [ - "foreign_key" - ], + "constraint": "foreign_key", "reference": "" } ], diff --git a/e2etests/testdata/regression/sql_table_overflow/elk/sketch.exp.svg b/e2etests/testdata/regression/sql_table_overflow/elk/sketch.exp.svg index 1cd74f696..e1a13f471 100644 --- a/e2etests/testdata/regression/sql_table_overflow/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/sql_table_overflow/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -sql_table_overflowshortloooooooooooooooooooongloooooooooooooooooooongshortsql_table_constrained_overflowshortloooooooooooooooooooongUNQloooooooooooooooooooongshortFK + .d2-2685206526 .fill-N1{fill:#0A0F25;} + .d2-2685206526 .fill-N2{fill:#676C7E;} + .d2-2685206526 .fill-N3{fill:#9499AB;} + .d2-2685206526 .fill-N4{fill:#CFD2DD;} + .d2-2685206526 .fill-N5{fill:#DEE1EB;} + .d2-2685206526 .fill-N6{fill:#EEF1F8;} + .d2-2685206526 .fill-N7{fill:#FFFFFF;} + .d2-2685206526 .fill-B1{fill:#0D32B2;} + .d2-2685206526 .fill-B2{fill:#0D32B2;} + .d2-2685206526 .fill-B3{fill:#E3E9FD;} + .d2-2685206526 .fill-B4{fill:#E3E9FD;} + .d2-2685206526 .fill-B5{fill:#EDF0FD;} + .d2-2685206526 .fill-B6{fill:#F7F8FE;} + .d2-2685206526 .fill-AA2{fill:#4A6FF3;} + .d2-2685206526 .fill-AA4{fill:#EDF0FD;} + .d2-2685206526 .fill-AA5{fill:#F7F8FE;} + .d2-2685206526 .fill-AB4{fill:#EDF0FD;} + .d2-2685206526 .fill-AB5{fill:#F7F8FE;} + .d2-2685206526 .stroke-N1{stroke:#0A0F25;} + .d2-2685206526 .stroke-N2{stroke:#676C7E;} + .d2-2685206526 .stroke-N3{stroke:#9499AB;} + .d2-2685206526 .stroke-N4{stroke:#CFD2DD;} + .d2-2685206526 .stroke-N5{stroke:#DEE1EB;} + .d2-2685206526 .stroke-N6{stroke:#EEF1F8;} + .d2-2685206526 .stroke-N7{stroke:#FFFFFF;} + .d2-2685206526 .stroke-B1{stroke:#0D32B2;} + .d2-2685206526 .stroke-B2{stroke:#0D32B2;} + .d2-2685206526 .stroke-B3{stroke:#E3E9FD;} + .d2-2685206526 .stroke-B4{stroke:#E3E9FD;} + .d2-2685206526 .stroke-B5{stroke:#EDF0FD;} + .d2-2685206526 .stroke-B6{stroke:#F7F8FE;} + .d2-2685206526 .stroke-AA2{stroke:#4A6FF3;} + .d2-2685206526 .stroke-AA4{stroke:#EDF0FD;} + .d2-2685206526 .stroke-AA5{stroke:#F7F8FE;} + .d2-2685206526 .stroke-AB4{stroke:#EDF0FD;} + .d2-2685206526 .stroke-AB5{stroke:#F7F8FE;} + .d2-2685206526 .background-color-N1{background-color:#0A0F25;} + .d2-2685206526 .background-color-N2{background-color:#676C7E;} + .d2-2685206526 .background-color-N3{background-color:#9499AB;} + .d2-2685206526 .background-color-N4{background-color:#CFD2DD;} + .d2-2685206526 .background-color-N5{background-color:#DEE1EB;} + .d2-2685206526 .background-color-N6{background-color:#EEF1F8;} + .d2-2685206526 .background-color-N7{background-color:#FFFFFF;} + .d2-2685206526 .background-color-B1{background-color:#0D32B2;} + .d2-2685206526 .background-color-B2{background-color:#0D32B2;} + .d2-2685206526 .background-color-B3{background-color:#E3E9FD;} + .d2-2685206526 .background-color-B4{background-color:#E3E9FD;} + .d2-2685206526 .background-color-B5{background-color:#EDF0FD;} + .d2-2685206526 .background-color-B6{background-color:#F7F8FE;} + .d2-2685206526 .background-color-AA2{background-color:#4A6FF3;} + .d2-2685206526 .background-color-AA4{background-color:#EDF0FD;} + .d2-2685206526 .background-color-AA5{background-color:#F7F8FE;} + .d2-2685206526 .background-color-AB4{background-color:#EDF0FD;} + .d2-2685206526 .background-color-AB5{background-color:#F7F8FE;} + .d2-2685206526 .color-N1{color:#0A0F25;} + .d2-2685206526 .color-N2{color:#676C7E;} + .d2-2685206526 .color-N3{color:#9499AB;} + .d2-2685206526 .color-N4{color:#CFD2DD;} + .d2-2685206526 .color-N5{color:#DEE1EB;} + .d2-2685206526 .color-N6{color:#EEF1F8;} + .d2-2685206526 .color-N7{color:#FFFFFF;} + .d2-2685206526 .color-B1{color:#0D32B2;} + .d2-2685206526 .color-B2{color:#0D32B2;} + .d2-2685206526 .color-B3{color:#E3E9FD;} + .d2-2685206526 .color-B4{color:#E3E9FD;} + .d2-2685206526 .color-B5{color:#EDF0FD;} + .d2-2685206526 .color-B6{color:#F7F8FE;} + .d2-2685206526 .color-AA2{color:#4A6FF3;} + .d2-2685206526 .color-AA4{color:#EDF0FD;} + .d2-2685206526 .color-AA5{color:#F7F8FE;} + .d2-2685206526 .color-AB4{color:#EDF0FD;} + .d2-2685206526 .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}]]>sql_table_overflowshortloooooooooooooooooooongloooooooooooooooooooongshortsql_table_constrained_overflowshortloooooooooooooooooooongUNQloooooooooooooooooooongshortFK \ No newline at end of file diff --git a/e2etests/testdata/regression/unnamed_class_table_code/dagre/board.exp.json b/e2etests/testdata/regression/unnamed_class_table_code/dagre/board.exp.json index 1f783180d..74fa3cf47 100644 --- a/e2etests/testdata/regression/unnamed_class_table_code/dagre/board.exp.json +++ b/e2etests/testdata/regression/unnamed_class_table_code/dagre/board.exp.json @@ -130,7 +130,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -158,7 +158,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -186,7 +186,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -214,7 +214,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -242,7 +242,7 @@ "labelWidth": 77, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" } ], diff --git a/e2etests/testdata/regression/unnamed_class_table_code/dagre/sketch.exp.svg b/e2etests/testdata/regression/unnamed_class_table_code/dagre/sketch.exp.svg index b8f31fca0..6d7364667 100644 --- a/e2etests/testdata/regression/unnamed_class_table_code/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/unnamed_class_table_code/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ --numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetimea := 5 + .d2-3181700312 .fill-N1{fill:#0A0F25;} + .d2-3181700312 .fill-N2{fill:#676C7E;} + .d2-3181700312 .fill-N3{fill:#9499AB;} + .d2-3181700312 .fill-N4{fill:#CFD2DD;} + .d2-3181700312 .fill-N5{fill:#DEE1EB;} + .d2-3181700312 .fill-N6{fill:#EEF1F8;} + .d2-3181700312 .fill-N7{fill:#FFFFFF;} + .d2-3181700312 .fill-B1{fill:#0D32B2;} + .d2-3181700312 .fill-B2{fill:#0D32B2;} + .d2-3181700312 .fill-B3{fill:#E3E9FD;} + .d2-3181700312 .fill-B4{fill:#E3E9FD;} + .d2-3181700312 .fill-B5{fill:#EDF0FD;} + .d2-3181700312 .fill-B6{fill:#F7F8FE;} + .d2-3181700312 .fill-AA2{fill:#4A6FF3;} + .d2-3181700312 .fill-AA4{fill:#EDF0FD;} + .d2-3181700312 .fill-AA5{fill:#F7F8FE;} + .d2-3181700312 .fill-AB4{fill:#EDF0FD;} + .d2-3181700312 .fill-AB5{fill:#F7F8FE;} + .d2-3181700312 .stroke-N1{stroke:#0A0F25;} + .d2-3181700312 .stroke-N2{stroke:#676C7E;} + .d2-3181700312 .stroke-N3{stroke:#9499AB;} + .d2-3181700312 .stroke-N4{stroke:#CFD2DD;} + .d2-3181700312 .stroke-N5{stroke:#DEE1EB;} + .d2-3181700312 .stroke-N6{stroke:#EEF1F8;} + .d2-3181700312 .stroke-N7{stroke:#FFFFFF;} + .d2-3181700312 .stroke-B1{stroke:#0D32B2;} + .d2-3181700312 .stroke-B2{stroke:#0D32B2;} + .d2-3181700312 .stroke-B3{stroke:#E3E9FD;} + .d2-3181700312 .stroke-B4{stroke:#E3E9FD;} + .d2-3181700312 .stroke-B5{stroke:#EDF0FD;} + .d2-3181700312 .stroke-B6{stroke:#F7F8FE;} + .d2-3181700312 .stroke-AA2{stroke:#4A6FF3;} + .d2-3181700312 .stroke-AA4{stroke:#EDF0FD;} + .d2-3181700312 .stroke-AA5{stroke:#F7F8FE;} + .d2-3181700312 .stroke-AB4{stroke:#EDF0FD;} + .d2-3181700312 .stroke-AB5{stroke:#F7F8FE;} + .d2-3181700312 .background-color-N1{background-color:#0A0F25;} + .d2-3181700312 .background-color-N2{background-color:#676C7E;} + .d2-3181700312 .background-color-N3{background-color:#9499AB;} + .d2-3181700312 .background-color-N4{background-color:#CFD2DD;} + .d2-3181700312 .background-color-N5{background-color:#DEE1EB;} + .d2-3181700312 .background-color-N6{background-color:#EEF1F8;} + .d2-3181700312 .background-color-N7{background-color:#FFFFFF;} + .d2-3181700312 .background-color-B1{background-color:#0D32B2;} + .d2-3181700312 .background-color-B2{background-color:#0D32B2;} + .d2-3181700312 .background-color-B3{background-color:#E3E9FD;} + .d2-3181700312 .background-color-B4{background-color:#E3E9FD;} + .d2-3181700312 .background-color-B5{background-color:#EDF0FD;} + .d2-3181700312 .background-color-B6{background-color:#F7F8FE;} + .d2-3181700312 .background-color-AA2{background-color:#4A6FF3;} + .d2-3181700312 .background-color-AA4{background-color:#EDF0FD;} + .d2-3181700312 .background-color-AA5{background-color:#F7F8FE;} + .d2-3181700312 .background-color-AB4{background-color:#EDF0FD;} + .d2-3181700312 .background-color-AB5{background-color:#F7F8FE;} + .d2-3181700312 .color-N1{color:#0A0F25;} + .d2-3181700312 .color-N2{color:#676C7E;} + .d2-3181700312 .color-N3{color:#9499AB;} + .d2-3181700312 .color-N4{color:#CFD2DD;} + .d2-3181700312 .color-N5{color:#DEE1EB;} + .d2-3181700312 .color-N6{color:#EEF1F8;} + .d2-3181700312 .color-N7{color:#FFFFFF;} + .d2-3181700312 .color-B1{color:#0D32B2;} + .d2-3181700312 .color-B2{color:#0D32B2;} + .d2-3181700312 .color-B3{color:#E3E9FD;} + .d2-3181700312 .color-B4{color:#E3E9FD;} + .d2-3181700312 .color-B5{color:#EDF0FD;} + .d2-3181700312 .color-B6{color:#F7F8FE;} + .d2-3181700312 .color-AA2{color:#4A6FF3;} + .d2-3181700312 .color-AA4{color:#EDF0FD;} + .d2-3181700312 .color-AA5{color:#F7F8FE;} + .d2-3181700312 .color-AB4{color:#EDF0FD;} + .d2-3181700312 .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}]]>-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetimea := 5 b := a + 7 fmt.Printf("%d", b)a := 5 b := a + 7 -fmt.Printf("%d", b) +fmt.Printf("%d", b) \ No newline at end of file diff --git a/e2etests/testdata/regression/unnamed_class_table_code/elk/board.exp.json b/e2etests/testdata/regression/unnamed_class_table_code/elk/board.exp.json index 115ff55e5..377e5f144 100644 --- a/e2etests/testdata/regression/unnamed_class_table_code/elk/board.exp.json +++ b/e2etests/testdata/regression/unnamed_class_table_code/elk/board.exp.json @@ -130,7 +130,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -158,7 +158,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -186,7 +186,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -214,7 +214,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -242,7 +242,7 @@ "labelWidth": 77, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" } ], diff --git a/e2etests/testdata/regression/unnamed_class_table_code/elk/sketch.exp.svg b/e2etests/testdata/regression/unnamed_class_table_code/elk/sketch.exp.svg index 21eb65127..f7f7fff6c 100644 --- a/e2etests/testdata/regression/unnamed_class_table_code/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/unnamed_class_table_code/elk/sketch.exp.svg @@ -1,23 +1,23 @@ --numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetimea := 5 + .d2-4044170059 .fill-N1{fill:#0A0F25;} + .d2-4044170059 .fill-N2{fill:#676C7E;} + .d2-4044170059 .fill-N3{fill:#9499AB;} + .d2-4044170059 .fill-N4{fill:#CFD2DD;} + .d2-4044170059 .fill-N5{fill:#DEE1EB;} + .d2-4044170059 .fill-N6{fill:#EEF1F8;} + .d2-4044170059 .fill-N7{fill:#FFFFFF;} + .d2-4044170059 .fill-B1{fill:#0D32B2;} + .d2-4044170059 .fill-B2{fill:#0D32B2;} + .d2-4044170059 .fill-B3{fill:#E3E9FD;} + .d2-4044170059 .fill-B4{fill:#E3E9FD;} + .d2-4044170059 .fill-B5{fill:#EDF0FD;} + .d2-4044170059 .fill-B6{fill:#F7F8FE;} + .d2-4044170059 .fill-AA2{fill:#4A6FF3;} + .d2-4044170059 .fill-AA4{fill:#EDF0FD;} + .d2-4044170059 .fill-AA5{fill:#F7F8FE;} + .d2-4044170059 .fill-AB4{fill:#EDF0FD;} + .d2-4044170059 .fill-AB5{fill:#F7F8FE;} + .d2-4044170059 .stroke-N1{stroke:#0A0F25;} + .d2-4044170059 .stroke-N2{stroke:#676C7E;} + .d2-4044170059 .stroke-N3{stroke:#9499AB;} + .d2-4044170059 .stroke-N4{stroke:#CFD2DD;} + .d2-4044170059 .stroke-N5{stroke:#DEE1EB;} + .d2-4044170059 .stroke-N6{stroke:#EEF1F8;} + .d2-4044170059 .stroke-N7{stroke:#FFFFFF;} + .d2-4044170059 .stroke-B1{stroke:#0D32B2;} + .d2-4044170059 .stroke-B2{stroke:#0D32B2;} + .d2-4044170059 .stroke-B3{stroke:#E3E9FD;} + .d2-4044170059 .stroke-B4{stroke:#E3E9FD;} + .d2-4044170059 .stroke-B5{stroke:#EDF0FD;} + .d2-4044170059 .stroke-B6{stroke:#F7F8FE;} + .d2-4044170059 .stroke-AA2{stroke:#4A6FF3;} + .d2-4044170059 .stroke-AA4{stroke:#EDF0FD;} + .d2-4044170059 .stroke-AA5{stroke:#F7F8FE;} + .d2-4044170059 .stroke-AB4{stroke:#EDF0FD;} + .d2-4044170059 .stroke-AB5{stroke:#F7F8FE;} + .d2-4044170059 .background-color-N1{background-color:#0A0F25;} + .d2-4044170059 .background-color-N2{background-color:#676C7E;} + .d2-4044170059 .background-color-N3{background-color:#9499AB;} + .d2-4044170059 .background-color-N4{background-color:#CFD2DD;} + .d2-4044170059 .background-color-N5{background-color:#DEE1EB;} + .d2-4044170059 .background-color-N6{background-color:#EEF1F8;} + .d2-4044170059 .background-color-N7{background-color:#FFFFFF;} + .d2-4044170059 .background-color-B1{background-color:#0D32B2;} + .d2-4044170059 .background-color-B2{background-color:#0D32B2;} + .d2-4044170059 .background-color-B3{background-color:#E3E9FD;} + .d2-4044170059 .background-color-B4{background-color:#E3E9FD;} + .d2-4044170059 .background-color-B5{background-color:#EDF0FD;} + .d2-4044170059 .background-color-B6{background-color:#F7F8FE;} + .d2-4044170059 .background-color-AA2{background-color:#4A6FF3;} + .d2-4044170059 .background-color-AA4{background-color:#EDF0FD;} + .d2-4044170059 .background-color-AA5{background-color:#F7F8FE;} + .d2-4044170059 .background-color-AB4{background-color:#EDF0FD;} + .d2-4044170059 .background-color-AB5{background-color:#F7F8FE;} + .d2-4044170059 .color-N1{color:#0A0F25;} + .d2-4044170059 .color-N2{color:#676C7E;} + .d2-4044170059 .color-N3{color:#9499AB;} + .d2-4044170059 .color-N4{color:#CFD2DD;} + .d2-4044170059 .color-N5{color:#DEE1EB;} + .d2-4044170059 .color-N6{color:#EEF1F8;} + .d2-4044170059 .color-N7{color:#FFFFFF;} + .d2-4044170059 .color-B1{color:#0D32B2;} + .d2-4044170059 .color-B2{color:#0D32B2;} + .d2-4044170059 .color-B3{color:#E3E9FD;} + .d2-4044170059 .color-B4{color:#E3E9FD;} + .d2-4044170059 .color-B5{color:#EDF0FD;} + .d2-4044170059 .color-B6{color:#F7F8FE;} + .d2-4044170059 .color-AA2{color:#4A6FF3;} + .d2-4044170059 .color-AA4{color:#EDF0FD;} + .d2-4044170059 .color-AA5{color:#F7F8FE;} + .d2-4044170059 .color-AB4{color:#EDF0FD;} + .d2-4044170059 .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}]]>-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetimea := 5 b := a + 7 fmt.Printf("%d", b)a := 5 b := a + 7 -fmt.Printf("%d", b) +fmt.Printf("%d", b) \ No newline at end of file diff --git a/e2etests/testdata/stable/array-classes/dagre/board.exp.json b/e2etests/testdata/stable/array-classes/dagre/board.exp.json index ffb9d427e..b3149b051 100644 --- a/e2etests/testdata/stable/array-classes/dagre/board.exp.json +++ b/e2etests/testdata/stable/array-classes/dagre/board.exp.json @@ -6,10 +6,6 @@ { "id": "yay", "type": "rectangle", - "classes": [ - "button", - "success" - ], "pos": { "x": 0, "y": 0 @@ -51,10 +47,6 @@ { "id": "nay", "type": "rectangle", - "classes": [ - "button", - "error" - ], "pos": { "x": 180, "y": 0 diff --git a/e2etests/testdata/stable/array-classes/dagre/sketch.exp.svg b/e2etests/testdata/stable/array-classes/dagre/sketch.exp.svg index 345f0e650..e9f07e5c5 100644 --- a/e2etests/testdata/stable/array-classes/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/array-classes/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -SuccessfulFailure + .d2-640799908 .fill-N1{fill:#0A0F25;} + .d2-640799908 .fill-N2{fill:#676C7E;} + .d2-640799908 .fill-N3{fill:#9499AB;} + .d2-640799908 .fill-N4{fill:#CFD2DD;} + .d2-640799908 .fill-N5{fill:#DEE1EB;} + .d2-640799908 .fill-N6{fill:#EEF1F8;} + .d2-640799908 .fill-N7{fill:#FFFFFF;} + .d2-640799908 .fill-B1{fill:#0D32B2;} + .d2-640799908 .fill-B2{fill:#0D32B2;} + .d2-640799908 .fill-B3{fill:#E3E9FD;} + .d2-640799908 .fill-B4{fill:#E3E9FD;} + .d2-640799908 .fill-B5{fill:#EDF0FD;} + .d2-640799908 .fill-B6{fill:#F7F8FE;} + .d2-640799908 .fill-AA2{fill:#4A6FF3;} + .d2-640799908 .fill-AA4{fill:#EDF0FD;} + .d2-640799908 .fill-AA5{fill:#F7F8FE;} + .d2-640799908 .fill-AB4{fill:#EDF0FD;} + .d2-640799908 .fill-AB5{fill:#F7F8FE;} + .d2-640799908 .stroke-N1{stroke:#0A0F25;} + .d2-640799908 .stroke-N2{stroke:#676C7E;} + .d2-640799908 .stroke-N3{stroke:#9499AB;} + .d2-640799908 .stroke-N4{stroke:#CFD2DD;} + .d2-640799908 .stroke-N5{stroke:#DEE1EB;} + .d2-640799908 .stroke-N6{stroke:#EEF1F8;} + .d2-640799908 .stroke-N7{stroke:#FFFFFF;} + .d2-640799908 .stroke-B1{stroke:#0D32B2;} + .d2-640799908 .stroke-B2{stroke:#0D32B2;} + .d2-640799908 .stroke-B3{stroke:#E3E9FD;} + .d2-640799908 .stroke-B4{stroke:#E3E9FD;} + .d2-640799908 .stroke-B5{stroke:#EDF0FD;} + .d2-640799908 .stroke-B6{stroke:#F7F8FE;} + .d2-640799908 .stroke-AA2{stroke:#4A6FF3;} + .d2-640799908 .stroke-AA4{stroke:#EDF0FD;} + .d2-640799908 .stroke-AA5{stroke:#F7F8FE;} + .d2-640799908 .stroke-AB4{stroke:#EDF0FD;} + .d2-640799908 .stroke-AB5{stroke:#F7F8FE;} + .d2-640799908 .background-color-N1{background-color:#0A0F25;} + .d2-640799908 .background-color-N2{background-color:#676C7E;} + .d2-640799908 .background-color-N3{background-color:#9499AB;} + .d2-640799908 .background-color-N4{background-color:#CFD2DD;} + .d2-640799908 .background-color-N5{background-color:#DEE1EB;} + .d2-640799908 .background-color-N6{background-color:#EEF1F8;} + .d2-640799908 .background-color-N7{background-color:#FFFFFF;} + .d2-640799908 .background-color-B1{background-color:#0D32B2;} + .d2-640799908 .background-color-B2{background-color:#0D32B2;} + .d2-640799908 .background-color-B3{background-color:#E3E9FD;} + .d2-640799908 .background-color-B4{background-color:#E3E9FD;} + .d2-640799908 .background-color-B5{background-color:#EDF0FD;} + .d2-640799908 .background-color-B6{background-color:#F7F8FE;} + .d2-640799908 .background-color-AA2{background-color:#4A6FF3;} + .d2-640799908 .background-color-AA4{background-color:#EDF0FD;} + .d2-640799908 .background-color-AA5{background-color:#F7F8FE;} + .d2-640799908 .background-color-AB4{background-color:#EDF0FD;} + .d2-640799908 .background-color-AB5{background-color:#F7F8FE;} + .d2-640799908 .color-N1{color:#0A0F25;} + .d2-640799908 .color-N2{color:#676C7E;} + .d2-640799908 .color-N3{color:#9499AB;} + .d2-640799908 .color-N4{color:#CFD2DD;} + .d2-640799908 .color-N5{color:#DEE1EB;} + .d2-640799908 .color-N6{color:#EEF1F8;} + .d2-640799908 .color-N7{color:#FFFFFF;} + .d2-640799908 .color-B1{color:#0D32B2;} + .d2-640799908 .color-B2{color:#0D32B2;} + .d2-640799908 .color-B3{color:#E3E9FD;} + .d2-640799908 .color-B4{color:#E3E9FD;} + .d2-640799908 .color-B5{color:#EDF0FD;} + .d2-640799908 .color-B6{color:#F7F8FE;} + .d2-640799908 .color-AA2{color:#4A6FF3;} + .d2-640799908 .color-AA4{color:#EDF0FD;} + .d2-640799908 .color-AA5{color:#F7F8FE;} + .d2-640799908 .color-AB4{color:#EDF0FD;} + .d2-640799908 .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}]]>SuccessfulFailure \ No newline at end of file diff --git a/e2etests/testdata/stable/array-classes/elk/board.exp.json b/e2etests/testdata/stable/array-classes/elk/board.exp.json index 9d1326c7a..c1e181894 100644 --- a/e2etests/testdata/stable/array-classes/elk/board.exp.json +++ b/e2etests/testdata/stable/array-classes/elk/board.exp.json @@ -6,10 +6,6 @@ { "id": "yay", "type": "rectangle", - "classes": [ - "button", - "success" - ], "pos": { "x": 12, "y": 12 @@ -51,10 +47,6 @@ { "id": "nay", "type": "rectangle", - "classes": [ - "button", - "error" - ], "pos": { "x": 152, "y": 12 diff --git a/e2etests/testdata/stable/array-classes/elk/sketch.exp.svg b/e2etests/testdata/stable/array-classes/elk/sketch.exp.svg index deacb3872..939583be3 100644 --- a/e2etests/testdata/stable/array-classes/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/array-classes/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -SuccessfulFailure + .d2-1992029540 .fill-N1{fill:#0A0F25;} + .d2-1992029540 .fill-N2{fill:#676C7E;} + .d2-1992029540 .fill-N3{fill:#9499AB;} + .d2-1992029540 .fill-N4{fill:#CFD2DD;} + .d2-1992029540 .fill-N5{fill:#DEE1EB;} + .d2-1992029540 .fill-N6{fill:#EEF1F8;} + .d2-1992029540 .fill-N7{fill:#FFFFFF;} + .d2-1992029540 .fill-B1{fill:#0D32B2;} + .d2-1992029540 .fill-B2{fill:#0D32B2;} + .d2-1992029540 .fill-B3{fill:#E3E9FD;} + .d2-1992029540 .fill-B4{fill:#E3E9FD;} + .d2-1992029540 .fill-B5{fill:#EDF0FD;} + .d2-1992029540 .fill-B6{fill:#F7F8FE;} + .d2-1992029540 .fill-AA2{fill:#4A6FF3;} + .d2-1992029540 .fill-AA4{fill:#EDF0FD;} + .d2-1992029540 .fill-AA5{fill:#F7F8FE;} + .d2-1992029540 .fill-AB4{fill:#EDF0FD;} + .d2-1992029540 .fill-AB5{fill:#F7F8FE;} + .d2-1992029540 .stroke-N1{stroke:#0A0F25;} + .d2-1992029540 .stroke-N2{stroke:#676C7E;} + .d2-1992029540 .stroke-N3{stroke:#9499AB;} + .d2-1992029540 .stroke-N4{stroke:#CFD2DD;} + .d2-1992029540 .stroke-N5{stroke:#DEE1EB;} + .d2-1992029540 .stroke-N6{stroke:#EEF1F8;} + .d2-1992029540 .stroke-N7{stroke:#FFFFFF;} + .d2-1992029540 .stroke-B1{stroke:#0D32B2;} + .d2-1992029540 .stroke-B2{stroke:#0D32B2;} + .d2-1992029540 .stroke-B3{stroke:#E3E9FD;} + .d2-1992029540 .stroke-B4{stroke:#E3E9FD;} + .d2-1992029540 .stroke-B5{stroke:#EDF0FD;} + .d2-1992029540 .stroke-B6{stroke:#F7F8FE;} + .d2-1992029540 .stroke-AA2{stroke:#4A6FF3;} + .d2-1992029540 .stroke-AA4{stroke:#EDF0FD;} + .d2-1992029540 .stroke-AA5{stroke:#F7F8FE;} + .d2-1992029540 .stroke-AB4{stroke:#EDF0FD;} + .d2-1992029540 .stroke-AB5{stroke:#F7F8FE;} + .d2-1992029540 .background-color-N1{background-color:#0A0F25;} + .d2-1992029540 .background-color-N2{background-color:#676C7E;} + .d2-1992029540 .background-color-N3{background-color:#9499AB;} + .d2-1992029540 .background-color-N4{background-color:#CFD2DD;} + .d2-1992029540 .background-color-N5{background-color:#DEE1EB;} + .d2-1992029540 .background-color-N6{background-color:#EEF1F8;} + .d2-1992029540 .background-color-N7{background-color:#FFFFFF;} + .d2-1992029540 .background-color-B1{background-color:#0D32B2;} + .d2-1992029540 .background-color-B2{background-color:#0D32B2;} + .d2-1992029540 .background-color-B3{background-color:#E3E9FD;} + .d2-1992029540 .background-color-B4{background-color:#E3E9FD;} + .d2-1992029540 .background-color-B5{background-color:#EDF0FD;} + .d2-1992029540 .background-color-B6{background-color:#F7F8FE;} + .d2-1992029540 .background-color-AA2{background-color:#4A6FF3;} + .d2-1992029540 .background-color-AA4{background-color:#EDF0FD;} + .d2-1992029540 .background-color-AA5{background-color:#F7F8FE;} + .d2-1992029540 .background-color-AB4{background-color:#EDF0FD;} + .d2-1992029540 .background-color-AB5{background-color:#F7F8FE;} + .d2-1992029540 .color-N1{color:#0A0F25;} + .d2-1992029540 .color-N2{color:#676C7E;} + .d2-1992029540 .color-N3{color:#9499AB;} + .d2-1992029540 .color-N4{color:#CFD2DD;} + .d2-1992029540 .color-N5{color:#DEE1EB;} + .d2-1992029540 .color-N6{color:#EEF1F8;} + .d2-1992029540 .color-N7{color:#FFFFFF;} + .d2-1992029540 .color-B1{color:#0D32B2;} + .d2-1992029540 .color-B2{color:#0D32B2;} + .d2-1992029540 .color-B3{color:#E3E9FD;} + .d2-1992029540 .color-B4{color:#E3E9FD;} + .d2-1992029540 .color-B5{color:#EDF0FD;} + .d2-1992029540 .color-B6{color:#F7F8FE;} + .d2-1992029540 .color-AA2{color:#4A6FF3;} + .d2-1992029540 .color-AA4{color:#EDF0FD;} + .d2-1992029540 .color-AA5{color:#F7F8FE;} + .d2-1992029540 .color-AB4{color:#EDF0FD;} + .d2-1992029540 .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}]]>SuccessfulFailure \ No newline at end of file diff --git a/e2etests/testdata/stable/class_and_sqlTable_border_radius/dagre/board.exp.json b/e2etests/testdata/stable/class_and_sqlTable_border_radius/dagre/board.exp.json index 3d9ed2ba9..0836aabed 100644 --- a/e2etests/testdata/stable/class_and_sqlTable_border_radius/dagre/board.exp.json +++ b/e2etests/testdata/stable/class_and_sqlTable_border_radius/dagre/board.exp.json @@ -55,9 +55,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": [ - "primary_key" - ], + "constraint": "primary_key", "reference": "" }, { @@ -85,9 +83,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": [ - "foreign_key" - ], + "constraint": "foreign_key", "reference": "" }, { @@ -115,9 +111,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": [ - "unique" - ], + "constraint": "unique", "reference": "" }, { @@ -145,7 +139,7 @@ "labelWidth": 219, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" } ], diff --git a/e2etests/testdata/stable/class_and_sqlTable_border_radius/dagre/sketch.exp.svg b/e2etests/testdata/stable/class_and_sqlTable_border_radius/dagre/sketch.exp.svg index cae570d32..9ba6d5ad1 100644 --- a/e2etests/testdata/stable/class_and_sqlTable_border_radius/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/class_and_sqlTable_border_radius/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ - aidintPKdiskintFKjsonjsonbUNQlast_updatedtimestamp with time zone b+field[]string+method(a uint64)(x, y int) c d + .d2-4182820039 .fill-N1{fill:#0A0F25;} + .d2-4182820039 .fill-N2{fill:#676C7E;} + .d2-4182820039 .fill-N3{fill:#9499AB;} + .d2-4182820039 .fill-N4{fill:#CFD2DD;} + .d2-4182820039 .fill-N5{fill:#DEE1EB;} + .d2-4182820039 .fill-N6{fill:#EEF1F8;} + .d2-4182820039 .fill-N7{fill:#FFFFFF;} + .d2-4182820039 .fill-B1{fill:#0D32B2;} + .d2-4182820039 .fill-B2{fill:#0D32B2;} + .d2-4182820039 .fill-B3{fill:#E3E9FD;} + .d2-4182820039 .fill-B4{fill:#E3E9FD;} + .d2-4182820039 .fill-B5{fill:#EDF0FD;} + .d2-4182820039 .fill-B6{fill:#F7F8FE;} + .d2-4182820039 .fill-AA2{fill:#4A6FF3;} + .d2-4182820039 .fill-AA4{fill:#EDF0FD;} + .d2-4182820039 .fill-AA5{fill:#F7F8FE;} + .d2-4182820039 .fill-AB4{fill:#EDF0FD;} + .d2-4182820039 .fill-AB5{fill:#F7F8FE;} + .d2-4182820039 .stroke-N1{stroke:#0A0F25;} + .d2-4182820039 .stroke-N2{stroke:#676C7E;} + .d2-4182820039 .stroke-N3{stroke:#9499AB;} + .d2-4182820039 .stroke-N4{stroke:#CFD2DD;} + .d2-4182820039 .stroke-N5{stroke:#DEE1EB;} + .d2-4182820039 .stroke-N6{stroke:#EEF1F8;} + .d2-4182820039 .stroke-N7{stroke:#FFFFFF;} + .d2-4182820039 .stroke-B1{stroke:#0D32B2;} + .d2-4182820039 .stroke-B2{stroke:#0D32B2;} + .d2-4182820039 .stroke-B3{stroke:#E3E9FD;} + .d2-4182820039 .stroke-B4{stroke:#E3E9FD;} + .d2-4182820039 .stroke-B5{stroke:#EDF0FD;} + .d2-4182820039 .stroke-B6{stroke:#F7F8FE;} + .d2-4182820039 .stroke-AA2{stroke:#4A6FF3;} + .d2-4182820039 .stroke-AA4{stroke:#EDF0FD;} + .d2-4182820039 .stroke-AA5{stroke:#F7F8FE;} + .d2-4182820039 .stroke-AB4{stroke:#EDF0FD;} + .d2-4182820039 .stroke-AB5{stroke:#F7F8FE;} + .d2-4182820039 .background-color-N1{background-color:#0A0F25;} + .d2-4182820039 .background-color-N2{background-color:#676C7E;} + .d2-4182820039 .background-color-N3{background-color:#9499AB;} + .d2-4182820039 .background-color-N4{background-color:#CFD2DD;} + .d2-4182820039 .background-color-N5{background-color:#DEE1EB;} + .d2-4182820039 .background-color-N6{background-color:#EEF1F8;} + .d2-4182820039 .background-color-N7{background-color:#FFFFFF;} + .d2-4182820039 .background-color-B1{background-color:#0D32B2;} + .d2-4182820039 .background-color-B2{background-color:#0D32B2;} + .d2-4182820039 .background-color-B3{background-color:#E3E9FD;} + .d2-4182820039 .background-color-B4{background-color:#E3E9FD;} + .d2-4182820039 .background-color-B5{background-color:#EDF0FD;} + .d2-4182820039 .background-color-B6{background-color:#F7F8FE;} + .d2-4182820039 .background-color-AA2{background-color:#4A6FF3;} + .d2-4182820039 .background-color-AA4{background-color:#EDF0FD;} + .d2-4182820039 .background-color-AA5{background-color:#F7F8FE;} + .d2-4182820039 .background-color-AB4{background-color:#EDF0FD;} + .d2-4182820039 .background-color-AB5{background-color:#F7F8FE;} + .d2-4182820039 .color-N1{color:#0A0F25;} + .d2-4182820039 .color-N2{color:#676C7E;} + .d2-4182820039 .color-N3{color:#9499AB;} + .d2-4182820039 .color-N4{color:#CFD2DD;} + .d2-4182820039 .color-N5{color:#DEE1EB;} + .d2-4182820039 .color-N6{color:#EEF1F8;} + .d2-4182820039 .color-N7{color:#FFFFFF;} + .d2-4182820039 .color-B1{color:#0D32B2;} + .d2-4182820039 .color-B2{color:#0D32B2;} + .d2-4182820039 .color-B3{color:#E3E9FD;} + .d2-4182820039 .color-B4{color:#E3E9FD;} + .d2-4182820039 .color-B5{color:#EDF0FD;} + .d2-4182820039 .color-B6{color:#F7F8FE;} + .d2-4182820039 .color-AA2{color:#4A6FF3;} + .d2-4182820039 .color-AA4{color:#EDF0FD;} + .d2-4182820039 .color-AA5{color:#F7F8FE;} + .d2-4182820039 .color-AB4{color:#EDF0FD;} + .d2-4182820039 .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}]]> aidintPKdiskintFKjsonjsonbUNQlast_updatedtimestamp with time zone b+field[]string+method(a uint64)(x, y int) c d \ No newline at end of file diff --git a/e2etests/testdata/stable/class_and_sqlTable_border_radius/elk/board.exp.json b/e2etests/testdata/stable/class_and_sqlTable_border_radius/elk/board.exp.json index 1b5822a06..557561b09 100644 --- a/e2etests/testdata/stable/class_and_sqlTable_border_radius/elk/board.exp.json +++ b/e2etests/testdata/stable/class_and_sqlTable_border_radius/elk/board.exp.json @@ -55,9 +55,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": [ - "primary_key" - ], + "constraint": "primary_key", "reference": "" }, { @@ -85,9 +83,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": [ - "foreign_key" - ], + "constraint": "foreign_key", "reference": "" }, { @@ -115,9 +111,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": [ - "unique" - ], + "constraint": "unique", "reference": "" }, { @@ -145,7 +139,7 @@ "labelWidth": 219, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" } ], diff --git a/e2etests/testdata/stable/class_and_sqlTable_border_radius/elk/sketch.exp.svg b/e2etests/testdata/stable/class_and_sqlTable_border_radius/elk/sketch.exp.svg index a873cde20..52519382c 100644 --- a/e2etests/testdata/stable/class_and_sqlTable_border_radius/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/class_and_sqlTable_border_radius/elk/sketch.exp.svg @@ -1,16 +1,16 @@ - aidintPKdiskintFKjsonjsonbUNQlast_updatedtimestamp with time zone b+field[]string+method(a uint64)(x, y int) c d + .d2-1931800600 .fill-N1{fill:#0A0F25;} + .d2-1931800600 .fill-N2{fill:#676C7E;} + .d2-1931800600 .fill-N3{fill:#9499AB;} + .d2-1931800600 .fill-N4{fill:#CFD2DD;} + .d2-1931800600 .fill-N5{fill:#DEE1EB;} + .d2-1931800600 .fill-N6{fill:#EEF1F8;} + .d2-1931800600 .fill-N7{fill:#FFFFFF;} + .d2-1931800600 .fill-B1{fill:#0D32B2;} + .d2-1931800600 .fill-B2{fill:#0D32B2;} + .d2-1931800600 .fill-B3{fill:#E3E9FD;} + .d2-1931800600 .fill-B4{fill:#E3E9FD;} + .d2-1931800600 .fill-B5{fill:#EDF0FD;} + .d2-1931800600 .fill-B6{fill:#F7F8FE;} + .d2-1931800600 .fill-AA2{fill:#4A6FF3;} + .d2-1931800600 .fill-AA4{fill:#EDF0FD;} + .d2-1931800600 .fill-AA5{fill:#F7F8FE;} + .d2-1931800600 .fill-AB4{fill:#EDF0FD;} + .d2-1931800600 .fill-AB5{fill:#F7F8FE;} + .d2-1931800600 .stroke-N1{stroke:#0A0F25;} + .d2-1931800600 .stroke-N2{stroke:#676C7E;} + .d2-1931800600 .stroke-N3{stroke:#9499AB;} + .d2-1931800600 .stroke-N4{stroke:#CFD2DD;} + .d2-1931800600 .stroke-N5{stroke:#DEE1EB;} + .d2-1931800600 .stroke-N6{stroke:#EEF1F8;} + .d2-1931800600 .stroke-N7{stroke:#FFFFFF;} + .d2-1931800600 .stroke-B1{stroke:#0D32B2;} + .d2-1931800600 .stroke-B2{stroke:#0D32B2;} + .d2-1931800600 .stroke-B3{stroke:#E3E9FD;} + .d2-1931800600 .stroke-B4{stroke:#E3E9FD;} + .d2-1931800600 .stroke-B5{stroke:#EDF0FD;} + .d2-1931800600 .stroke-B6{stroke:#F7F8FE;} + .d2-1931800600 .stroke-AA2{stroke:#4A6FF3;} + .d2-1931800600 .stroke-AA4{stroke:#EDF0FD;} + .d2-1931800600 .stroke-AA5{stroke:#F7F8FE;} + .d2-1931800600 .stroke-AB4{stroke:#EDF0FD;} + .d2-1931800600 .stroke-AB5{stroke:#F7F8FE;} + .d2-1931800600 .background-color-N1{background-color:#0A0F25;} + .d2-1931800600 .background-color-N2{background-color:#676C7E;} + .d2-1931800600 .background-color-N3{background-color:#9499AB;} + .d2-1931800600 .background-color-N4{background-color:#CFD2DD;} + .d2-1931800600 .background-color-N5{background-color:#DEE1EB;} + .d2-1931800600 .background-color-N6{background-color:#EEF1F8;} + .d2-1931800600 .background-color-N7{background-color:#FFFFFF;} + .d2-1931800600 .background-color-B1{background-color:#0D32B2;} + .d2-1931800600 .background-color-B2{background-color:#0D32B2;} + .d2-1931800600 .background-color-B3{background-color:#E3E9FD;} + .d2-1931800600 .background-color-B4{background-color:#E3E9FD;} + .d2-1931800600 .background-color-B5{background-color:#EDF0FD;} + .d2-1931800600 .background-color-B6{background-color:#F7F8FE;} + .d2-1931800600 .background-color-AA2{background-color:#4A6FF3;} + .d2-1931800600 .background-color-AA4{background-color:#EDF0FD;} + .d2-1931800600 .background-color-AA5{background-color:#F7F8FE;} + .d2-1931800600 .background-color-AB4{background-color:#EDF0FD;} + .d2-1931800600 .background-color-AB5{background-color:#F7F8FE;} + .d2-1931800600 .color-N1{color:#0A0F25;} + .d2-1931800600 .color-N2{color:#676C7E;} + .d2-1931800600 .color-N3{color:#9499AB;} + .d2-1931800600 .color-N4{color:#CFD2DD;} + .d2-1931800600 .color-N5{color:#DEE1EB;} + .d2-1931800600 .color-N6{color:#EEF1F8;} + .d2-1931800600 .color-N7{color:#FFFFFF;} + .d2-1931800600 .color-B1{color:#0D32B2;} + .d2-1931800600 .color-B2{color:#0D32B2;} + .d2-1931800600 .color-B3{color:#E3E9FD;} + .d2-1931800600 .color-B4{color:#E3E9FD;} + .d2-1931800600 .color-B5{color:#EDF0FD;} + .d2-1931800600 .color-B6{color:#F7F8FE;} + .d2-1931800600 .color-AA2{color:#4A6FF3;} + .d2-1931800600 .color-AA4{color:#EDF0FD;} + .d2-1931800600 .color-AA5{color:#F7F8FE;} + .d2-1931800600 .color-AB4{color:#EDF0FD;} + .d2-1931800600 .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}]]> aidintPKdiskintFKjsonjsonbUNQlast_updatedtimestamp with time zone b+field[]string+method(a uint64)(x, y int) c d \ No newline at end of file diff --git a/e2etests/testdata/stable/ent2d2_basic/dagre/board.exp.json b/e2etests/testdata/stable/ent2d2_basic/dagre/board.exp.json index 304295ec3..b2ce90df8 100644 --- a/e2etests/testdata/stable/ent2d2_basic/dagre/board.exp.json +++ b/e2etests/testdata/stable/ent2d2_basic/dagre/board.exp.json @@ -55,9 +55,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": [ - "primary_key" - ], + "constraint": "primary_key", "reference": "" }, { @@ -85,9 +83,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": [ - "foreign_key" - ], + "constraint": "foreign_key", "reference": "" }, { @@ -115,9 +111,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": [ - "foreign_key" - ], + "constraint": "foreign_key", "reference": "" } ], @@ -189,9 +183,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": [ - "primary_key" - ], + "constraint": "primary_key", "reference": "" }, { @@ -219,9 +211,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": [ - "foreign_key" - ], + "constraint": "foreign_key", "reference": "" } ], @@ -293,9 +283,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": [ - "primary_key" - ], + "constraint": "primary_key", "reference": "" }, { @@ -323,9 +311,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": [ - "foreign_key" - ], + "constraint": "foreign_key", "reference": "" } ], @@ -397,9 +383,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": [ - "primary_key" - ], + "constraint": "primary_key", "reference": "" }, { @@ -427,7 +411,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -455,9 +439,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": [ - "foreign_key" - ], + "constraint": "foreign_key", "reference": "" } ], @@ -529,9 +511,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": [ - "primary_key" - ], + "constraint": "primary_key", "reference": "" }, { @@ -559,7 +539,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" } ], @@ -631,9 +611,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": [ - "primary_key" - ], + "constraint": "primary_key", "reference": "" }, { @@ -661,7 +639,7 @@ "labelWidth": 149, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" } ], diff --git a/e2etests/testdata/stable/ent2d2_basic/dagre/sketch.exp.svg b/e2etests/testdata/stable/ent2d2_basic/dagre/sketch.exp.svg index 74924db37..e820b5b57 100644 --- a/e2etests/testdata/stable/ent2d2_basic/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/ent2d2_basic/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -UseridintPKparent_idintFKspouse_idintFKPetidintPKowner_idintFKCardidintPKowner_idintFKPostidintPKtextstringauthor_idintFKMetadataidintPKageintInfoidintPKcontentjson.RawMessage spouse children/parent/ancestorpets/ownercard/ownerposts/authormetadata/userinfo/user + .d2-1012858411 .fill-N1{fill:#0A0F25;} + .d2-1012858411 .fill-N2{fill:#676C7E;} + .d2-1012858411 .fill-N3{fill:#9499AB;} + .d2-1012858411 .fill-N4{fill:#CFD2DD;} + .d2-1012858411 .fill-N5{fill:#DEE1EB;} + .d2-1012858411 .fill-N6{fill:#EEF1F8;} + .d2-1012858411 .fill-N7{fill:#FFFFFF;} + .d2-1012858411 .fill-B1{fill:#0D32B2;} + .d2-1012858411 .fill-B2{fill:#0D32B2;} + .d2-1012858411 .fill-B3{fill:#E3E9FD;} + .d2-1012858411 .fill-B4{fill:#E3E9FD;} + .d2-1012858411 .fill-B5{fill:#EDF0FD;} + .d2-1012858411 .fill-B6{fill:#F7F8FE;} + .d2-1012858411 .fill-AA2{fill:#4A6FF3;} + .d2-1012858411 .fill-AA4{fill:#EDF0FD;} + .d2-1012858411 .fill-AA5{fill:#F7F8FE;} + .d2-1012858411 .fill-AB4{fill:#EDF0FD;} + .d2-1012858411 .fill-AB5{fill:#F7F8FE;} + .d2-1012858411 .stroke-N1{stroke:#0A0F25;} + .d2-1012858411 .stroke-N2{stroke:#676C7E;} + .d2-1012858411 .stroke-N3{stroke:#9499AB;} + .d2-1012858411 .stroke-N4{stroke:#CFD2DD;} + .d2-1012858411 .stroke-N5{stroke:#DEE1EB;} + .d2-1012858411 .stroke-N6{stroke:#EEF1F8;} + .d2-1012858411 .stroke-N7{stroke:#FFFFFF;} + .d2-1012858411 .stroke-B1{stroke:#0D32B2;} + .d2-1012858411 .stroke-B2{stroke:#0D32B2;} + .d2-1012858411 .stroke-B3{stroke:#E3E9FD;} + .d2-1012858411 .stroke-B4{stroke:#E3E9FD;} + .d2-1012858411 .stroke-B5{stroke:#EDF0FD;} + .d2-1012858411 .stroke-B6{stroke:#F7F8FE;} + .d2-1012858411 .stroke-AA2{stroke:#4A6FF3;} + .d2-1012858411 .stroke-AA4{stroke:#EDF0FD;} + .d2-1012858411 .stroke-AA5{stroke:#F7F8FE;} + .d2-1012858411 .stroke-AB4{stroke:#EDF0FD;} + .d2-1012858411 .stroke-AB5{stroke:#F7F8FE;} + .d2-1012858411 .background-color-N1{background-color:#0A0F25;} + .d2-1012858411 .background-color-N2{background-color:#676C7E;} + .d2-1012858411 .background-color-N3{background-color:#9499AB;} + .d2-1012858411 .background-color-N4{background-color:#CFD2DD;} + .d2-1012858411 .background-color-N5{background-color:#DEE1EB;} + .d2-1012858411 .background-color-N6{background-color:#EEF1F8;} + .d2-1012858411 .background-color-N7{background-color:#FFFFFF;} + .d2-1012858411 .background-color-B1{background-color:#0D32B2;} + .d2-1012858411 .background-color-B2{background-color:#0D32B2;} + .d2-1012858411 .background-color-B3{background-color:#E3E9FD;} + .d2-1012858411 .background-color-B4{background-color:#E3E9FD;} + .d2-1012858411 .background-color-B5{background-color:#EDF0FD;} + .d2-1012858411 .background-color-B6{background-color:#F7F8FE;} + .d2-1012858411 .background-color-AA2{background-color:#4A6FF3;} + .d2-1012858411 .background-color-AA4{background-color:#EDF0FD;} + .d2-1012858411 .background-color-AA5{background-color:#F7F8FE;} + .d2-1012858411 .background-color-AB4{background-color:#EDF0FD;} + .d2-1012858411 .background-color-AB5{background-color:#F7F8FE;} + .d2-1012858411 .color-N1{color:#0A0F25;} + .d2-1012858411 .color-N2{color:#676C7E;} + .d2-1012858411 .color-N3{color:#9499AB;} + .d2-1012858411 .color-N4{color:#CFD2DD;} + .d2-1012858411 .color-N5{color:#DEE1EB;} + .d2-1012858411 .color-N6{color:#EEF1F8;} + .d2-1012858411 .color-N7{color:#FFFFFF;} + .d2-1012858411 .color-B1{color:#0D32B2;} + .d2-1012858411 .color-B2{color:#0D32B2;} + .d2-1012858411 .color-B3{color:#E3E9FD;} + .d2-1012858411 .color-B4{color:#E3E9FD;} + .d2-1012858411 .color-B5{color:#EDF0FD;} + .d2-1012858411 .color-B6{color:#F7F8FE;} + .d2-1012858411 .color-AA2{color:#4A6FF3;} + .d2-1012858411 .color-AA4{color:#EDF0FD;} + .d2-1012858411 .color-AA5{color:#F7F8FE;} + .d2-1012858411 .color-AB4{color:#EDF0FD;} + .d2-1012858411 .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}]]>UseridintPKparent_idintFKspouse_idintFKPetidintPKowner_idintFKCardidintPKowner_idintFKPostidintPKtextstringauthor_idintFKMetadataidintPKageintInfoidintPKcontentjson.RawMessage spouse children/parent/ancestorpets/ownercard/ownerposts/authormetadata/userinfo/user diff --git a/e2etests/testdata/stable/ent2d2_basic/elk/board.exp.json b/e2etests/testdata/stable/ent2d2_basic/elk/board.exp.json index fe3ccb359..fbf27f13b 100644 --- a/e2etests/testdata/stable/ent2d2_basic/elk/board.exp.json +++ b/e2etests/testdata/stable/ent2d2_basic/elk/board.exp.json @@ -55,9 +55,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": [ - "primary_key" - ], + "constraint": "primary_key", "reference": "" }, { @@ -85,9 +83,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": [ - "foreign_key" - ], + "constraint": "foreign_key", "reference": "" }, { @@ -115,9 +111,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": [ - "foreign_key" - ], + "constraint": "foreign_key", "reference": "" } ], @@ -189,9 +183,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": [ - "primary_key" - ], + "constraint": "primary_key", "reference": "" }, { @@ -219,9 +211,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": [ - "foreign_key" - ], + "constraint": "foreign_key", "reference": "" } ], @@ -293,9 +283,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": [ - "primary_key" - ], + "constraint": "primary_key", "reference": "" }, { @@ -323,9 +311,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": [ - "foreign_key" - ], + "constraint": "foreign_key", "reference": "" } ], @@ -397,9 +383,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": [ - "primary_key" - ], + "constraint": "primary_key", "reference": "" }, { @@ -427,7 +411,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -455,9 +439,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": [ - "foreign_key" - ], + "constraint": "foreign_key", "reference": "" } ], @@ -529,9 +511,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": [ - "primary_key" - ], + "constraint": "primary_key", "reference": "" }, { @@ -559,7 +539,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" } ], @@ -631,9 +611,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": [ - "primary_key" - ], + "constraint": "primary_key", "reference": "" }, { @@ -661,7 +639,7 @@ "labelWidth": 149, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" } ], diff --git a/e2etests/testdata/stable/ent2d2_basic/elk/sketch.exp.svg b/e2etests/testdata/stable/ent2d2_basic/elk/sketch.exp.svg index e476e9383..a6417eaa8 100644 --- a/e2etests/testdata/stable/ent2d2_basic/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/ent2d2_basic/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -UseridintPKparent_idintFKspouse_idintFKPetidintPKowner_idintFKCardidintPKowner_idintFKPostidintPKtextstringauthor_idintFKMetadataidintPKageintInfoidintPKcontentjson.RawMessage spouse children/parent/ancestorpets/ownercard/ownerposts/authormetadata/userinfo/user + .d2-1921105543 .fill-N1{fill:#0A0F25;} + .d2-1921105543 .fill-N2{fill:#676C7E;} + .d2-1921105543 .fill-N3{fill:#9499AB;} + .d2-1921105543 .fill-N4{fill:#CFD2DD;} + .d2-1921105543 .fill-N5{fill:#DEE1EB;} + .d2-1921105543 .fill-N6{fill:#EEF1F8;} + .d2-1921105543 .fill-N7{fill:#FFFFFF;} + .d2-1921105543 .fill-B1{fill:#0D32B2;} + .d2-1921105543 .fill-B2{fill:#0D32B2;} + .d2-1921105543 .fill-B3{fill:#E3E9FD;} + .d2-1921105543 .fill-B4{fill:#E3E9FD;} + .d2-1921105543 .fill-B5{fill:#EDF0FD;} + .d2-1921105543 .fill-B6{fill:#F7F8FE;} + .d2-1921105543 .fill-AA2{fill:#4A6FF3;} + .d2-1921105543 .fill-AA4{fill:#EDF0FD;} + .d2-1921105543 .fill-AA5{fill:#F7F8FE;} + .d2-1921105543 .fill-AB4{fill:#EDF0FD;} + .d2-1921105543 .fill-AB5{fill:#F7F8FE;} + .d2-1921105543 .stroke-N1{stroke:#0A0F25;} + .d2-1921105543 .stroke-N2{stroke:#676C7E;} + .d2-1921105543 .stroke-N3{stroke:#9499AB;} + .d2-1921105543 .stroke-N4{stroke:#CFD2DD;} + .d2-1921105543 .stroke-N5{stroke:#DEE1EB;} + .d2-1921105543 .stroke-N6{stroke:#EEF1F8;} + .d2-1921105543 .stroke-N7{stroke:#FFFFFF;} + .d2-1921105543 .stroke-B1{stroke:#0D32B2;} + .d2-1921105543 .stroke-B2{stroke:#0D32B2;} + .d2-1921105543 .stroke-B3{stroke:#E3E9FD;} + .d2-1921105543 .stroke-B4{stroke:#E3E9FD;} + .d2-1921105543 .stroke-B5{stroke:#EDF0FD;} + .d2-1921105543 .stroke-B6{stroke:#F7F8FE;} + .d2-1921105543 .stroke-AA2{stroke:#4A6FF3;} + .d2-1921105543 .stroke-AA4{stroke:#EDF0FD;} + .d2-1921105543 .stroke-AA5{stroke:#F7F8FE;} + .d2-1921105543 .stroke-AB4{stroke:#EDF0FD;} + .d2-1921105543 .stroke-AB5{stroke:#F7F8FE;} + .d2-1921105543 .background-color-N1{background-color:#0A0F25;} + .d2-1921105543 .background-color-N2{background-color:#676C7E;} + .d2-1921105543 .background-color-N3{background-color:#9499AB;} + .d2-1921105543 .background-color-N4{background-color:#CFD2DD;} + .d2-1921105543 .background-color-N5{background-color:#DEE1EB;} + .d2-1921105543 .background-color-N6{background-color:#EEF1F8;} + .d2-1921105543 .background-color-N7{background-color:#FFFFFF;} + .d2-1921105543 .background-color-B1{background-color:#0D32B2;} + .d2-1921105543 .background-color-B2{background-color:#0D32B2;} + .d2-1921105543 .background-color-B3{background-color:#E3E9FD;} + .d2-1921105543 .background-color-B4{background-color:#E3E9FD;} + .d2-1921105543 .background-color-B5{background-color:#EDF0FD;} + .d2-1921105543 .background-color-B6{background-color:#F7F8FE;} + .d2-1921105543 .background-color-AA2{background-color:#4A6FF3;} + .d2-1921105543 .background-color-AA4{background-color:#EDF0FD;} + .d2-1921105543 .background-color-AA5{background-color:#F7F8FE;} + .d2-1921105543 .background-color-AB4{background-color:#EDF0FD;} + .d2-1921105543 .background-color-AB5{background-color:#F7F8FE;} + .d2-1921105543 .color-N1{color:#0A0F25;} + .d2-1921105543 .color-N2{color:#676C7E;} + .d2-1921105543 .color-N3{color:#9499AB;} + .d2-1921105543 .color-N4{color:#CFD2DD;} + .d2-1921105543 .color-N5{color:#DEE1EB;} + .d2-1921105543 .color-N6{color:#EEF1F8;} + .d2-1921105543 .color-N7{color:#FFFFFF;} + .d2-1921105543 .color-B1{color:#0D32B2;} + .d2-1921105543 .color-B2{color:#0D32B2;} + .d2-1921105543 .color-B3{color:#E3E9FD;} + .d2-1921105543 .color-B4{color:#E3E9FD;} + .d2-1921105543 .color-B5{color:#EDF0FD;} + .d2-1921105543 .color-B6{color:#F7F8FE;} + .d2-1921105543 .color-AA2{color:#4A6FF3;} + .d2-1921105543 .color-AA4{color:#EDF0FD;} + .d2-1921105543 .color-AA5{color:#F7F8FE;} + .d2-1921105543 .color-AB4{color:#EDF0FD;} + .d2-1921105543 .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}]]>UseridintPKparent_idintFKspouse_idintFKPetidintPKowner_idintFKCardidintPKowner_idintFKPostidintPKtextstringauthor_idintFKMetadataidintPKageintInfoidintPKcontentjson.RawMessage spouse children/parent/ancestorpets/ownercard/ownerposts/authormetadata/userinfo/user diff --git a/e2etests/testdata/stable/ent2d2_right/dagre/board.exp.json b/e2etests/testdata/stable/ent2d2_right/dagre/board.exp.json index 0b96e1683..e3cd89886 100644 --- a/e2etests/testdata/stable/ent2d2_right/dagre/board.exp.json +++ b/e2etests/testdata/stable/ent2d2_right/dagre/board.exp.json @@ -55,9 +55,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": [ - "primary_key" - ], + "constraint": "primary_key", "reference": "" }, { @@ -85,9 +83,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": [ - "foreign_key" - ], + "constraint": "foreign_key", "reference": "" }, { @@ -115,9 +111,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": [ - "foreign_key" - ], + "constraint": "foreign_key", "reference": "" } ], @@ -189,9 +183,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": [ - "primary_key" - ], + "constraint": "primary_key", "reference": "" }, { @@ -219,9 +211,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": [ - "foreign_key" - ], + "constraint": "foreign_key", "reference": "" } ], @@ -293,9 +283,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": [ - "primary_key" - ], + "constraint": "primary_key", "reference": "" }, { @@ -323,9 +311,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": [ - "foreign_key" - ], + "constraint": "foreign_key", "reference": "" } ], @@ -397,9 +383,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": [ - "primary_key" - ], + "constraint": "primary_key", "reference": "" }, { @@ -427,7 +411,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -455,9 +439,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": [ - "foreign_key" - ], + "constraint": "foreign_key", "reference": "" } ], @@ -529,9 +511,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": [ - "primary_key" - ], + "constraint": "primary_key", "reference": "" }, { @@ -559,7 +539,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" } ], @@ -631,9 +611,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": [ - "primary_key" - ], + "constraint": "primary_key", "reference": "" }, { @@ -661,7 +639,7 @@ "labelWidth": 149, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" } ], diff --git a/e2etests/testdata/stable/ent2d2_right/dagre/sketch.exp.svg b/e2etests/testdata/stable/ent2d2_right/dagre/sketch.exp.svg index fd47a5755..884d3e0fc 100644 --- a/e2etests/testdata/stable/ent2d2_right/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/ent2d2_right/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -UseridintPKparent_idintFKspouse_idintFKPetidintPKowner_idintFKCardidintPKowner_idintFKPostidintPKtextstringauthor_idintFKMetadataidintPKageintInfoidintPKcontentjson.RawMessage spousespouse childrenparentyowhoaheypets/ownercard/ownerposts/authormetadata/userinfo/user + .d2-950821578 .fill-N1{fill:#0A0F25;} + .d2-950821578 .fill-N2{fill:#676C7E;} + .d2-950821578 .fill-N3{fill:#9499AB;} + .d2-950821578 .fill-N4{fill:#CFD2DD;} + .d2-950821578 .fill-N5{fill:#DEE1EB;} + .d2-950821578 .fill-N6{fill:#EEF1F8;} + .d2-950821578 .fill-N7{fill:#FFFFFF;} + .d2-950821578 .fill-B1{fill:#0D32B2;} + .d2-950821578 .fill-B2{fill:#0D32B2;} + .d2-950821578 .fill-B3{fill:#E3E9FD;} + .d2-950821578 .fill-B4{fill:#E3E9FD;} + .d2-950821578 .fill-B5{fill:#EDF0FD;} + .d2-950821578 .fill-B6{fill:#F7F8FE;} + .d2-950821578 .fill-AA2{fill:#4A6FF3;} + .d2-950821578 .fill-AA4{fill:#EDF0FD;} + .d2-950821578 .fill-AA5{fill:#F7F8FE;} + .d2-950821578 .fill-AB4{fill:#EDF0FD;} + .d2-950821578 .fill-AB5{fill:#F7F8FE;} + .d2-950821578 .stroke-N1{stroke:#0A0F25;} + .d2-950821578 .stroke-N2{stroke:#676C7E;} + .d2-950821578 .stroke-N3{stroke:#9499AB;} + .d2-950821578 .stroke-N4{stroke:#CFD2DD;} + .d2-950821578 .stroke-N5{stroke:#DEE1EB;} + .d2-950821578 .stroke-N6{stroke:#EEF1F8;} + .d2-950821578 .stroke-N7{stroke:#FFFFFF;} + .d2-950821578 .stroke-B1{stroke:#0D32B2;} + .d2-950821578 .stroke-B2{stroke:#0D32B2;} + .d2-950821578 .stroke-B3{stroke:#E3E9FD;} + .d2-950821578 .stroke-B4{stroke:#E3E9FD;} + .d2-950821578 .stroke-B5{stroke:#EDF0FD;} + .d2-950821578 .stroke-B6{stroke:#F7F8FE;} + .d2-950821578 .stroke-AA2{stroke:#4A6FF3;} + .d2-950821578 .stroke-AA4{stroke:#EDF0FD;} + .d2-950821578 .stroke-AA5{stroke:#F7F8FE;} + .d2-950821578 .stroke-AB4{stroke:#EDF0FD;} + .d2-950821578 .stroke-AB5{stroke:#F7F8FE;} + .d2-950821578 .background-color-N1{background-color:#0A0F25;} + .d2-950821578 .background-color-N2{background-color:#676C7E;} + .d2-950821578 .background-color-N3{background-color:#9499AB;} + .d2-950821578 .background-color-N4{background-color:#CFD2DD;} + .d2-950821578 .background-color-N5{background-color:#DEE1EB;} + .d2-950821578 .background-color-N6{background-color:#EEF1F8;} + .d2-950821578 .background-color-N7{background-color:#FFFFFF;} + .d2-950821578 .background-color-B1{background-color:#0D32B2;} + .d2-950821578 .background-color-B2{background-color:#0D32B2;} + .d2-950821578 .background-color-B3{background-color:#E3E9FD;} + .d2-950821578 .background-color-B4{background-color:#E3E9FD;} + .d2-950821578 .background-color-B5{background-color:#EDF0FD;} + .d2-950821578 .background-color-B6{background-color:#F7F8FE;} + .d2-950821578 .background-color-AA2{background-color:#4A6FF3;} + .d2-950821578 .background-color-AA4{background-color:#EDF0FD;} + .d2-950821578 .background-color-AA5{background-color:#F7F8FE;} + .d2-950821578 .background-color-AB4{background-color:#EDF0FD;} + .d2-950821578 .background-color-AB5{background-color:#F7F8FE;} + .d2-950821578 .color-N1{color:#0A0F25;} + .d2-950821578 .color-N2{color:#676C7E;} + .d2-950821578 .color-N3{color:#9499AB;} + .d2-950821578 .color-N4{color:#CFD2DD;} + .d2-950821578 .color-N5{color:#DEE1EB;} + .d2-950821578 .color-N6{color:#EEF1F8;} + .d2-950821578 .color-N7{color:#FFFFFF;} + .d2-950821578 .color-B1{color:#0D32B2;} + .d2-950821578 .color-B2{color:#0D32B2;} + .d2-950821578 .color-B3{color:#E3E9FD;} + .d2-950821578 .color-B4{color:#E3E9FD;} + .d2-950821578 .color-B5{color:#EDF0FD;} + .d2-950821578 .color-B6{color:#F7F8FE;} + .d2-950821578 .color-AA2{color:#4A6FF3;} + .d2-950821578 .color-AA4{color:#EDF0FD;} + .d2-950821578 .color-AA5{color:#F7F8FE;} + .d2-950821578 .color-AB4{color:#EDF0FD;} + .d2-950821578 .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}]]>UseridintPKparent_idintFKspouse_idintFKPetidintPKowner_idintFKCardidintPKowner_idintFKPostidintPKtextstringauthor_idintFKMetadataidintPKageintInfoidintPKcontentjson.RawMessage spousespouse childrenparentyowhoaheypets/ownercard/ownerposts/authormetadata/userinfo/user diff --git a/e2etests/testdata/stable/ent2d2_right/elk/board.exp.json b/e2etests/testdata/stable/ent2d2_right/elk/board.exp.json index a479af116..6843f9ded 100644 --- a/e2etests/testdata/stable/ent2d2_right/elk/board.exp.json +++ b/e2etests/testdata/stable/ent2d2_right/elk/board.exp.json @@ -55,9 +55,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": [ - "primary_key" - ], + "constraint": "primary_key", "reference": "" }, { @@ -85,9 +83,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": [ - "foreign_key" - ], + "constraint": "foreign_key", "reference": "" }, { @@ -115,9 +111,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": [ - "foreign_key" - ], + "constraint": "foreign_key", "reference": "" } ], @@ -189,9 +183,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": [ - "primary_key" - ], + "constraint": "primary_key", "reference": "" }, { @@ -219,9 +211,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": [ - "foreign_key" - ], + "constraint": "foreign_key", "reference": "" } ], @@ -293,9 +283,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": [ - "primary_key" - ], + "constraint": "primary_key", "reference": "" }, { @@ -323,9 +311,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": [ - "foreign_key" - ], + "constraint": "foreign_key", "reference": "" } ], @@ -397,9 +383,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": [ - "primary_key" - ], + "constraint": "primary_key", "reference": "" }, { @@ -427,7 +411,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -455,9 +439,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": [ - "foreign_key" - ], + "constraint": "foreign_key", "reference": "" } ], @@ -529,9 +511,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": [ - "primary_key" - ], + "constraint": "primary_key", "reference": "" }, { @@ -559,7 +539,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" } ], @@ -631,9 +611,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": [ - "primary_key" - ], + "constraint": "primary_key", "reference": "" }, { @@ -661,7 +639,7 @@ "labelWidth": 149, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" } ], diff --git a/e2etests/testdata/stable/ent2d2_right/elk/sketch.exp.svg b/e2etests/testdata/stable/ent2d2_right/elk/sketch.exp.svg index 186557cf2..e0fdbba72 100644 --- a/e2etests/testdata/stable/ent2d2_right/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/ent2d2_right/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -UseridintPKparent_idintFKspouse_idintFKPetidintPKowner_idintFKCardidintPKowner_idintFKPostidintPKtextstringauthor_idintFKMetadataidintPKageintInfoidintPKcontentjson.RawMessage spousespouse childrenparentyowhoaheypets/ownercard/ownerposts/authormetadata/userinfo/user + .d2-534880625 .fill-N1{fill:#0A0F25;} + .d2-534880625 .fill-N2{fill:#676C7E;} + .d2-534880625 .fill-N3{fill:#9499AB;} + .d2-534880625 .fill-N4{fill:#CFD2DD;} + .d2-534880625 .fill-N5{fill:#DEE1EB;} + .d2-534880625 .fill-N6{fill:#EEF1F8;} + .d2-534880625 .fill-N7{fill:#FFFFFF;} + .d2-534880625 .fill-B1{fill:#0D32B2;} + .d2-534880625 .fill-B2{fill:#0D32B2;} + .d2-534880625 .fill-B3{fill:#E3E9FD;} + .d2-534880625 .fill-B4{fill:#E3E9FD;} + .d2-534880625 .fill-B5{fill:#EDF0FD;} + .d2-534880625 .fill-B6{fill:#F7F8FE;} + .d2-534880625 .fill-AA2{fill:#4A6FF3;} + .d2-534880625 .fill-AA4{fill:#EDF0FD;} + .d2-534880625 .fill-AA5{fill:#F7F8FE;} + .d2-534880625 .fill-AB4{fill:#EDF0FD;} + .d2-534880625 .fill-AB5{fill:#F7F8FE;} + .d2-534880625 .stroke-N1{stroke:#0A0F25;} + .d2-534880625 .stroke-N2{stroke:#676C7E;} + .d2-534880625 .stroke-N3{stroke:#9499AB;} + .d2-534880625 .stroke-N4{stroke:#CFD2DD;} + .d2-534880625 .stroke-N5{stroke:#DEE1EB;} + .d2-534880625 .stroke-N6{stroke:#EEF1F8;} + .d2-534880625 .stroke-N7{stroke:#FFFFFF;} + .d2-534880625 .stroke-B1{stroke:#0D32B2;} + .d2-534880625 .stroke-B2{stroke:#0D32B2;} + .d2-534880625 .stroke-B3{stroke:#E3E9FD;} + .d2-534880625 .stroke-B4{stroke:#E3E9FD;} + .d2-534880625 .stroke-B5{stroke:#EDF0FD;} + .d2-534880625 .stroke-B6{stroke:#F7F8FE;} + .d2-534880625 .stroke-AA2{stroke:#4A6FF3;} + .d2-534880625 .stroke-AA4{stroke:#EDF0FD;} + .d2-534880625 .stroke-AA5{stroke:#F7F8FE;} + .d2-534880625 .stroke-AB4{stroke:#EDF0FD;} + .d2-534880625 .stroke-AB5{stroke:#F7F8FE;} + .d2-534880625 .background-color-N1{background-color:#0A0F25;} + .d2-534880625 .background-color-N2{background-color:#676C7E;} + .d2-534880625 .background-color-N3{background-color:#9499AB;} + .d2-534880625 .background-color-N4{background-color:#CFD2DD;} + .d2-534880625 .background-color-N5{background-color:#DEE1EB;} + .d2-534880625 .background-color-N6{background-color:#EEF1F8;} + .d2-534880625 .background-color-N7{background-color:#FFFFFF;} + .d2-534880625 .background-color-B1{background-color:#0D32B2;} + .d2-534880625 .background-color-B2{background-color:#0D32B2;} + .d2-534880625 .background-color-B3{background-color:#E3E9FD;} + .d2-534880625 .background-color-B4{background-color:#E3E9FD;} + .d2-534880625 .background-color-B5{background-color:#EDF0FD;} + .d2-534880625 .background-color-B6{background-color:#F7F8FE;} + .d2-534880625 .background-color-AA2{background-color:#4A6FF3;} + .d2-534880625 .background-color-AA4{background-color:#EDF0FD;} + .d2-534880625 .background-color-AA5{background-color:#F7F8FE;} + .d2-534880625 .background-color-AB4{background-color:#EDF0FD;} + .d2-534880625 .background-color-AB5{background-color:#F7F8FE;} + .d2-534880625 .color-N1{color:#0A0F25;} + .d2-534880625 .color-N2{color:#676C7E;} + .d2-534880625 .color-N3{color:#9499AB;} + .d2-534880625 .color-N4{color:#CFD2DD;} + .d2-534880625 .color-N5{color:#DEE1EB;} + .d2-534880625 .color-N6{color:#EEF1F8;} + .d2-534880625 .color-N7{color:#FFFFFF;} + .d2-534880625 .color-B1{color:#0D32B2;} + .d2-534880625 .color-B2{color:#0D32B2;} + .d2-534880625 .color-B3{color:#E3E9FD;} + .d2-534880625 .color-B4{color:#E3E9FD;} + .d2-534880625 .color-B5{color:#EDF0FD;} + .d2-534880625 .color-B6{color:#F7F8FE;} + .d2-534880625 .color-AA2{color:#4A6FF3;} + .d2-534880625 .color-AA4{color:#EDF0FD;} + .d2-534880625 .color-AA5{color:#F7F8FE;} + .d2-534880625 .color-AB4{color:#EDF0FD;} + .d2-534880625 .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}]]>UseridintPKparent_idintFKspouse_idintFKPetidintPKowner_idintFKCardidintPKowner_idintFKPostidintPKtextstringauthor_idintFKMetadataidintPKageintInfoidintPKcontentjson.RawMessage spousespouse childrenparentyowhoaheypets/ownercard/ownerposts/authormetadata/userinfo/user 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 dd6b3f0d2..7b5c31322 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 @@ -860,7 +860,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -888,7 +888,7 @@ "labelWidth": 64, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" } ], 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 10d0baad6..a94e3f9f8 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 @@ -1,30 +1,30 @@ -a labelblabelsa class+public() boolvoid-private() intvoidcloudyyyya := 5 + .d2-1324883695 .fill-N1{fill:#0A0F25;} + .d2-1324883695 .fill-N2{fill:#676C7E;} + .d2-1324883695 .fill-N3{fill:#9499AB;} + .d2-1324883695 .fill-N4{fill:#CFD2DD;} + .d2-1324883695 .fill-N5{fill:#DEE1EB;} + .d2-1324883695 .fill-N6{fill:#EEF1F8;} + .d2-1324883695 .fill-N7{fill:#FFFFFF;} + .d2-1324883695 .fill-B1{fill:#0D32B2;} + .d2-1324883695 .fill-B2{fill:#0D32B2;} + .d2-1324883695 .fill-B3{fill:#E3E9FD;} + .d2-1324883695 .fill-B4{fill:#E3E9FD;} + .d2-1324883695 .fill-B5{fill:#EDF0FD;} + .d2-1324883695 .fill-B6{fill:#F7F8FE;} + .d2-1324883695 .fill-AA2{fill:#4A6FF3;} + .d2-1324883695 .fill-AA4{fill:#EDF0FD;} + .d2-1324883695 .fill-AA5{fill:#F7F8FE;} + .d2-1324883695 .fill-AB4{fill:#EDF0FD;} + .d2-1324883695 .fill-AB5{fill:#F7F8FE;} + .d2-1324883695 .stroke-N1{stroke:#0A0F25;} + .d2-1324883695 .stroke-N2{stroke:#676C7E;} + .d2-1324883695 .stroke-N3{stroke:#9499AB;} + .d2-1324883695 .stroke-N4{stroke:#CFD2DD;} + .d2-1324883695 .stroke-N5{stroke:#DEE1EB;} + .d2-1324883695 .stroke-N6{stroke:#EEF1F8;} + .d2-1324883695 .stroke-N7{stroke:#FFFFFF;} + .d2-1324883695 .stroke-B1{stroke:#0D32B2;} + .d2-1324883695 .stroke-B2{stroke:#0D32B2;} + .d2-1324883695 .stroke-B3{stroke:#E3E9FD;} + .d2-1324883695 .stroke-B4{stroke:#E3E9FD;} + .d2-1324883695 .stroke-B5{stroke:#EDF0FD;} + .d2-1324883695 .stroke-B6{stroke:#F7F8FE;} + .d2-1324883695 .stroke-AA2{stroke:#4A6FF3;} + .d2-1324883695 .stroke-AA4{stroke:#EDF0FD;} + .d2-1324883695 .stroke-AA5{stroke:#F7F8FE;} + .d2-1324883695 .stroke-AB4{stroke:#EDF0FD;} + .d2-1324883695 .stroke-AB5{stroke:#F7F8FE;} + .d2-1324883695 .background-color-N1{background-color:#0A0F25;} + .d2-1324883695 .background-color-N2{background-color:#676C7E;} + .d2-1324883695 .background-color-N3{background-color:#9499AB;} + .d2-1324883695 .background-color-N4{background-color:#CFD2DD;} + .d2-1324883695 .background-color-N5{background-color:#DEE1EB;} + .d2-1324883695 .background-color-N6{background-color:#EEF1F8;} + .d2-1324883695 .background-color-N7{background-color:#FFFFFF;} + .d2-1324883695 .background-color-B1{background-color:#0D32B2;} + .d2-1324883695 .background-color-B2{background-color:#0D32B2;} + .d2-1324883695 .background-color-B3{background-color:#E3E9FD;} + .d2-1324883695 .background-color-B4{background-color:#E3E9FD;} + .d2-1324883695 .background-color-B5{background-color:#EDF0FD;} + .d2-1324883695 .background-color-B6{background-color:#F7F8FE;} + .d2-1324883695 .background-color-AA2{background-color:#4A6FF3;} + .d2-1324883695 .background-color-AA4{background-color:#EDF0FD;} + .d2-1324883695 .background-color-AA5{background-color:#F7F8FE;} + .d2-1324883695 .background-color-AB4{background-color:#EDF0FD;} + .d2-1324883695 .background-color-AB5{background-color:#F7F8FE;} + .d2-1324883695 .color-N1{color:#0A0F25;} + .d2-1324883695 .color-N2{color:#676C7E;} + .d2-1324883695 .color-N3{color:#9499AB;} + .d2-1324883695 .color-N4{color:#CFD2DD;} + .d2-1324883695 .color-N5{color:#DEE1EB;} + .d2-1324883695 .color-N6{color:#EEF1F8;} + .d2-1324883695 .color-N7{color:#FFFFFF;} + .d2-1324883695 .color-B1{color:#0D32B2;} + .d2-1324883695 .color-B2{color:#0D32B2;} + .d2-1324883695 .color-B3{color:#E3E9FD;} + .d2-1324883695 .color-B4{color:#E3E9FD;} + .d2-1324883695 .color-B5{color:#EDF0FD;} + .d2-1324883695 .color-B6{color:#F7F8FE;} + .d2-1324883695 .color-AA2{color:#4A6FF3;} + .d2-1324883695 .color-AA4{color:#EDF0FD;} + .d2-1324883695 .color-AA5{color:#F7F8FE;} + .d2-1324883695 .color-AB4{color:#EDF0FD;} + .d2-1324883695 .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}]]>a labelblabelsa class+public() boolvoid-private() intvoidcloudyyyya := 5 b := a + 7 fmt.Printf("%d", b)a := 5 b := a + 7 -fmt.Printf("%d", b)cyldiadocssix cornersa random iconoverpackdocs pagetoohard o saysinglepersona queuea squarea step at a timedatausersidintnamevarchar result := callThisFunction(obj, 5) midthis sideother side +fmt.Printf("%d", b)cyldiadocssix cornersa random iconoverpackdocs pagetoohard o saysinglepersona queuea squarea step at a timedatausersidintnamevarchar result := callThisFunction(obj, 5) midthis sideother side diff --git a/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/board.exp.json b/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/board.exp.json index dd6b3f0d2..7b5c31322 100644 --- a/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/board.exp.json @@ -860,7 +860,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -888,7 +888,7 @@ "labelWidth": 64, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" } ], diff --git a/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/sketch.exp.svg index 10d0baad6..a94e3f9f8 100644 --- a/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/sketch.exp.svg @@ -1,30 +1,30 @@ -a labelblabelsa class+public() boolvoid-private() intvoidcloudyyyya := 5 + .d2-1324883695 .fill-N1{fill:#0A0F25;} + .d2-1324883695 .fill-N2{fill:#676C7E;} + .d2-1324883695 .fill-N3{fill:#9499AB;} + .d2-1324883695 .fill-N4{fill:#CFD2DD;} + .d2-1324883695 .fill-N5{fill:#DEE1EB;} + .d2-1324883695 .fill-N6{fill:#EEF1F8;} + .d2-1324883695 .fill-N7{fill:#FFFFFF;} + .d2-1324883695 .fill-B1{fill:#0D32B2;} + .d2-1324883695 .fill-B2{fill:#0D32B2;} + .d2-1324883695 .fill-B3{fill:#E3E9FD;} + .d2-1324883695 .fill-B4{fill:#E3E9FD;} + .d2-1324883695 .fill-B5{fill:#EDF0FD;} + .d2-1324883695 .fill-B6{fill:#F7F8FE;} + .d2-1324883695 .fill-AA2{fill:#4A6FF3;} + .d2-1324883695 .fill-AA4{fill:#EDF0FD;} + .d2-1324883695 .fill-AA5{fill:#F7F8FE;} + .d2-1324883695 .fill-AB4{fill:#EDF0FD;} + .d2-1324883695 .fill-AB5{fill:#F7F8FE;} + .d2-1324883695 .stroke-N1{stroke:#0A0F25;} + .d2-1324883695 .stroke-N2{stroke:#676C7E;} + .d2-1324883695 .stroke-N3{stroke:#9499AB;} + .d2-1324883695 .stroke-N4{stroke:#CFD2DD;} + .d2-1324883695 .stroke-N5{stroke:#DEE1EB;} + .d2-1324883695 .stroke-N6{stroke:#EEF1F8;} + .d2-1324883695 .stroke-N7{stroke:#FFFFFF;} + .d2-1324883695 .stroke-B1{stroke:#0D32B2;} + .d2-1324883695 .stroke-B2{stroke:#0D32B2;} + .d2-1324883695 .stroke-B3{stroke:#E3E9FD;} + .d2-1324883695 .stroke-B4{stroke:#E3E9FD;} + .d2-1324883695 .stroke-B5{stroke:#EDF0FD;} + .d2-1324883695 .stroke-B6{stroke:#F7F8FE;} + .d2-1324883695 .stroke-AA2{stroke:#4A6FF3;} + .d2-1324883695 .stroke-AA4{stroke:#EDF0FD;} + .d2-1324883695 .stroke-AA5{stroke:#F7F8FE;} + .d2-1324883695 .stroke-AB4{stroke:#EDF0FD;} + .d2-1324883695 .stroke-AB5{stroke:#F7F8FE;} + .d2-1324883695 .background-color-N1{background-color:#0A0F25;} + .d2-1324883695 .background-color-N2{background-color:#676C7E;} + .d2-1324883695 .background-color-N3{background-color:#9499AB;} + .d2-1324883695 .background-color-N4{background-color:#CFD2DD;} + .d2-1324883695 .background-color-N5{background-color:#DEE1EB;} + .d2-1324883695 .background-color-N6{background-color:#EEF1F8;} + .d2-1324883695 .background-color-N7{background-color:#FFFFFF;} + .d2-1324883695 .background-color-B1{background-color:#0D32B2;} + .d2-1324883695 .background-color-B2{background-color:#0D32B2;} + .d2-1324883695 .background-color-B3{background-color:#E3E9FD;} + .d2-1324883695 .background-color-B4{background-color:#E3E9FD;} + .d2-1324883695 .background-color-B5{background-color:#EDF0FD;} + .d2-1324883695 .background-color-B6{background-color:#F7F8FE;} + .d2-1324883695 .background-color-AA2{background-color:#4A6FF3;} + .d2-1324883695 .background-color-AA4{background-color:#EDF0FD;} + .d2-1324883695 .background-color-AA5{background-color:#F7F8FE;} + .d2-1324883695 .background-color-AB4{background-color:#EDF0FD;} + .d2-1324883695 .background-color-AB5{background-color:#F7F8FE;} + .d2-1324883695 .color-N1{color:#0A0F25;} + .d2-1324883695 .color-N2{color:#676C7E;} + .d2-1324883695 .color-N3{color:#9499AB;} + .d2-1324883695 .color-N4{color:#CFD2DD;} + .d2-1324883695 .color-N5{color:#DEE1EB;} + .d2-1324883695 .color-N6{color:#EEF1F8;} + .d2-1324883695 .color-N7{color:#FFFFFF;} + .d2-1324883695 .color-B1{color:#0D32B2;} + .d2-1324883695 .color-B2{color:#0D32B2;} + .d2-1324883695 .color-B3{color:#E3E9FD;} + .d2-1324883695 .color-B4{color:#E3E9FD;} + .d2-1324883695 .color-B5{color:#EDF0FD;} + .d2-1324883695 .color-B6{color:#F7F8FE;} + .d2-1324883695 .color-AA2{color:#4A6FF3;} + .d2-1324883695 .color-AA4{color:#EDF0FD;} + .d2-1324883695 .color-AA5{color:#F7F8FE;} + .d2-1324883695 .color-AB4{color:#EDF0FD;} + .d2-1324883695 .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}]]>a labelblabelsa class+public() boolvoid-private() intvoidcloudyyyya := 5 b := a + 7 fmt.Printf("%d", b)a := 5 b := a + 7 -fmt.Printf("%d", b)cyldiadocssix cornersa random iconoverpackdocs pagetoohard o saysinglepersona queuea squarea step at a timedatausersidintnamevarchar result := callThisFunction(obj, 5) midthis sideother side +fmt.Printf("%d", b)cyldiadocssix cornersa random iconoverpackdocs pagetoohard o saysinglepersona queuea squarea step at a timedatausersidintnamevarchar result := callThisFunction(obj, 5) midthis sideother side diff --git a/e2etests/testdata/stable/sql_table_column_styles/dagre/board.exp.json b/e2etests/testdata/stable/sql_table_column_styles/dagre/board.exp.json index 24dffe9d7..55c5ecf20 100644 --- a/e2etests/testdata/stable/sql_table_column_styles/dagre/board.exp.json +++ b/e2etests/testdata/stable/sql_table_column_styles/dagre/board.exp.json @@ -55,7 +55,7 @@ "labelWidth": 166, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -83,7 +83,7 @@ "labelWidth": 210, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" } ], @@ -155,7 +155,7 @@ "labelWidth": 248, "labelHeight": 38 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -183,7 +183,7 @@ "labelWidth": 315, "labelHeight": 38 }, - "constraint": null, + "constraint": "", "reference": "" } ], diff --git a/e2etests/testdata/stable/sql_table_column_styles/dagre/sketch.exp.svg b/e2etests/testdata/stable/sql_table_column_styles/dagre/sketch.exp.svg index 75a24a50b..b3b49c676 100644 --- a/e2etests/testdata/stable/sql_table_column_styles/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sql_table_column_styles/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -Humor in the CourtCould you see him from where you were standing?I could see his head.And where was his head?Just above his shoulders.Humor in the Court2Could you see him from where you were standing?I could see his head.And where was his head?Just above his shoulders.BatchManager-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voidBatchManager-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)void + .d2-2555987415 .fill-N1{fill:#0A0F25;} + .d2-2555987415 .fill-N2{fill:#676C7E;} + .d2-2555987415 .fill-N3{fill:#9499AB;} + .d2-2555987415 .fill-N4{fill:#CFD2DD;} + .d2-2555987415 .fill-N5{fill:#DEE1EB;} + .d2-2555987415 .fill-N6{fill:#EEF1F8;} + .d2-2555987415 .fill-N7{fill:#FFFFFF;} + .d2-2555987415 .fill-B1{fill:#0D32B2;} + .d2-2555987415 .fill-B2{fill:#0D32B2;} + .d2-2555987415 .fill-B3{fill:#E3E9FD;} + .d2-2555987415 .fill-B4{fill:#E3E9FD;} + .d2-2555987415 .fill-B5{fill:#EDF0FD;} + .d2-2555987415 .fill-B6{fill:#F7F8FE;} + .d2-2555987415 .fill-AA2{fill:#4A6FF3;} + .d2-2555987415 .fill-AA4{fill:#EDF0FD;} + .d2-2555987415 .fill-AA5{fill:#F7F8FE;} + .d2-2555987415 .fill-AB4{fill:#EDF0FD;} + .d2-2555987415 .fill-AB5{fill:#F7F8FE;} + .d2-2555987415 .stroke-N1{stroke:#0A0F25;} + .d2-2555987415 .stroke-N2{stroke:#676C7E;} + .d2-2555987415 .stroke-N3{stroke:#9499AB;} + .d2-2555987415 .stroke-N4{stroke:#CFD2DD;} + .d2-2555987415 .stroke-N5{stroke:#DEE1EB;} + .d2-2555987415 .stroke-N6{stroke:#EEF1F8;} + .d2-2555987415 .stroke-N7{stroke:#FFFFFF;} + .d2-2555987415 .stroke-B1{stroke:#0D32B2;} + .d2-2555987415 .stroke-B2{stroke:#0D32B2;} + .d2-2555987415 .stroke-B3{stroke:#E3E9FD;} + .d2-2555987415 .stroke-B4{stroke:#E3E9FD;} + .d2-2555987415 .stroke-B5{stroke:#EDF0FD;} + .d2-2555987415 .stroke-B6{stroke:#F7F8FE;} + .d2-2555987415 .stroke-AA2{stroke:#4A6FF3;} + .d2-2555987415 .stroke-AA4{stroke:#EDF0FD;} + .d2-2555987415 .stroke-AA5{stroke:#F7F8FE;} + .d2-2555987415 .stroke-AB4{stroke:#EDF0FD;} + .d2-2555987415 .stroke-AB5{stroke:#F7F8FE;} + .d2-2555987415 .background-color-N1{background-color:#0A0F25;} + .d2-2555987415 .background-color-N2{background-color:#676C7E;} + .d2-2555987415 .background-color-N3{background-color:#9499AB;} + .d2-2555987415 .background-color-N4{background-color:#CFD2DD;} + .d2-2555987415 .background-color-N5{background-color:#DEE1EB;} + .d2-2555987415 .background-color-N6{background-color:#EEF1F8;} + .d2-2555987415 .background-color-N7{background-color:#FFFFFF;} + .d2-2555987415 .background-color-B1{background-color:#0D32B2;} + .d2-2555987415 .background-color-B2{background-color:#0D32B2;} + .d2-2555987415 .background-color-B3{background-color:#E3E9FD;} + .d2-2555987415 .background-color-B4{background-color:#E3E9FD;} + .d2-2555987415 .background-color-B5{background-color:#EDF0FD;} + .d2-2555987415 .background-color-B6{background-color:#F7F8FE;} + .d2-2555987415 .background-color-AA2{background-color:#4A6FF3;} + .d2-2555987415 .background-color-AA4{background-color:#EDF0FD;} + .d2-2555987415 .background-color-AA5{background-color:#F7F8FE;} + .d2-2555987415 .background-color-AB4{background-color:#EDF0FD;} + .d2-2555987415 .background-color-AB5{background-color:#F7F8FE;} + .d2-2555987415 .color-N1{color:#0A0F25;} + .d2-2555987415 .color-N2{color:#676C7E;} + .d2-2555987415 .color-N3{color:#9499AB;} + .d2-2555987415 .color-N4{color:#CFD2DD;} + .d2-2555987415 .color-N5{color:#DEE1EB;} + .d2-2555987415 .color-N6{color:#EEF1F8;} + .d2-2555987415 .color-N7{color:#FFFFFF;} + .d2-2555987415 .color-B1{color:#0D32B2;} + .d2-2555987415 .color-B2{color:#0D32B2;} + .d2-2555987415 .color-B3{color:#E3E9FD;} + .d2-2555987415 .color-B4{color:#E3E9FD;} + .d2-2555987415 .color-B5{color:#EDF0FD;} + .d2-2555987415 .color-B6{color:#F7F8FE;} + .d2-2555987415 .color-AA2{color:#4A6FF3;} + .d2-2555987415 .color-AA4{color:#EDF0FD;} + .d2-2555987415 .color-AA5{color:#F7F8FE;} + .d2-2555987415 .color-AB4{color:#EDF0FD;} + .d2-2555987415 .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}]]>Humor in the CourtCould you see him from where you were standing?I could see his head.And where was his head?Just above his shoulders.Humor in the Court2Could you see him from where you were standing?I could see his head.And where was his head?Just above his shoulders.BatchManager-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voidBatchManager-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)void \ No newline at end of file diff --git a/e2etests/testdata/stable/sql_table_column_styles/elk/board.exp.json b/e2etests/testdata/stable/sql_table_column_styles/elk/board.exp.json index 220d7395f..4819ec11c 100644 --- a/e2etests/testdata/stable/sql_table_column_styles/elk/board.exp.json +++ b/e2etests/testdata/stable/sql_table_column_styles/elk/board.exp.json @@ -55,7 +55,7 @@ "labelWidth": 166, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -83,7 +83,7 @@ "labelWidth": 210, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" } ], @@ -155,7 +155,7 @@ "labelWidth": 248, "labelHeight": 38 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -183,7 +183,7 @@ "labelWidth": 315, "labelHeight": 38 }, - "constraint": null, + "constraint": "", "reference": "" } ], diff --git a/e2etests/testdata/stable/sql_table_column_styles/elk/sketch.exp.svg b/e2etests/testdata/stable/sql_table_column_styles/elk/sketch.exp.svg index 18942cbb6..dd0442e3c 100644 --- a/e2etests/testdata/stable/sql_table_column_styles/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sql_table_column_styles/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -Humor in the CourtCould you see him from where you were standing?I could see his head.And where was his head?Just above his shoulders.Humor in the Court2Could you see him from where you were standing?I could see his head.And where was his head?Just above his shoulders.BatchManager-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voidBatchManager-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)void + .d2-416346713 .fill-N1{fill:#0A0F25;} + .d2-416346713 .fill-N2{fill:#676C7E;} + .d2-416346713 .fill-N3{fill:#9499AB;} + .d2-416346713 .fill-N4{fill:#CFD2DD;} + .d2-416346713 .fill-N5{fill:#DEE1EB;} + .d2-416346713 .fill-N6{fill:#EEF1F8;} + .d2-416346713 .fill-N7{fill:#FFFFFF;} + .d2-416346713 .fill-B1{fill:#0D32B2;} + .d2-416346713 .fill-B2{fill:#0D32B2;} + .d2-416346713 .fill-B3{fill:#E3E9FD;} + .d2-416346713 .fill-B4{fill:#E3E9FD;} + .d2-416346713 .fill-B5{fill:#EDF0FD;} + .d2-416346713 .fill-B6{fill:#F7F8FE;} + .d2-416346713 .fill-AA2{fill:#4A6FF3;} + .d2-416346713 .fill-AA4{fill:#EDF0FD;} + .d2-416346713 .fill-AA5{fill:#F7F8FE;} + .d2-416346713 .fill-AB4{fill:#EDF0FD;} + .d2-416346713 .fill-AB5{fill:#F7F8FE;} + .d2-416346713 .stroke-N1{stroke:#0A0F25;} + .d2-416346713 .stroke-N2{stroke:#676C7E;} + .d2-416346713 .stroke-N3{stroke:#9499AB;} + .d2-416346713 .stroke-N4{stroke:#CFD2DD;} + .d2-416346713 .stroke-N5{stroke:#DEE1EB;} + .d2-416346713 .stroke-N6{stroke:#EEF1F8;} + .d2-416346713 .stroke-N7{stroke:#FFFFFF;} + .d2-416346713 .stroke-B1{stroke:#0D32B2;} + .d2-416346713 .stroke-B2{stroke:#0D32B2;} + .d2-416346713 .stroke-B3{stroke:#E3E9FD;} + .d2-416346713 .stroke-B4{stroke:#E3E9FD;} + .d2-416346713 .stroke-B5{stroke:#EDF0FD;} + .d2-416346713 .stroke-B6{stroke:#F7F8FE;} + .d2-416346713 .stroke-AA2{stroke:#4A6FF3;} + .d2-416346713 .stroke-AA4{stroke:#EDF0FD;} + .d2-416346713 .stroke-AA5{stroke:#F7F8FE;} + .d2-416346713 .stroke-AB4{stroke:#EDF0FD;} + .d2-416346713 .stroke-AB5{stroke:#F7F8FE;} + .d2-416346713 .background-color-N1{background-color:#0A0F25;} + .d2-416346713 .background-color-N2{background-color:#676C7E;} + .d2-416346713 .background-color-N3{background-color:#9499AB;} + .d2-416346713 .background-color-N4{background-color:#CFD2DD;} + .d2-416346713 .background-color-N5{background-color:#DEE1EB;} + .d2-416346713 .background-color-N6{background-color:#EEF1F8;} + .d2-416346713 .background-color-N7{background-color:#FFFFFF;} + .d2-416346713 .background-color-B1{background-color:#0D32B2;} + .d2-416346713 .background-color-B2{background-color:#0D32B2;} + .d2-416346713 .background-color-B3{background-color:#E3E9FD;} + .d2-416346713 .background-color-B4{background-color:#E3E9FD;} + .d2-416346713 .background-color-B5{background-color:#EDF0FD;} + .d2-416346713 .background-color-B6{background-color:#F7F8FE;} + .d2-416346713 .background-color-AA2{background-color:#4A6FF3;} + .d2-416346713 .background-color-AA4{background-color:#EDF0FD;} + .d2-416346713 .background-color-AA5{background-color:#F7F8FE;} + .d2-416346713 .background-color-AB4{background-color:#EDF0FD;} + .d2-416346713 .background-color-AB5{background-color:#F7F8FE;} + .d2-416346713 .color-N1{color:#0A0F25;} + .d2-416346713 .color-N2{color:#676C7E;} + .d2-416346713 .color-N3{color:#9499AB;} + .d2-416346713 .color-N4{color:#CFD2DD;} + .d2-416346713 .color-N5{color:#DEE1EB;} + .d2-416346713 .color-N6{color:#EEF1F8;} + .d2-416346713 .color-N7{color:#FFFFFF;} + .d2-416346713 .color-B1{color:#0D32B2;} + .d2-416346713 .color-B2{color:#0D32B2;} + .d2-416346713 .color-B3{color:#E3E9FD;} + .d2-416346713 .color-B4{color:#E3E9FD;} + .d2-416346713 .color-B5{color:#EDF0FD;} + .d2-416346713 .color-B6{color:#F7F8FE;} + .d2-416346713 .color-AA2{color:#4A6FF3;} + .d2-416346713 .color-AA4{color:#EDF0FD;} + .d2-416346713 .color-AA5{color:#F7F8FE;} + .d2-416346713 .color-AB4{color:#EDF0FD;} + .d2-416346713 .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}]]>Humor in the CourtCould you see him from where you were standing?I could see his head.And where was his head?Just above his shoulders.Humor in the Court2Could you see him from where you were standing?I could see his head.And where was his head?Just above his shoulders.BatchManager-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voidBatchManager-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)void \ No newline at end of file diff --git a/e2etests/testdata/stable/sql_table_tooltip_animated/dagre/board.exp.json b/e2etests/testdata/stable/sql_table_tooltip_animated/dagre/board.exp.json index 9e4967a4c..24914b479 100644 --- a/e2etests/testdata/stable/sql_table_tooltip_animated/dagre/board.exp.json +++ b/e2etests/testdata/stable/sql_table_tooltip_animated/dagre/board.exp.json @@ -55,7 +55,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": null, + "constraint": "", "reference": "" } ], @@ -127,7 +127,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": null, + "constraint": "", "reference": "" } ], diff --git a/e2etests/testdata/stable/sql_table_tooltip_animated/dagre/sketch.exp.svg b/e2etests/testdata/stable/sql_table_tooltip_animated/dagre/sketch.exp.svg index 8b5037ed1..b8b8c9bbf 100644 --- a/e2etests/testdata/stable/sql_table_tooltip_animated/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sql_table_tooltip_animated/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -xy + .d2-3234620565 .fill-N1{fill:#0A0F25;} + .d2-3234620565 .fill-N2{fill:#676C7E;} + .d2-3234620565 .fill-N3{fill:#9499AB;} + .d2-3234620565 .fill-N4{fill:#CFD2DD;} + .d2-3234620565 .fill-N5{fill:#DEE1EB;} + .d2-3234620565 .fill-N6{fill:#EEF1F8;} + .d2-3234620565 .fill-N7{fill:#FFFFFF;} + .d2-3234620565 .fill-B1{fill:#0D32B2;} + .d2-3234620565 .fill-B2{fill:#0D32B2;} + .d2-3234620565 .fill-B3{fill:#E3E9FD;} + .d2-3234620565 .fill-B4{fill:#E3E9FD;} + .d2-3234620565 .fill-B5{fill:#EDF0FD;} + .d2-3234620565 .fill-B6{fill:#F7F8FE;} + .d2-3234620565 .fill-AA2{fill:#4A6FF3;} + .d2-3234620565 .fill-AA4{fill:#EDF0FD;} + .d2-3234620565 .fill-AA5{fill:#F7F8FE;} + .d2-3234620565 .fill-AB4{fill:#EDF0FD;} + .d2-3234620565 .fill-AB5{fill:#F7F8FE;} + .d2-3234620565 .stroke-N1{stroke:#0A0F25;} + .d2-3234620565 .stroke-N2{stroke:#676C7E;} + .d2-3234620565 .stroke-N3{stroke:#9499AB;} + .d2-3234620565 .stroke-N4{stroke:#CFD2DD;} + .d2-3234620565 .stroke-N5{stroke:#DEE1EB;} + .d2-3234620565 .stroke-N6{stroke:#EEF1F8;} + .d2-3234620565 .stroke-N7{stroke:#FFFFFF;} + .d2-3234620565 .stroke-B1{stroke:#0D32B2;} + .d2-3234620565 .stroke-B2{stroke:#0D32B2;} + .d2-3234620565 .stroke-B3{stroke:#E3E9FD;} + .d2-3234620565 .stroke-B4{stroke:#E3E9FD;} + .d2-3234620565 .stroke-B5{stroke:#EDF0FD;} + .d2-3234620565 .stroke-B6{stroke:#F7F8FE;} + .d2-3234620565 .stroke-AA2{stroke:#4A6FF3;} + .d2-3234620565 .stroke-AA4{stroke:#EDF0FD;} + .d2-3234620565 .stroke-AA5{stroke:#F7F8FE;} + .d2-3234620565 .stroke-AB4{stroke:#EDF0FD;} + .d2-3234620565 .stroke-AB5{stroke:#F7F8FE;} + .d2-3234620565 .background-color-N1{background-color:#0A0F25;} + .d2-3234620565 .background-color-N2{background-color:#676C7E;} + .d2-3234620565 .background-color-N3{background-color:#9499AB;} + .d2-3234620565 .background-color-N4{background-color:#CFD2DD;} + .d2-3234620565 .background-color-N5{background-color:#DEE1EB;} + .d2-3234620565 .background-color-N6{background-color:#EEF1F8;} + .d2-3234620565 .background-color-N7{background-color:#FFFFFF;} + .d2-3234620565 .background-color-B1{background-color:#0D32B2;} + .d2-3234620565 .background-color-B2{background-color:#0D32B2;} + .d2-3234620565 .background-color-B3{background-color:#E3E9FD;} + .d2-3234620565 .background-color-B4{background-color:#E3E9FD;} + .d2-3234620565 .background-color-B5{background-color:#EDF0FD;} + .d2-3234620565 .background-color-B6{background-color:#F7F8FE;} + .d2-3234620565 .background-color-AA2{background-color:#4A6FF3;} + .d2-3234620565 .background-color-AA4{background-color:#EDF0FD;} + .d2-3234620565 .background-color-AA5{background-color:#F7F8FE;} + .d2-3234620565 .background-color-AB4{background-color:#EDF0FD;} + .d2-3234620565 .background-color-AB5{background-color:#F7F8FE;} + .d2-3234620565 .color-N1{color:#0A0F25;} + .d2-3234620565 .color-N2{color:#676C7E;} + .d2-3234620565 .color-N3{color:#9499AB;} + .d2-3234620565 .color-N4{color:#CFD2DD;} + .d2-3234620565 .color-N5{color:#DEE1EB;} + .d2-3234620565 .color-N6{color:#EEF1F8;} + .d2-3234620565 .color-N7{color:#FFFFFF;} + .d2-3234620565 .color-B1{color:#0D32B2;} + .d2-3234620565 .color-B2{color:#0D32B2;} + .d2-3234620565 .color-B3{color:#E3E9FD;} + .d2-3234620565 .color-B4{color:#E3E9FD;} + .d2-3234620565 .color-B5{color:#EDF0FD;} + .d2-3234620565 .color-B6{color:#F7F8FE;} + .d2-3234620565 .color-AA2{color:#4A6FF3;} + .d2-3234620565 .color-AA4{color:#EDF0FD;} + .d2-3234620565 .color-AA5{color:#F7F8FE;} + .d2-3234620565 .color-AB4{color:#EDF0FD;} + .d2-3234620565 .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}]]>xy @@ -111,7 +111,7 @@ -I like turtlesab +I like turtlesab \ No newline at end of file diff --git a/e2etests/testdata/stable/sql_table_tooltip_animated/elk/board.exp.json b/e2etests/testdata/stable/sql_table_tooltip_animated/elk/board.exp.json index 613062453..196665d6c 100644 --- a/e2etests/testdata/stable/sql_table_tooltip_animated/elk/board.exp.json +++ b/e2etests/testdata/stable/sql_table_tooltip_animated/elk/board.exp.json @@ -55,7 +55,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": null, + "constraint": "", "reference": "" } ], @@ -127,7 +127,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": null, + "constraint": "", "reference": "" } ], diff --git a/e2etests/testdata/stable/sql_table_tooltip_animated/elk/sketch.exp.svg b/e2etests/testdata/stable/sql_table_tooltip_animated/elk/sketch.exp.svg index a44e7991e..dde79e6fa 100644 --- a/e2etests/testdata/stable/sql_table_tooltip_animated/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sql_table_tooltip_animated/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -xy + .d2-4177879266 .fill-N1{fill:#0A0F25;} + .d2-4177879266 .fill-N2{fill:#676C7E;} + .d2-4177879266 .fill-N3{fill:#9499AB;} + .d2-4177879266 .fill-N4{fill:#CFD2DD;} + .d2-4177879266 .fill-N5{fill:#DEE1EB;} + .d2-4177879266 .fill-N6{fill:#EEF1F8;} + .d2-4177879266 .fill-N7{fill:#FFFFFF;} + .d2-4177879266 .fill-B1{fill:#0D32B2;} + .d2-4177879266 .fill-B2{fill:#0D32B2;} + .d2-4177879266 .fill-B3{fill:#E3E9FD;} + .d2-4177879266 .fill-B4{fill:#E3E9FD;} + .d2-4177879266 .fill-B5{fill:#EDF0FD;} + .d2-4177879266 .fill-B6{fill:#F7F8FE;} + .d2-4177879266 .fill-AA2{fill:#4A6FF3;} + .d2-4177879266 .fill-AA4{fill:#EDF0FD;} + .d2-4177879266 .fill-AA5{fill:#F7F8FE;} + .d2-4177879266 .fill-AB4{fill:#EDF0FD;} + .d2-4177879266 .fill-AB5{fill:#F7F8FE;} + .d2-4177879266 .stroke-N1{stroke:#0A0F25;} + .d2-4177879266 .stroke-N2{stroke:#676C7E;} + .d2-4177879266 .stroke-N3{stroke:#9499AB;} + .d2-4177879266 .stroke-N4{stroke:#CFD2DD;} + .d2-4177879266 .stroke-N5{stroke:#DEE1EB;} + .d2-4177879266 .stroke-N6{stroke:#EEF1F8;} + .d2-4177879266 .stroke-N7{stroke:#FFFFFF;} + .d2-4177879266 .stroke-B1{stroke:#0D32B2;} + .d2-4177879266 .stroke-B2{stroke:#0D32B2;} + .d2-4177879266 .stroke-B3{stroke:#E3E9FD;} + .d2-4177879266 .stroke-B4{stroke:#E3E9FD;} + .d2-4177879266 .stroke-B5{stroke:#EDF0FD;} + .d2-4177879266 .stroke-B6{stroke:#F7F8FE;} + .d2-4177879266 .stroke-AA2{stroke:#4A6FF3;} + .d2-4177879266 .stroke-AA4{stroke:#EDF0FD;} + .d2-4177879266 .stroke-AA5{stroke:#F7F8FE;} + .d2-4177879266 .stroke-AB4{stroke:#EDF0FD;} + .d2-4177879266 .stroke-AB5{stroke:#F7F8FE;} + .d2-4177879266 .background-color-N1{background-color:#0A0F25;} + .d2-4177879266 .background-color-N2{background-color:#676C7E;} + .d2-4177879266 .background-color-N3{background-color:#9499AB;} + .d2-4177879266 .background-color-N4{background-color:#CFD2DD;} + .d2-4177879266 .background-color-N5{background-color:#DEE1EB;} + .d2-4177879266 .background-color-N6{background-color:#EEF1F8;} + .d2-4177879266 .background-color-N7{background-color:#FFFFFF;} + .d2-4177879266 .background-color-B1{background-color:#0D32B2;} + .d2-4177879266 .background-color-B2{background-color:#0D32B2;} + .d2-4177879266 .background-color-B3{background-color:#E3E9FD;} + .d2-4177879266 .background-color-B4{background-color:#E3E9FD;} + .d2-4177879266 .background-color-B5{background-color:#EDF0FD;} + .d2-4177879266 .background-color-B6{background-color:#F7F8FE;} + .d2-4177879266 .background-color-AA2{background-color:#4A6FF3;} + .d2-4177879266 .background-color-AA4{background-color:#EDF0FD;} + .d2-4177879266 .background-color-AA5{background-color:#F7F8FE;} + .d2-4177879266 .background-color-AB4{background-color:#EDF0FD;} + .d2-4177879266 .background-color-AB5{background-color:#F7F8FE;} + .d2-4177879266 .color-N1{color:#0A0F25;} + .d2-4177879266 .color-N2{color:#676C7E;} + .d2-4177879266 .color-N3{color:#9499AB;} + .d2-4177879266 .color-N4{color:#CFD2DD;} + .d2-4177879266 .color-N5{color:#DEE1EB;} + .d2-4177879266 .color-N6{color:#EEF1F8;} + .d2-4177879266 .color-N7{color:#FFFFFF;} + .d2-4177879266 .color-B1{color:#0D32B2;} + .d2-4177879266 .color-B2{color:#0D32B2;} + .d2-4177879266 .color-B3{color:#E3E9FD;} + .d2-4177879266 .color-B4{color:#E3E9FD;} + .d2-4177879266 .color-B5{color:#EDF0FD;} + .d2-4177879266 .color-B6{color:#F7F8FE;} + .d2-4177879266 .color-AA2{color:#4A6FF3;} + .d2-4177879266 .color-AA4{color:#EDF0FD;} + .d2-4177879266 .color-AA5{color:#F7F8FE;} + .d2-4177879266 .color-AB4{color:#EDF0FD;} + .d2-4177879266 .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}]]>xy @@ -111,7 +111,7 @@ -I like turtlesab +I like turtlesab \ No newline at end of file diff --git a/e2etests/testdata/stable/sql_tables/dagre/board.exp.json b/e2etests/testdata/stable/sql_tables/dagre/board.exp.json index 3a9f9f9ef..581e46023 100644 --- a/e2etests/testdata/stable/sql_tables/dagre/board.exp.json +++ b/e2etests/testdata/stable/sql_tables/dagre/board.exp.json @@ -55,7 +55,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -83,7 +83,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -111,7 +111,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -139,7 +139,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -167,9 +167,7 @@ "labelWidth": 77, "labelHeight": 26 }, - "constraint": [ - "primary_key" - ], + "constraint": "primary_key", "reference": "" } ], @@ -241,7 +239,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -269,7 +267,7 @@ "labelWidth": 67, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -297,7 +295,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -325,7 +323,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" } ], @@ -397,7 +395,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -425,7 +423,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -453,7 +451,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" } ], @@ -525,7 +523,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -553,7 +551,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -581,7 +579,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -609,7 +607,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" } ], diff --git a/e2etests/testdata/stable/sql_tables/dagre/sketch.exp.svg b/e2etests/testdata/stable/sql_tables/dagre/sketch.exp.svg index c9995c79b..81f940f21 100644 --- a/e2etests/testdata/stable/sql_tables/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sql_tables/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -usersidintnamestringemailstringpasswordstringlast_logindatetimePKproductsidintpricedecimalskustringnamestringordersidintuser_idintproduct_idintshipmentsidintorder_idinttracking_numberstringstatusstring + .d2-2921966909 .fill-N1{fill:#0A0F25;} + .d2-2921966909 .fill-N2{fill:#676C7E;} + .d2-2921966909 .fill-N3{fill:#9499AB;} + .d2-2921966909 .fill-N4{fill:#CFD2DD;} + .d2-2921966909 .fill-N5{fill:#DEE1EB;} + .d2-2921966909 .fill-N6{fill:#EEF1F8;} + .d2-2921966909 .fill-N7{fill:#FFFFFF;} + .d2-2921966909 .fill-B1{fill:#0D32B2;} + .d2-2921966909 .fill-B2{fill:#0D32B2;} + .d2-2921966909 .fill-B3{fill:#E3E9FD;} + .d2-2921966909 .fill-B4{fill:#E3E9FD;} + .d2-2921966909 .fill-B5{fill:#EDF0FD;} + .d2-2921966909 .fill-B6{fill:#F7F8FE;} + .d2-2921966909 .fill-AA2{fill:#4A6FF3;} + .d2-2921966909 .fill-AA4{fill:#EDF0FD;} + .d2-2921966909 .fill-AA5{fill:#F7F8FE;} + .d2-2921966909 .fill-AB4{fill:#EDF0FD;} + .d2-2921966909 .fill-AB5{fill:#F7F8FE;} + .d2-2921966909 .stroke-N1{stroke:#0A0F25;} + .d2-2921966909 .stroke-N2{stroke:#676C7E;} + .d2-2921966909 .stroke-N3{stroke:#9499AB;} + .d2-2921966909 .stroke-N4{stroke:#CFD2DD;} + .d2-2921966909 .stroke-N5{stroke:#DEE1EB;} + .d2-2921966909 .stroke-N6{stroke:#EEF1F8;} + .d2-2921966909 .stroke-N7{stroke:#FFFFFF;} + .d2-2921966909 .stroke-B1{stroke:#0D32B2;} + .d2-2921966909 .stroke-B2{stroke:#0D32B2;} + .d2-2921966909 .stroke-B3{stroke:#E3E9FD;} + .d2-2921966909 .stroke-B4{stroke:#E3E9FD;} + .d2-2921966909 .stroke-B5{stroke:#EDF0FD;} + .d2-2921966909 .stroke-B6{stroke:#F7F8FE;} + .d2-2921966909 .stroke-AA2{stroke:#4A6FF3;} + .d2-2921966909 .stroke-AA4{stroke:#EDF0FD;} + .d2-2921966909 .stroke-AA5{stroke:#F7F8FE;} + .d2-2921966909 .stroke-AB4{stroke:#EDF0FD;} + .d2-2921966909 .stroke-AB5{stroke:#F7F8FE;} + .d2-2921966909 .background-color-N1{background-color:#0A0F25;} + .d2-2921966909 .background-color-N2{background-color:#676C7E;} + .d2-2921966909 .background-color-N3{background-color:#9499AB;} + .d2-2921966909 .background-color-N4{background-color:#CFD2DD;} + .d2-2921966909 .background-color-N5{background-color:#DEE1EB;} + .d2-2921966909 .background-color-N6{background-color:#EEF1F8;} + .d2-2921966909 .background-color-N7{background-color:#FFFFFF;} + .d2-2921966909 .background-color-B1{background-color:#0D32B2;} + .d2-2921966909 .background-color-B2{background-color:#0D32B2;} + .d2-2921966909 .background-color-B3{background-color:#E3E9FD;} + .d2-2921966909 .background-color-B4{background-color:#E3E9FD;} + .d2-2921966909 .background-color-B5{background-color:#EDF0FD;} + .d2-2921966909 .background-color-B6{background-color:#F7F8FE;} + .d2-2921966909 .background-color-AA2{background-color:#4A6FF3;} + .d2-2921966909 .background-color-AA4{background-color:#EDF0FD;} + .d2-2921966909 .background-color-AA5{background-color:#F7F8FE;} + .d2-2921966909 .background-color-AB4{background-color:#EDF0FD;} + .d2-2921966909 .background-color-AB5{background-color:#F7F8FE;} + .d2-2921966909 .color-N1{color:#0A0F25;} + .d2-2921966909 .color-N2{color:#676C7E;} + .d2-2921966909 .color-N3{color:#9499AB;} + .d2-2921966909 .color-N4{color:#CFD2DD;} + .d2-2921966909 .color-N5{color:#DEE1EB;} + .d2-2921966909 .color-N6{color:#EEF1F8;} + .d2-2921966909 .color-N7{color:#FFFFFF;} + .d2-2921966909 .color-B1{color:#0D32B2;} + .d2-2921966909 .color-B2{color:#0D32B2;} + .d2-2921966909 .color-B3{color:#E3E9FD;} + .d2-2921966909 .color-B4{color:#E3E9FD;} + .d2-2921966909 .color-B5{color:#EDF0FD;} + .d2-2921966909 .color-B6{color:#F7F8FE;} + .d2-2921966909 .color-AA2{color:#4A6FF3;} + .d2-2921966909 .color-AA4{color:#EDF0FD;} + .d2-2921966909 .color-AA5{color:#F7F8FE;} + .d2-2921966909 .color-AB4{color:#EDF0FD;} + .d2-2921966909 .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}]]>usersidintnamestringemailstringpasswordstringlast_logindatetimePKproductsidintpricedecimalskustringnamestringordersidintuser_idintproduct_idintshipmentsidintorder_idinttracking_numberstringstatusstring \ No newline at end of file diff --git a/e2etests/testdata/stable/sql_tables/elk/board.exp.json b/e2etests/testdata/stable/sql_tables/elk/board.exp.json index 2915e1b47..286573e69 100644 --- a/e2etests/testdata/stable/sql_tables/elk/board.exp.json +++ b/e2etests/testdata/stable/sql_tables/elk/board.exp.json @@ -55,7 +55,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -83,7 +83,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -111,7 +111,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -139,7 +139,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -167,9 +167,7 @@ "labelWidth": 77, "labelHeight": 26 }, - "constraint": [ - "primary_key" - ], + "constraint": "primary_key", "reference": "" } ], @@ -241,7 +239,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -269,7 +267,7 @@ "labelWidth": 67, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -297,7 +295,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -325,7 +323,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" } ], @@ -397,7 +395,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -425,7 +423,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -453,7 +451,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" } ], @@ -525,7 +523,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -553,7 +551,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -581,7 +579,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -609,7 +607,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" } ], diff --git a/e2etests/testdata/stable/sql_tables/elk/sketch.exp.svg b/e2etests/testdata/stable/sql_tables/elk/sketch.exp.svg index 5644330b9..8a5e91dab 100644 --- a/e2etests/testdata/stable/sql_tables/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sql_tables/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -usersidintnamestringemailstringpasswordstringlast_logindatetimePKproductsidintpricedecimalskustringnamestringordersidintuser_idintproduct_idintshipmentsidintorder_idinttracking_numberstringstatusstring + .d2-4158298870 .fill-N1{fill:#0A0F25;} + .d2-4158298870 .fill-N2{fill:#676C7E;} + .d2-4158298870 .fill-N3{fill:#9499AB;} + .d2-4158298870 .fill-N4{fill:#CFD2DD;} + .d2-4158298870 .fill-N5{fill:#DEE1EB;} + .d2-4158298870 .fill-N6{fill:#EEF1F8;} + .d2-4158298870 .fill-N7{fill:#FFFFFF;} + .d2-4158298870 .fill-B1{fill:#0D32B2;} + .d2-4158298870 .fill-B2{fill:#0D32B2;} + .d2-4158298870 .fill-B3{fill:#E3E9FD;} + .d2-4158298870 .fill-B4{fill:#E3E9FD;} + .d2-4158298870 .fill-B5{fill:#EDF0FD;} + .d2-4158298870 .fill-B6{fill:#F7F8FE;} + .d2-4158298870 .fill-AA2{fill:#4A6FF3;} + .d2-4158298870 .fill-AA4{fill:#EDF0FD;} + .d2-4158298870 .fill-AA5{fill:#F7F8FE;} + .d2-4158298870 .fill-AB4{fill:#EDF0FD;} + .d2-4158298870 .fill-AB5{fill:#F7F8FE;} + .d2-4158298870 .stroke-N1{stroke:#0A0F25;} + .d2-4158298870 .stroke-N2{stroke:#676C7E;} + .d2-4158298870 .stroke-N3{stroke:#9499AB;} + .d2-4158298870 .stroke-N4{stroke:#CFD2DD;} + .d2-4158298870 .stroke-N5{stroke:#DEE1EB;} + .d2-4158298870 .stroke-N6{stroke:#EEF1F8;} + .d2-4158298870 .stroke-N7{stroke:#FFFFFF;} + .d2-4158298870 .stroke-B1{stroke:#0D32B2;} + .d2-4158298870 .stroke-B2{stroke:#0D32B2;} + .d2-4158298870 .stroke-B3{stroke:#E3E9FD;} + .d2-4158298870 .stroke-B4{stroke:#E3E9FD;} + .d2-4158298870 .stroke-B5{stroke:#EDF0FD;} + .d2-4158298870 .stroke-B6{stroke:#F7F8FE;} + .d2-4158298870 .stroke-AA2{stroke:#4A6FF3;} + .d2-4158298870 .stroke-AA4{stroke:#EDF0FD;} + .d2-4158298870 .stroke-AA5{stroke:#F7F8FE;} + .d2-4158298870 .stroke-AB4{stroke:#EDF0FD;} + .d2-4158298870 .stroke-AB5{stroke:#F7F8FE;} + .d2-4158298870 .background-color-N1{background-color:#0A0F25;} + .d2-4158298870 .background-color-N2{background-color:#676C7E;} + .d2-4158298870 .background-color-N3{background-color:#9499AB;} + .d2-4158298870 .background-color-N4{background-color:#CFD2DD;} + .d2-4158298870 .background-color-N5{background-color:#DEE1EB;} + .d2-4158298870 .background-color-N6{background-color:#EEF1F8;} + .d2-4158298870 .background-color-N7{background-color:#FFFFFF;} + .d2-4158298870 .background-color-B1{background-color:#0D32B2;} + .d2-4158298870 .background-color-B2{background-color:#0D32B2;} + .d2-4158298870 .background-color-B3{background-color:#E3E9FD;} + .d2-4158298870 .background-color-B4{background-color:#E3E9FD;} + .d2-4158298870 .background-color-B5{background-color:#EDF0FD;} + .d2-4158298870 .background-color-B6{background-color:#F7F8FE;} + .d2-4158298870 .background-color-AA2{background-color:#4A6FF3;} + .d2-4158298870 .background-color-AA4{background-color:#EDF0FD;} + .d2-4158298870 .background-color-AA5{background-color:#F7F8FE;} + .d2-4158298870 .background-color-AB4{background-color:#EDF0FD;} + .d2-4158298870 .background-color-AB5{background-color:#F7F8FE;} + .d2-4158298870 .color-N1{color:#0A0F25;} + .d2-4158298870 .color-N2{color:#676C7E;} + .d2-4158298870 .color-N3{color:#9499AB;} + .d2-4158298870 .color-N4{color:#CFD2DD;} + .d2-4158298870 .color-N5{color:#DEE1EB;} + .d2-4158298870 .color-N6{color:#EEF1F8;} + .d2-4158298870 .color-N7{color:#FFFFFF;} + .d2-4158298870 .color-B1{color:#0D32B2;} + .d2-4158298870 .color-B2{color:#0D32B2;} + .d2-4158298870 .color-B3{color:#E3E9FD;} + .d2-4158298870 .color-B4{color:#E3E9FD;} + .d2-4158298870 .color-B5{color:#EDF0FD;} + .d2-4158298870 .color-B6{color:#F7F8FE;} + .d2-4158298870 .color-AA2{color:#4A6FF3;} + .d2-4158298870 .color-AA4{color:#EDF0FD;} + .d2-4158298870 .color-AA5{color:#F7F8FE;} + .d2-4158298870 .color-AB4{color:#EDF0FD;} + .d2-4158298870 .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}]]>usersidintnamestringemailstringpasswordstringlast_logindatetimePKproductsidintpricedecimalskustringnamestringordersidintuser_idintproduct_idintshipmentsidintorder_idinttracking_numberstringstatusstring \ No newline at end of file diff --git a/e2etests/testdata/stable/unnamed_only_height/dagre/board.exp.json b/e2etests/testdata/stable/unnamed_only_height/dagre/board.exp.json index 362c4f342..75d93d051 100644 --- a/e2etests/testdata/stable/unnamed_only_height/dagre/board.exp.json +++ b/e2etests/testdata/stable/unnamed_only_height/dagre/board.exp.json @@ -130,7 +130,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -158,7 +158,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -186,7 +186,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -214,7 +214,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -242,7 +242,7 @@ "labelWidth": 77, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" } ], diff --git a/e2etests/testdata/stable/unnamed_only_height/dagre/sketch.exp.svg b/e2etests/testdata/stable/unnamed_only_height/dagre/sketch.exp.svg index 736a400fe..89a1bbd71 100644 --- a/e2etests/testdata/stable/unnamed_only_height/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/unnamed_only_height/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ --numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetimea := 5 + .d2-3275356935 .fill-N1{fill:#0A0F25;} + .d2-3275356935 .fill-N2{fill:#676C7E;} + .d2-3275356935 .fill-N3{fill:#9499AB;} + .d2-3275356935 .fill-N4{fill:#CFD2DD;} + .d2-3275356935 .fill-N5{fill:#DEE1EB;} + .d2-3275356935 .fill-N6{fill:#EEF1F8;} + .d2-3275356935 .fill-N7{fill:#FFFFFF;} + .d2-3275356935 .fill-B1{fill:#0D32B2;} + .d2-3275356935 .fill-B2{fill:#0D32B2;} + .d2-3275356935 .fill-B3{fill:#E3E9FD;} + .d2-3275356935 .fill-B4{fill:#E3E9FD;} + .d2-3275356935 .fill-B5{fill:#EDF0FD;} + .d2-3275356935 .fill-B6{fill:#F7F8FE;} + .d2-3275356935 .fill-AA2{fill:#4A6FF3;} + .d2-3275356935 .fill-AA4{fill:#EDF0FD;} + .d2-3275356935 .fill-AA5{fill:#F7F8FE;} + .d2-3275356935 .fill-AB4{fill:#EDF0FD;} + .d2-3275356935 .fill-AB5{fill:#F7F8FE;} + .d2-3275356935 .stroke-N1{stroke:#0A0F25;} + .d2-3275356935 .stroke-N2{stroke:#676C7E;} + .d2-3275356935 .stroke-N3{stroke:#9499AB;} + .d2-3275356935 .stroke-N4{stroke:#CFD2DD;} + .d2-3275356935 .stroke-N5{stroke:#DEE1EB;} + .d2-3275356935 .stroke-N6{stroke:#EEF1F8;} + .d2-3275356935 .stroke-N7{stroke:#FFFFFF;} + .d2-3275356935 .stroke-B1{stroke:#0D32B2;} + .d2-3275356935 .stroke-B2{stroke:#0D32B2;} + .d2-3275356935 .stroke-B3{stroke:#E3E9FD;} + .d2-3275356935 .stroke-B4{stroke:#E3E9FD;} + .d2-3275356935 .stroke-B5{stroke:#EDF0FD;} + .d2-3275356935 .stroke-B6{stroke:#F7F8FE;} + .d2-3275356935 .stroke-AA2{stroke:#4A6FF3;} + .d2-3275356935 .stroke-AA4{stroke:#EDF0FD;} + .d2-3275356935 .stroke-AA5{stroke:#F7F8FE;} + .d2-3275356935 .stroke-AB4{stroke:#EDF0FD;} + .d2-3275356935 .stroke-AB5{stroke:#F7F8FE;} + .d2-3275356935 .background-color-N1{background-color:#0A0F25;} + .d2-3275356935 .background-color-N2{background-color:#676C7E;} + .d2-3275356935 .background-color-N3{background-color:#9499AB;} + .d2-3275356935 .background-color-N4{background-color:#CFD2DD;} + .d2-3275356935 .background-color-N5{background-color:#DEE1EB;} + .d2-3275356935 .background-color-N6{background-color:#EEF1F8;} + .d2-3275356935 .background-color-N7{background-color:#FFFFFF;} + .d2-3275356935 .background-color-B1{background-color:#0D32B2;} + .d2-3275356935 .background-color-B2{background-color:#0D32B2;} + .d2-3275356935 .background-color-B3{background-color:#E3E9FD;} + .d2-3275356935 .background-color-B4{background-color:#E3E9FD;} + .d2-3275356935 .background-color-B5{background-color:#EDF0FD;} + .d2-3275356935 .background-color-B6{background-color:#F7F8FE;} + .d2-3275356935 .background-color-AA2{background-color:#4A6FF3;} + .d2-3275356935 .background-color-AA4{background-color:#EDF0FD;} + .d2-3275356935 .background-color-AA5{background-color:#F7F8FE;} + .d2-3275356935 .background-color-AB4{background-color:#EDF0FD;} + .d2-3275356935 .background-color-AB5{background-color:#F7F8FE;} + .d2-3275356935 .color-N1{color:#0A0F25;} + .d2-3275356935 .color-N2{color:#676C7E;} + .d2-3275356935 .color-N3{color:#9499AB;} + .d2-3275356935 .color-N4{color:#CFD2DD;} + .d2-3275356935 .color-N5{color:#DEE1EB;} + .d2-3275356935 .color-N6{color:#EEF1F8;} + .d2-3275356935 .color-N7{color:#FFFFFF;} + .d2-3275356935 .color-B1{color:#0D32B2;} + .d2-3275356935 .color-B2{color:#0D32B2;} + .d2-3275356935 .color-B3{color:#E3E9FD;} + .d2-3275356935 .color-B4{color:#E3E9FD;} + .d2-3275356935 .color-B5{color:#EDF0FD;} + .d2-3275356935 .color-B6{color:#F7F8FE;} + .d2-3275356935 .color-AA2{color:#4A6FF3;} + .d2-3275356935 .color-AA4{color:#EDF0FD;} + .d2-3275356935 .color-AA5{color:#F7F8FE;} + .d2-3275356935 .color-AB4{color:#EDF0FD;} + .d2-3275356935 .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}]]>-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetimea := 5 b := a + 7 fmt.Printf("%d", b)a := 5 b := a + 7 -fmt.Printf("%d", b) +fmt.Printf("%d", b) \ No newline at end of file diff --git a/e2etests/testdata/stable/unnamed_only_height/elk/board.exp.json b/e2etests/testdata/stable/unnamed_only_height/elk/board.exp.json index b4c0804d3..93804d206 100644 --- a/e2etests/testdata/stable/unnamed_only_height/elk/board.exp.json +++ b/e2etests/testdata/stable/unnamed_only_height/elk/board.exp.json @@ -130,7 +130,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -158,7 +158,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -186,7 +186,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -214,7 +214,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -242,7 +242,7 @@ "labelWidth": 77, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" } ], diff --git a/e2etests/testdata/stable/unnamed_only_height/elk/sketch.exp.svg b/e2etests/testdata/stable/unnamed_only_height/elk/sketch.exp.svg index 1b28eb69d..1b7ba0dd3 100644 --- a/e2etests/testdata/stable/unnamed_only_height/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/unnamed_only_height/elk/sketch.exp.svg @@ -1,23 +1,23 @@ --numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetimea := 5 + .d2-1058406674 .fill-N1{fill:#0A0F25;} + .d2-1058406674 .fill-N2{fill:#676C7E;} + .d2-1058406674 .fill-N3{fill:#9499AB;} + .d2-1058406674 .fill-N4{fill:#CFD2DD;} + .d2-1058406674 .fill-N5{fill:#DEE1EB;} + .d2-1058406674 .fill-N6{fill:#EEF1F8;} + .d2-1058406674 .fill-N7{fill:#FFFFFF;} + .d2-1058406674 .fill-B1{fill:#0D32B2;} + .d2-1058406674 .fill-B2{fill:#0D32B2;} + .d2-1058406674 .fill-B3{fill:#E3E9FD;} + .d2-1058406674 .fill-B4{fill:#E3E9FD;} + .d2-1058406674 .fill-B5{fill:#EDF0FD;} + .d2-1058406674 .fill-B6{fill:#F7F8FE;} + .d2-1058406674 .fill-AA2{fill:#4A6FF3;} + .d2-1058406674 .fill-AA4{fill:#EDF0FD;} + .d2-1058406674 .fill-AA5{fill:#F7F8FE;} + .d2-1058406674 .fill-AB4{fill:#EDF0FD;} + .d2-1058406674 .fill-AB5{fill:#F7F8FE;} + .d2-1058406674 .stroke-N1{stroke:#0A0F25;} + .d2-1058406674 .stroke-N2{stroke:#676C7E;} + .d2-1058406674 .stroke-N3{stroke:#9499AB;} + .d2-1058406674 .stroke-N4{stroke:#CFD2DD;} + .d2-1058406674 .stroke-N5{stroke:#DEE1EB;} + .d2-1058406674 .stroke-N6{stroke:#EEF1F8;} + .d2-1058406674 .stroke-N7{stroke:#FFFFFF;} + .d2-1058406674 .stroke-B1{stroke:#0D32B2;} + .d2-1058406674 .stroke-B2{stroke:#0D32B2;} + .d2-1058406674 .stroke-B3{stroke:#E3E9FD;} + .d2-1058406674 .stroke-B4{stroke:#E3E9FD;} + .d2-1058406674 .stroke-B5{stroke:#EDF0FD;} + .d2-1058406674 .stroke-B6{stroke:#F7F8FE;} + .d2-1058406674 .stroke-AA2{stroke:#4A6FF3;} + .d2-1058406674 .stroke-AA4{stroke:#EDF0FD;} + .d2-1058406674 .stroke-AA5{stroke:#F7F8FE;} + .d2-1058406674 .stroke-AB4{stroke:#EDF0FD;} + .d2-1058406674 .stroke-AB5{stroke:#F7F8FE;} + .d2-1058406674 .background-color-N1{background-color:#0A0F25;} + .d2-1058406674 .background-color-N2{background-color:#676C7E;} + .d2-1058406674 .background-color-N3{background-color:#9499AB;} + .d2-1058406674 .background-color-N4{background-color:#CFD2DD;} + .d2-1058406674 .background-color-N5{background-color:#DEE1EB;} + .d2-1058406674 .background-color-N6{background-color:#EEF1F8;} + .d2-1058406674 .background-color-N7{background-color:#FFFFFF;} + .d2-1058406674 .background-color-B1{background-color:#0D32B2;} + .d2-1058406674 .background-color-B2{background-color:#0D32B2;} + .d2-1058406674 .background-color-B3{background-color:#E3E9FD;} + .d2-1058406674 .background-color-B4{background-color:#E3E9FD;} + .d2-1058406674 .background-color-B5{background-color:#EDF0FD;} + .d2-1058406674 .background-color-B6{background-color:#F7F8FE;} + .d2-1058406674 .background-color-AA2{background-color:#4A6FF3;} + .d2-1058406674 .background-color-AA4{background-color:#EDF0FD;} + .d2-1058406674 .background-color-AA5{background-color:#F7F8FE;} + .d2-1058406674 .background-color-AB4{background-color:#EDF0FD;} + .d2-1058406674 .background-color-AB5{background-color:#F7F8FE;} + .d2-1058406674 .color-N1{color:#0A0F25;} + .d2-1058406674 .color-N2{color:#676C7E;} + .d2-1058406674 .color-N3{color:#9499AB;} + .d2-1058406674 .color-N4{color:#CFD2DD;} + .d2-1058406674 .color-N5{color:#DEE1EB;} + .d2-1058406674 .color-N6{color:#EEF1F8;} + .d2-1058406674 .color-N7{color:#FFFFFF;} + .d2-1058406674 .color-B1{color:#0D32B2;} + .d2-1058406674 .color-B2{color:#0D32B2;} + .d2-1058406674 .color-B3{color:#E3E9FD;} + .d2-1058406674 .color-B4{color:#E3E9FD;} + .d2-1058406674 .color-B5{color:#EDF0FD;} + .d2-1058406674 .color-B6{color:#F7F8FE;} + .d2-1058406674 .color-AA2{color:#4A6FF3;} + .d2-1058406674 .color-AA4{color:#EDF0FD;} + .d2-1058406674 .color-AA5{color:#F7F8FE;} + .d2-1058406674 .color-AB4{color:#EDF0FD;} + .d2-1058406674 .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}]]>-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetimea := 5 b := a + 7 fmt.Printf("%d", b)a := 5 b := a + 7 -fmt.Printf("%d", b) +fmt.Printf("%d", b) \ No newline at end of file diff --git a/e2etests/testdata/stable/unnamed_only_width/dagre/board.exp.json b/e2etests/testdata/stable/unnamed_only_width/dagre/board.exp.json index 508c0dfda..bc19074e8 100644 --- a/e2etests/testdata/stable/unnamed_only_width/dagre/board.exp.json +++ b/e2etests/testdata/stable/unnamed_only_width/dagre/board.exp.json @@ -130,7 +130,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -158,7 +158,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -186,7 +186,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -214,7 +214,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -242,7 +242,7 @@ "labelWidth": 77, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" } ], diff --git a/e2etests/testdata/stable/unnamed_only_width/dagre/sketch.exp.svg b/e2etests/testdata/stable/unnamed_only_width/dagre/sketch.exp.svg index edc974615..504e7aae7 100644 --- a/e2etests/testdata/stable/unnamed_only_width/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/unnamed_only_width/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ --numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetimea := 5 + .d2-2871173232 .fill-N1{fill:#0A0F25;} + .d2-2871173232 .fill-N2{fill:#676C7E;} + .d2-2871173232 .fill-N3{fill:#9499AB;} + .d2-2871173232 .fill-N4{fill:#CFD2DD;} + .d2-2871173232 .fill-N5{fill:#DEE1EB;} + .d2-2871173232 .fill-N6{fill:#EEF1F8;} + .d2-2871173232 .fill-N7{fill:#FFFFFF;} + .d2-2871173232 .fill-B1{fill:#0D32B2;} + .d2-2871173232 .fill-B2{fill:#0D32B2;} + .d2-2871173232 .fill-B3{fill:#E3E9FD;} + .d2-2871173232 .fill-B4{fill:#E3E9FD;} + .d2-2871173232 .fill-B5{fill:#EDF0FD;} + .d2-2871173232 .fill-B6{fill:#F7F8FE;} + .d2-2871173232 .fill-AA2{fill:#4A6FF3;} + .d2-2871173232 .fill-AA4{fill:#EDF0FD;} + .d2-2871173232 .fill-AA5{fill:#F7F8FE;} + .d2-2871173232 .fill-AB4{fill:#EDF0FD;} + .d2-2871173232 .fill-AB5{fill:#F7F8FE;} + .d2-2871173232 .stroke-N1{stroke:#0A0F25;} + .d2-2871173232 .stroke-N2{stroke:#676C7E;} + .d2-2871173232 .stroke-N3{stroke:#9499AB;} + .d2-2871173232 .stroke-N4{stroke:#CFD2DD;} + .d2-2871173232 .stroke-N5{stroke:#DEE1EB;} + .d2-2871173232 .stroke-N6{stroke:#EEF1F8;} + .d2-2871173232 .stroke-N7{stroke:#FFFFFF;} + .d2-2871173232 .stroke-B1{stroke:#0D32B2;} + .d2-2871173232 .stroke-B2{stroke:#0D32B2;} + .d2-2871173232 .stroke-B3{stroke:#E3E9FD;} + .d2-2871173232 .stroke-B4{stroke:#E3E9FD;} + .d2-2871173232 .stroke-B5{stroke:#EDF0FD;} + .d2-2871173232 .stroke-B6{stroke:#F7F8FE;} + .d2-2871173232 .stroke-AA2{stroke:#4A6FF3;} + .d2-2871173232 .stroke-AA4{stroke:#EDF0FD;} + .d2-2871173232 .stroke-AA5{stroke:#F7F8FE;} + .d2-2871173232 .stroke-AB4{stroke:#EDF0FD;} + .d2-2871173232 .stroke-AB5{stroke:#F7F8FE;} + .d2-2871173232 .background-color-N1{background-color:#0A0F25;} + .d2-2871173232 .background-color-N2{background-color:#676C7E;} + .d2-2871173232 .background-color-N3{background-color:#9499AB;} + .d2-2871173232 .background-color-N4{background-color:#CFD2DD;} + .d2-2871173232 .background-color-N5{background-color:#DEE1EB;} + .d2-2871173232 .background-color-N6{background-color:#EEF1F8;} + .d2-2871173232 .background-color-N7{background-color:#FFFFFF;} + .d2-2871173232 .background-color-B1{background-color:#0D32B2;} + .d2-2871173232 .background-color-B2{background-color:#0D32B2;} + .d2-2871173232 .background-color-B3{background-color:#E3E9FD;} + .d2-2871173232 .background-color-B4{background-color:#E3E9FD;} + .d2-2871173232 .background-color-B5{background-color:#EDF0FD;} + .d2-2871173232 .background-color-B6{background-color:#F7F8FE;} + .d2-2871173232 .background-color-AA2{background-color:#4A6FF3;} + .d2-2871173232 .background-color-AA4{background-color:#EDF0FD;} + .d2-2871173232 .background-color-AA5{background-color:#F7F8FE;} + .d2-2871173232 .background-color-AB4{background-color:#EDF0FD;} + .d2-2871173232 .background-color-AB5{background-color:#F7F8FE;} + .d2-2871173232 .color-N1{color:#0A0F25;} + .d2-2871173232 .color-N2{color:#676C7E;} + .d2-2871173232 .color-N3{color:#9499AB;} + .d2-2871173232 .color-N4{color:#CFD2DD;} + .d2-2871173232 .color-N5{color:#DEE1EB;} + .d2-2871173232 .color-N6{color:#EEF1F8;} + .d2-2871173232 .color-N7{color:#FFFFFF;} + .d2-2871173232 .color-B1{color:#0D32B2;} + .d2-2871173232 .color-B2{color:#0D32B2;} + .d2-2871173232 .color-B3{color:#E3E9FD;} + .d2-2871173232 .color-B4{color:#E3E9FD;} + .d2-2871173232 .color-B5{color:#EDF0FD;} + .d2-2871173232 .color-B6{color:#F7F8FE;} + .d2-2871173232 .color-AA2{color:#4A6FF3;} + .d2-2871173232 .color-AA4{color:#EDF0FD;} + .d2-2871173232 .color-AA5{color:#F7F8FE;} + .d2-2871173232 .color-AB4{color:#EDF0FD;} + .d2-2871173232 .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}]]>-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetimea := 5 b := a + 7 fmt.Printf("%d", b)a := 5 b := a + 7 -fmt.Printf("%d", b) +fmt.Printf("%d", b) \ No newline at end of file diff --git a/e2etests/testdata/stable/unnamed_only_width/elk/board.exp.json b/e2etests/testdata/stable/unnamed_only_width/elk/board.exp.json index bbcdf884f..e3549a896 100644 --- a/e2etests/testdata/stable/unnamed_only_width/elk/board.exp.json +++ b/e2etests/testdata/stable/unnamed_only_width/elk/board.exp.json @@ -130,7 +130,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -158,7 +158,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -186,7 +186,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -214,7 +214,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -242,7 +242,7 @@ "labelWidth": 77, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" } ], diff --git a/e2etests/testdata/stable/unnamed_only_width/elk/sketch.exp.svg b/e2etests/testdata/stable/unnamed_only_width/elk/sketch.exp.svg index 25b46f205..33f300ff3 100644 --- a/e2etests/testdata/stable/unnamed_only_width/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/unnamed_only_width/elk/sketch.exp.svg @@ -1,23 +1,23 @@ --numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetimea := 5 + .d2-3969630496 .fill-N1{fill:#0A0F25;} + .d2-3969630496 .fill-N2{fill:#676C7E;} + .d2-3969630496 .fill-N3{fill:#9499AB;} + .d2-3969630496 .fill-N4{fill:#CFD2DD;} + .d2-3969630496 .fill-N5{fill:#DEE1EB;} + .d2-3969630496 .fill-N6{fill:#EEF1F8;} + .d2-3969630496 .fill-N7{fill:#FFFFFF;} + .d2-3969630496 .fill-B1{fill:#0D32B2;} + .d2-3969630496 .fill-B2{fill:#0D32B2;} + .d2-3969630496 .fill-B3{fill:#E3E9FD;} + .d2-3969630496 .fill-B4{fill:#E3E9FD;} + .d2-3969630496 .fill-B5{fill:#EDF0FD;} + .d2-3969630496 .fill-B6{fill:#F7F8FE;} + .d2-3969630496 .fill-AA2{fill:#4A6FF3;} + .d2-3969630496 .fill-AA4{fill:#EDF0FD;} + .d2-3969630496 .fill-AA5{fill:#F7F8FE;} + .d2-3969630496 .fill-AB4{fill:#EDF0FD;} + .d2-3969630496 .fill-AB5{fill:#F7F8FE;} + .d2-3969630496 .stroke-N1{stroke:#0A0F25;} + .d2-3969630496 .stroke-N2{stroke:#676C7E;} + .d2-3969630496 .stroke-N3{stroke:#9499AB;} + .d2-3969630496 .stroke-N4{stroke:#CFD2DD;} + .d2-3969630496 .stroke-N5{stroke:#DEE1EB;} + .d2-3969630496 .stroke-N6{stroke:#EEF1F8;} + .d2-3969630496 .stroke-N7{stroke:#FFFFFF;} + .d2-3969630496 .stroke-B1{stroke:#0D32B2;} + .d2-3969630496 .stroke-B2{stroke:#0D32B2;} + .d2-3969630496 .stroke-B3{stroke:#E3E9FD;} + .d2-3969630496 .stroke-B4{stroke:#E3E9FD;} + .d2-3969630496 .stroke-B5{stroke:#EDF0FD;} + .d2-3969630496 .stroke-B6{stroke:#F7F8FE;} + .d2-3969630496 .stroke-AA2{stroke:#4A6FF3;} + .d2-3969630496 .stroke-AA4{stroke:#EDF0FD;} + .d2-3969630496 .stroke-AA5{stroke:#F7F8FE;} + .d2-3969630496 .stroke-AB4{stroke:#EDF0FD;} + .d2-3969630496 .stroke-AB5{stroke:#F7F8FE;} + .d2-3969630496 .background-color-N1{background-color:#0A0F25;} + .d2-3969630496 .background-color-N2{background-color:#676C7E;} + .d2-3969630496 .background-color-N3{background-color:#9499AB;} + .d2-3969630496 .background-color-N4{background-color:#CFD2DD;} + .d2-3969630496 .background-color-N5{background-color:#DEE1EB;} + .d2-3969630496 .background-color-N6{background-color:#EEF1F8;} + .d2-3969630496 .background-color-N7{background-color:#FFFFFF;} + .d2-3969630496 .background-color-B1{background-color:#0D32B2;} + .d2-3969630496 .background-color-B2{background-color:#0D32B2;} + .d2-3969630496 .background-color-B3{background-color:#E3E9FD;} + .d2-3969630496 .background-color-B4{background-color:#E3E9FD;} + .d2-3969630496 .background-color-B5{background-color:#EDF0FD;} + .d2-3969630496 .background-color-B6{background-color:#F7F8FE;} + .d2-3969630496 .background-color-AA2{background-color:#4A6FF3;} + .d2-3969630496 .background-color-AA4{background-color:#EDF0FD;} + .d2-3969630496 .background-color-AA5{background-color:#F7F8FE;} + .d2-3969630496 .background-color-AB4{background-color:#EDF0FD;} + .d2-3969630496 .background-color-AB5{background-color:#F7F8FE;} + .d2-3969630496 .color-N1{color:#0A0F25;} + .d2-3969630496 .color-N2{color:#676C7E;} + .d2-3969630496 .color-N3{color:#9499AB;} + .d2-3969630496 .color-N4{color:#CFD2DD;} + .d2-3969630496 .color-N5{color:#DEE1EB;} + .d2-3969630496 .color-N6{color:#EEF1F8;} + .d2-3969630496 .color-N7{color:#FFFFFF;} + .d2-3969630496 .color-B1{color:#0D32B2;} + .d2-3969630496 .color-B2{color:#0D32B2;} + .d2-3969630496 .color-B3{color:#E3E9FD;} + .d2-3969630496 .color-B4{color:#E3E9FD;} + .d2-3969630496 .color-B5{color:#EDF0FD;} + .d2-3969630496 .color-B6{color:#F7F8FE;} + .d2-3969630496 .color-AA2{color:#4A6FF3;} + .d2-3969630496 .color-AA4{color:#EDF0FD;} + .d2-3969630496 .color-AA5{color:#F7F8FE;} + .d2-3969630496 .color-AB4{color:#EDF0FD;} + .d2-3969630496 .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}]]>-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetimea := 5 b := a + 7 fmt.Printf("%d", b)a := 5 b := a + 7 -fmt.Printf("%d", b) +fmt.Printf("%d", b) \ No newline at end of file diff --git a/e2etests/testdata/themes/dark_terrastruct_flagship/dagre/board.exp.json b/e2etests/testdata/themes/dark_terrastruct_flagship/dagre/board.exp.json index 5dc8a4ddb..dff52458e 100644 --- a/e2etests/testdata/themes/dark_terrastruct_flagship/dagre/board.exp.json +++ b/e2etests/testdata/themes/dark_terrastruct_flagship/dagre/board.exp.json @@ -506,7 +506,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -534,7 +534,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -562,7 +562,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -590,7 +590,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -618,7 +618,7 @@ "labelWidth": 77, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" } ], diff --git a/e2etests/testdata/themes/dark_terrastruct_flagship/dagre/sketch.exp.svg b/e2etests/testdata/themes/dark_terrastruct_flagship/dagre/sketch.exp.svg index 54b9ad183..4f343b627 100644 --- a/e2etests/testdata/themes/dark_terrastruct_flagship/dagre/sketch.exp.svg +++ b/e2etests/testdata/themes/dark_terrastruct_flagship/dagre/sketch.exp.svg @@ -1,41 +1,41 @@ -networkuserapi serverlogsusersidintnamestringemailstringpasswordstringlast_logindatetimeproducts+idint+pricedecimal+skustring+namestring

A tale

@@ -908,7 +908,7 @@     city2 := City{Name: "CityB", Population: 1200000}     tellTale(city1, city2) -}Cell Toweronline portaldata processorsatellitesTRANSMITTERuistorage sendsendsendphone logsmake call accessdisplaypersist +}Cell Toweronline portaldata processorsatellitesTRANSMITTERuistorage sendsendsendphone logsmake call accessdisplaypersist diff --git a/e2etests/testdata/themes/dark_terrastruct_flagship/elk/board.exp.json b/e2etests/testdata/themes/dark_terrastruct_flagship/elk/board.exp.json index b41e1e298..06b748c37 100644 --- a/e2etests/testdata/themes/dark_terrastruct_flagship/elk/board.exp.json +++ b/e2etests/testdata/themes/dark_terrastruct_flagship/elk/board.exp.json @@ -506,7 +506,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -534,7 +534,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -562,7 +562,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -590,7 +590,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -618,7 +618,7 @@ "labelWidth": 77, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" } ], diff --git a/e2etests/testdata/themes/dark_terrastruct_flagship/elk/sketch.exp.svg b/e2etests/testdata/themes/dark_terrastruct_flagship/elk/sketch.exp.svg index 3264e89ce..32e986e26 100644 --- a/e2etests/testdata/themes/dark_terrastruct_flagship/elk/sketch.exp.svg +++ b/e2etests/testdata/themes/dark_terrastruct_flagship/elk/sketch.exp.svg @@ -1,41 +1,41 @@ -networkuserapi serverlogsusersidintnamestringemailstringpasswordstringlast_logindatetimeproducts+idint+pricedecimal+skustring+namestring

A tale

@@ -908,7 +908,7 @@     city2 := City{Name: "CityB", Population: 1200000}     tellTale(city1, city2) -}Cell Toweronline portaldata processorsatellitesTRANSMITTERuistorage sendsendsendphone logsmake call accessdisplaypersist +}Cell Toweronline portaldata processorsatellitesTRANSMITTERuistorage sendsendsendphone logsmake call accessdisplaypersist diff --git a/e2etests/testdata/themes/terminal/dagre/board.exp.json b/e2etests/testdata/themes/terminal/dagre/board.exp.json index 6a08b6ef8..78da5cd83 100644 --- a/e2etests/testdata/themes/terminal/dagre/board.exp.json +++ b/e2etests/testdata/themes/terminal/dagre/board.exp.json @@ -510,7 +510,7 @@ "labelWidth": 34, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -538,7 +538,7 @@ "labelWidth": 71, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -566,7 +566,7 @@ "labelWidth": 71, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -594,7 +594,7 @@ "labelWidth": 71, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -622,7 +622,7 @@ "labelWidth": 94, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" } ], diff --git a/e2etests/testdata/themes/terminal/dagre/sketch.exp.svg b/e2etests/testdata/themes/terminal/dagre/sketch.exp.svg index d3fcda588..3fddcb766 100644 --- a/e2etests/testdata/themes/terminal/dagre/sketch.exp.svg +++ b/e2etests/testdata/themes/terminal/dagre/sketch.exp.svg @@ -1,34 +1,34 @@ -containerscloudtall cylinderclass2-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voidusersidintnamestringemailstringpasswordstringlast_logindatetimecontainer

markdown text expanded to 800x400

@@ -859,7 +859,7 @@ b := a + 7 fmt.Printf("%d", b)a := 5 b := a + 7 -fmt.Printf("%d", b)circle containerdiamond containeroval containerhexagon containerdiamondcirclehexagonoval +fmt.Printf("%d", b)circle containerdiamond containeroval containerhexagon containerdiamondcirclehexagonoval \ No newline at end of file diff --git a/e2etests/testdata/todo/shape_set_width_height/elk/board.exp.json b/e2etests/testdata/todo/shape_set_width_height/elk/board.exp.json index f83df4dbe..a461cb6a0 100644 --- a/e2etests/testdata/todo/shape_set_width_height/elk/board.exp.json +++ b/e2etests/testdata/todo/shape_set_width_height/elk/board.exp.json @@ -581,7 +581,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -609,7 +609,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -637,7 +637,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -665,7 +665,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -693,7 +693,7 @@ "labelWidth": 77, "labelHeight": 26 }, - "constraint": null, + "constraint": "", "reference": "" } ], diff --git a/e2etests/testdata/todo/shape_set_width_height/elk/sketch.exp.svg b/e2etests/testdata/todo/shape_set_width_height/elk/sketch.exp.svg index 1eacaa706..974f24494 100644 --- a/e2etests/testdata/todo/shape_set_width_height/elk/sketch.exp.svg +++ b/e2etests/testdata/todo/shape_set_width_height/elk/sketch.exp.svg @@ -1,34 +1,34 @@ -containerscloudtall cylinderclass2-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voidusersidintnamestringemailstringpasswordstringlast_logindatetimecontainer

markdown text expanded to 800x400

@@ -859,7 +859,7 @@ b := a + 7 fmt.Printf("%d", b)a := 5 b := a + 7 -fmt.Printf("%d", b)circle containerdiamond containeroval containerhexagon containerdiamondcirclehexagonoval +fmt.Printf("%d", b)circle containerdiamond containeroval containerhexagon containerdiamondcirclehexagonoval \ No newline at end of file diff --git a/test.d2 b/test.d2 new file mode 100644 index 000000000..929bb580f --- /dev/null +++ b/test.d2 @@ -0,0 +1,7 @@ +test: { + shape: sql_table + a: INT + b: INT {constraint: foreign_key} + c: INT {constraint: [foreign_key; primary_key]} + d: VARCHAR(255) {constraint: [foreign_key; unique]} +} diff --git a/test.png b/test.png new file mode 100644 index 0000000000000000000000000000000000000000..b48521e7cbd95b1ef2625cb8b5b0ce67ffb93f48 GIT binary patch literal 41263 zcmeGEcT|&E_%;eF0*VYal-?8(lqMoI5I_Y~6j13^L3)#x&?BItB1EMsB@v|8NC`bU z^d5Q#rMD32HRS97GxMACo_BrUKWBYweee7+E6xMi&)#>xuYKLT(NtGuIL>zb(4j*N zcW&Q$c<9iP{zHeTc8<}4C)^Ruz2M`Th29;@`}YrB0slUBi0bgkLsZ~jM{Zp^bm;J@ zy?_4!{{IsA?-1;&$aN7h;oHhew+?+2FzE!34!b^7y>TeJg=6N>A)Z5bZYgPbn9L6y zjW*IAQuu9p<2L`r_xL2;nfq^_F9kf*QanqoeE4ug!paG{Q=b*X1$ZRbG!;+1p`xN{ zH=Hhic}3Zl>Lb_3_2M5*mQsB~eSHx4LfmH4a#<_6b)kGJet9!)HP*>;a#%#%vMKts z3H7m4Jc`c`9j4m6{idHh)aC91!EYya18KTyQ0pMLb{-%BXs zC6E5!)_hA90DBw#`NIEr4_G0fQ0Ctcs2`p^mH()!^X$K0b1J|2-w$}+Cp<^TT}V#; z_iLV`9Zvk~EQkEh(ohr5ib*K{`z+KBuK#{;?5hBeb;|3s%LhU@kOq%+%#nYejYs*g z5=8ml{nP(bWQPtb4RHMX0o7$7uFGb&Zx2>FIOnnc$$vjM^`8h2boieLssFRW1NZyS zkwLusFBa}w!++@nq>TU4$$ka!Uq*iZUs3Z{(fD6osQ6s*ztVcYl>e`^=285wJ2~jW z{ts>N9F7@5W|O5C$4zV1%uOb4{ng~2IxQ%KyZ498!q1Jh6Nbw?is*BoW$om_zxrOn zZqL|?`+be~ug=%Mk6OpXrr2Zr2m7Z}JbU?8Rs^3ye#@y)&w9`d`_rCcQCO&^Wl1`J zCiUKTNPk4JOokFQHG%eW{*yENI^bkFl@GZ$`GWS$seJa--dFw3hm}glEL#pV#CB5= z@AyuZ-NFJu0~U@gwx__4m5w_^AD|FHpm9GDCiBIgvg(z>FEArT{6f(u@%?VmzvdKJ zHL*oS|I>4{@u!$Pwp(Di_cz!t?UxDoCt$V8r|Q-`;M4!DLnZ zQu7|@T;j3Tot(_1Jq?!oihp%yUt(^0;AK}oF|yqTtD?==ZEL}9LStkC_nUX?KftPD zv-aT;bjSWX`u|V0&Xa*2N>YoGw%VxY>vA50hMFHmJ?Lprq=L~k z!))7BG->f@s|wa}h?-Ec6)eU=u{`UGz;HgKJ7jX61Lk;Ta^uzBccumgYLajYrC$PI zjn#dSeumW)i(JY}G>-!3;5^%QDxG4dAv%?-Jnyyf(8oCW(Wn%zj;l(grnrj57Ivg$ z%!L4${7yB?5sLj^|M(m|bh}HkI~0IWoabD9ZqhwHm#-l+^ICeE*<0!!-o&9RV)Tc1 z4r4z1Y)<`SIslrXhbhO&NL~DT85}1qEvtkP9LLmcmvxb347)91%@4meVqNKOPFn4L zcd=JJR{HWn*_?k7Va?lYut?)dcGq{Bqg7jTIp^jw3k))I|Gc)?ZAgAIKr9knD4O$+ zmUJ-CCpfMaiIE2djtHGg(A@+cz5L*4d0m=fLBLwO8sfZT$-=kk zp%mSf**YX?FQ#5?ov(eGK+aJg6sm<~1r!yzCm2OW;&lTN4 z1e)ElE$;>5!pxt_>W-cUaYMxjgT&X4q>hl($WGQ2f=6_tHD> zQ3X9sMhILbeC@5FC!RA=$DFycuI5| zIAydK*BjS(uP?|fib$Xhh!Fh~M_mM$KAjZLny0`}|a}NXfH7=SFQz z)tO+)?M)^_!nImB4k>4kWAPbOY7SL%Of4k96h0?90cQ_YFxtuJg~gDA?}S~dJ)U9D z#vQ^b)g!jE5Zf`TTI!q9N0b}R$aI0c-pdB#DvJ1)`2(b%=}Ro&g1H0Uv8(R>ymzcVWBSjTEnUs$HpM{ByPBS&hYPjV$M zuB(j+#yIq5W<9YoWeL=f&d6Ldgxtn2oJECEV##ww5fDs_!j<@4t^l{mzgiM;(!cB| zp>g-B9BlAOjHOPU=ME+xGBz&CD z8h)!0^S_Nt!+~qA8pB*_BE=rIUQ#12R`W$2(B^(M$5*g1_b3(OaJfOb`qGK58LN19 zUeRqeec#jhjb<*V_EcC`0Gw=YY1$|RcrqLF_lafU_v`4PB^B$quAQkYcr_MRy3WzO zLL3oY*y@qM41QB9@O(qZc&X;JD(Va+BE;0v^~Ys}FYk+(0G8?RQ9QXM2t}!2! z6|3hOqW#&Q!N@HnTH5*HrPuYU4MFkG^yZ7V*C*ME!jKhf1mI@W!ganqqHINslpd_Q>es2^tN$-=i~m~;J0 zD+!2*XJ@xcjN`~cu?=_bbOL>C^wff5_dGw!hb>s7SY2PqyDF^9+^-E& zLGCr?(`)X22|k%EuD`aWc(=YnwFZ@4 zR9OD#5t&4l@EK9EA=d2hD=I3 zr4W6@cc0bgd?xM8+GQgt8Ft7{`k=?C3j*eil$})#hf^YkkMF>w zg4zi^&!mab4@aHsVe{daADJg=dJxI}$3wm5Ie}x51D_GhUfYDiw~eACf{}8VB$xN- zCl>jw#f^nvLWQ>q~XFlPI!OH%3QIpQyFgvKba*LR0_7M;V#=T zFUaRAifmLx2zvWX6VDOgH%FdE31kAP^|sG=Fj48#5*VcPtR{KCS^8>~7A*1+HAS&Y zmt0BiOD$`4YJTUITOdwB9=pp6+s;4F-<;e~_gE@lT=w(6`^U5bBB)<&xO#Us5`x{t ztaHhi)HaF^4mb|fmrj$8X0g@B^_CwrdpjVIY^J@8AJ+hZ#Pt4(fGXw9PkZa(QN*HE zQLzypUjuDx0<-m!rJC(b+34s#JN))GVI!Sh? z079ZIk%R6jXMWfh_)I&Wv>DL^KPl^A1#WABiG3>B)$VxdN%0j@B~GLd~Vn z6v>Ei=7~Xe2Qh$qH?D6-V z+tfd5|Kb8H_E~j|b&x}mQX^hglkoa5qNDE8UYuhea6BF3xRf;AUoh9?SH3li8|xle z2p#7o9Ng+F?t(b8&DHCu1%lW4p$fcxNVU?xRIrD1%A@} z$KEwP`T__q7bN))Jcxl(hbVqvz?dB-TI=4Ms#2l!<6jzT_N(P%S{FdHPMC~Uq4d>B z?KS!zfX$qa2|G|IE#pIzCM!Q=3|>{iMk zGb!62RISu(is13{3+!gq;BmE^x;-`6+v#-scL$|1A9&1X+hTJTJbrM+A@&^bk8>EA zH~RtF8r;^G9)4^8`W!uY+#!QG4Me1p`c3Qrw}=477Lh8G@__OhUPlN#{y+QR)~xx$0wJ32<`?$?`N>Oa5-?T7i;OgUU=Vn$Wb-|N z{o1}#uj(G&zQ7o$xCykgsS|3ic$og~5vHN{dogUEL4m&mR1@}GJ;w=rR?OMC9Vm2@ zYE5~o1xIlsQ-Q8so8WQ6B3kr-?e+v$^Q&kJ}hN?dv)^_m-OmRlv|4#grZ_u(^>{3E2ZZ`yAd*SjytKvv>QL zfBvzO*xzn}qVHw?L`U5KyrU88^7P1YJx#XU=~wsmGhvhV_lmkI9?c4{UPS~iyXN~f zuSf-=0U#aV*f<>1)4X?bf2YsCPXV!8Qu!}|gbpOp_ne9;oK~phJmWrs=XwrEUhID- z`Mu@h0GkIwH@&h2pumnC;&f2_I|z~0*w%w64-Y*|+HQ9KQvWEqN|`r1^bI3_%Z@Q< z;mt>UVQ(CVN+P<_Vw}nW;xfD0jtSz-*L9m|Pg)rfMwsd(I&irC+$~jIUs#3}vQF*o z$A9p6FY`p!(wv$W?_Z!#ORA{91`(ta_9ZhH!S`~6);WM%g#cl9Fw z38%GXCx=o`AM==;$gZ?t6{B-VxwU&Uz00pozR5N&jodArAU4|OhXl4jm!qfq@>H#2 zoS}QVs>=eZa#Tw+mjOp~)jMn4fP7BFM>24`WX-R%x$-4Q1?T5GK!`>UiF`P+7xWZ^ zsON)at0sQZ0<&TFpWDBMYzto=5lmz@LM1_*{XKa6@o-Y*HIWZtw6n ztO8-}iHRr4HbMpCW)86Ia`ez}-75y}Hlf!iIb9zA!B(W`ow6yvccfH9VDTlwS^nA} z7-v(ZUz$_>9`MmmxZ_xVu*fxmR~+7;!1MFW-;eMH6z$9W5ACN`2VApRTJiYRMXot& zo>JATkz93#e*JAkWSl7NN(K^Qpv#sYW$IWDnp^fH{h}!(>>We5X7L1|=oxhjPb8Z$@CRzM{7+LL5Z^2RUBblCE7VJVw%iC1zBE2skJ|2Xu`1d1H`HBV1;jH2p3I~_tJ*Lwz z;&IqsYt8xMv4@zgx68Hd!Rw)S!W4p!#%~Cym;QX|@$*e9@{UQ2(^Y|8*zl{DnfH^F zyi+)_p~8|Q0t-cUZbqJ~3`v-rirKdqa;qPYHM5K4^mU4HoV|nY-%hxoKP~9L2J+w9 zi=B!uG~e_zKf();+pFTvD;m0=S?0fe@NSG@ zm878q6JQ*^Hh;AvTN6quy1rI0^>rtO4S#%V79Zy@q~ zOXKK$P338zNlTtAmi8Wxe#rU}o^MD$>6xvaqy(YsyVI*~(u&)-8%rAako4qID;8?= zTQor}N+bzI*Y6omv!z0b%gSf#Ix13M`)v*Cf&63MHDC=9c%MQu@s@q~9qNQ%=Jf#A zpv-d$gA4SW91jR5bFN!s%NF~7yNZTP#UqNZqlaKaB9eU`#!97YeBDPV`%Hc0FGmQT z4e!mJ1=f_EXvTJTi>km#vqob_DBfdt%wxXTd2tq3TU(CwJ=wRN0kj^T~Yar2kU3#puGEo(|AdY}75_3X>xP41jw*QJm@+D6yRVgt+ zlvBa2&i_N1>%u;zkxd&7j9NuPYGD*$z13N9@m4(VR|A&X?NBuq2r~R)Yp41Rm|;%k zy21I-ksJ@?=3PN+eo0;OYBGRsx7F^|H@AO`N#@H@BVWI=;EkSPJQM(N2pZAhR{25gaSIfLw-#C{) ze_(zFkjCC-IKGAuxr~?2<~PP0oY=1sT+h|nn!Z3O%7Y?nRa4nK^|K-qeFOLImeu#;1eIBlSeK|#%OEv$**fJn z98E`2JkR@Mz!PtMQj`aE<*L?w^E<}i1r6Af9z2evWYR-in3WCpPy<5?HQ~N_5TP*E zF2vMtB1C$*Co0?zyL7j)W;P>RdKog9X9AUt-$Dh^Qc5874-hd#ZLg|VX1RiDrG?(! zBaSh3GT@rIO4Vo#i5D98yRS)I1osr>vC>brE2s>B%_%{YAjCf#$Ldo|1U4NC>%E+N zpWZ5 z8o8nt`ZjC50=weP&FQ2r0UP9ZURkU(SX~ZgTl2LL1KN%c7jypw7k|KGPm*ZVYZ#_*qZxf`z@~R zdDUZJkA??(1WUda@%Lgpl|Pr2P!pC;iD?noV!mNNr-x~+{3Nr8UebVC^>e@FmYu#i zCym#^Iex;gOt+Re#?ItV39SMUdi1w>%WDAEwl1nELAn$eLMUB|;*sM(O`XrbzA~x> zF3-u_gO?T6B+yv=c8U+qQw{x;m?$XRA@vbnW_9wH@JXF?Frtn3TU4sF3E;KG%FKp=|I?7&KUv=wA-FKT?ZoxxHuZ!8`6NHlE{V6BquWzk`^w2v({+TGf zTlFgm#gAO;-?EE|)W-LWctF%4%K_~e<5F0NYbzIraf#dIxt($Jze0$Z^-n4b6j5={ zqBWhU^yh-v1}Rt_*O33 zt);c^V0WZrz06%2!XaO`fT^s87=QT=mZxIY=-Ka1{Ix*&{cxgF?;n+cPQul%<)Hqa zRRvYFpRLWsE>PTMIL#lYVai3HE%GQ)-|q>&g8DrCN=nTvxWvw0reZglq81W}TXx;| zQXWkOAe_}lYP@Nbroq=-S0EQG|Gm1yeP6yj+Te6rG7>sdV0UrMy}xDoA1lqoqVf)Q zw{<#KG#zEYc4rm1CAb~C;Sbsa8j<+y1L3BD@-V3(4I>M7H&^!kRgVnN&D2ip{r%l_ zB7ty7o$a^NK^LVv(tGZ>&|{^`&lcU{_Jw;JbTk6m>LFdlV0TkAl4UJ)dYZCRQ}+A2 zL;Hcsb~Yta<>CJ!s#k0Ty3hK{^eEaJt1Z`42oyU*bs1Ri)Ta;Ln5wCLdzW2>~JElP~c zNmdC@cpl^T_3vQ?G#*&bOA%Cy75KW<9}6zkXMpi#n0Tq}e_cxh7^hdEK{kM|N_TB- zZ(Rlr>%+f?EHtfwaovd0m=XtFnm8@I*bHd*t+r@6-@fOi^8?S6Hx%wc0qr9sBofX7 z*1%FD3^48L^r+zjIHijb*k*iIi;9=rvf_0L4c zSp%>+{6xp*J7Bu+ei&!#fghW7sW}~(_AFg5vv#Xa<0_CrkLmpo0cBvi|4fn`7Y3V~ zUYhZ#0iIFwQ$$w?{1`Kvggx-gN~*=knC)qZSg;9f2?%p?{OK$FCeHKH-^Tw0=7vD%izRYzW3DuORL-?j2gI= z`g_p~-9|jw@>Z2*=l@y}e~J>P*{Iri*l&P1{rVdF(!(@kgyuq4M+S^1U*f?6|r8jm=>U zePn$^z66fK<~2*BD3RmgsUp%Z8|TXMM^|jqtky-GmnzEp<<>_ZgpFakotlVsjwfH9meyuS`>ZEida&bxF?hs1-|2iBVx(2`^4FT@nC zLf=1S>SiIgJMNm~>H4R$0#ccYOS)FhiyVj?-Czuo+TO$#4#`zunspmLyE2CqUE%Va z|J06|V&Fal(xNa4-Z&D~WzBvx&UaF*Ezb(sB01(mQTlDApW|wms!1C6Gg6bDrWGyd z`VPp!Qxc&ebYW11r^Ak?6I*PzH^z(TbK*Dm;5}93jeU*sO(AFqxQ}xZrcC0vf*4SEdpU){Lht#d)lr|PJ~~r* zz0B_Eztu0j=LIgKT8)p`q1)RICw+gtkj&O^RLw&*k?zSCHlo&8se%7ztYKUcZGnf9 zr`;41j2-cQh{1QgQ{#(b?u8l{ry?)xw~CIqBQ-K5@2e{WkYnBaRDVITPpE;_0wUH? zf-*Df*_)yAzz3pnw~l~FrC3Y7bSj_!{+nLn%HraJs`%YFQyGe9OIIhRIN*DB$ z7fPnZ{fmJsPtt(?94ys;yuY6FuBi{9!vogDkJ-3TZdPz^OPLs7y#>`(8@}uGs&L0e zttL8ZL_h-jH()XAsXBn7WNtQHbhi>jABR*xn8~gEIR(F@VIp6uYUE*$(tEa>%>Vdo z)(v33Z!HsW)CM4SH#1Pl9Pf|GQn*UN06Z2Z$Th6YI2NgqWycxTfxMF9_G`XlKjn2^ z6A`X&Zggk2qsxI)R=@txQ?)XKQefgMu3TqL;TWFfEubdcP(K+5st+)&S8$@AcNZ#? zy{X&5Srewj07->smbrO?C_?k)cnGi=#jdAApcisCG&rJm6966-Yw-Lqbb0lwK(jih z7%oItzx0W%HWx7uvUY+Y){NBXk)*U;tFWc+^ZQrt#x?`_$_IN=!G13z_yHYPWBOc@ z0(#u@H=rdzxIQsinRM@*7&}Vn7q2K(Qc@6w4xFt6R@=my(nCE70J7%e09gc9(!`Yy zF?ffXFLR4^AD`uv&q}TZpwRycfc)_{01{12_#D|+4U&Q8BYy)L0<#HiLb6mJu>7h;BN%7P_YQIrON;uG^qgX`(NeG4I%l-K!-QcGbhIKXx+P&%FQDJ5K`XVdfz}f2xYx~8?6GeX2?(DLKaFA z$va9&VkUCJNj7=Y3L|A%R72~%s+iT`b;)hg_Bw*s%T2U~LFWoX|D8JZKVeH=yVbg* z^CO``tQY^rT#~VWP!r5{LT31Yd!(PoU$c(#4sk(YhpqvtRJ)wm)~961yH>yQ@ed}< z93A|Yh6xP>^@Y$zGt=-=rMXl7$3YQr{8w!E-hMcJLt#sG?1@0yR4p2zzD?oITTiSy|SK&~iDN4k7p({)c z_Ze$gbuMKk#6*6{sYmA|2(#x5ZxiXRgK%X@ffGTvxVIK8J5hm8Bdo5lEz7 zYS~qkY7a$e99Zb-RKWAizSS(lzzdZ2@D3hIT+$s)ebO2}`(92B;+YIPZDIqihRfE6 z$<{`&&5^q|P3=OoN3B2s)AO!G#<7?HRVqCec7q#)l=t5hyOq3mD~w0~G~c>4!h}_0 z_1UfR7~f2e`I=Sc*24nR6kABUhW+>yBYM~Kigl=BGbq$Qx0OCSeV`82lirtF%6B5p z{Hp8d32{O=U@p8@=~sey4)(nNf(rqg$i2S%qjsJfDYxY|_^cx?0CwK;r8+2$d5rxt z17UU}1a+wF?pRoj6#L+!_v$+aU1H?Ib8%Z?P(!HPbY`W}rZkl5^Hj=Ab!JLw7p)OQ zber?o5HZr)sbr%Ov)Er<^gtK9QORR7LTa?h)b!yJpgvfbuWIYYZgMW@i%Q)TTry3l z0G%M(oN{YEu40wgGCN>lZ%a*}9xJ04Me?J(zKnnCyEIpA zye=nX&HS6F9tDJq*Y}sBA-oCWg+X>ZqOT{}Xq7s2$is$ams6georwT(`!?6sU9>Q` zh28;tbc$iA2ErPVAx_&7%A*aYS*FplI)c_n&h(d>xJ4+|6_O?Y7{BZDX7zIEbkX$a#~iP@zRj$2bht_6U5 zB(Cfh4s17$sm>4|FUC8Xk`ju<4m)`b_NZjQgU8lp`(`kfeH08^sCLYNIvw1*=|0jO zc*zVD_(|Tnl}c?miK}d+0kiaNS$QdE*j(Wgo30U=XbET22pzH~`8y90CEtqBY#m*+ zr6r_2N~!+(NtD}NZPdbx?4S}4Q?NsO|1uiF*Rj@$EqxAX+2&Y9 zi)=1D^V>aVu62rp=Py9sD^h@$SmxX7wv=#p4U3ky>#T97P~-n zHIu*e^|KNL!%F%cCT2D+;d+llsk9KGmJOf`e<7MBmi(|ql-pvJ$M2bB3Ewt<L7A;U4?-55Lq7utUf!|j@tB@P@#b+W zBLZ69mDjbucyVojD3NzMpI%Daje_HzqaT;BMqG7NnfJS~Tx%5P95WllUk9F1 ztqi~59}6O*jNt2qakYJo`u1>31y4lHvZw4UY+AO~#~WLaiK6UB2^BsEIGjl;i_I+ILyFLK}TuPf`eWEMHtyfODY0u19)({zqHV5fp}7 z(&tv$^~u$T>^FlrSORI8#!lN>oR^^xK;4Bvmg7fu7(Clusjw>Ocz~*TaR+te5^}C& zXB=u_7h2|b*T~(jL%0s&<=4lY{--}M$#lHK{WGZ)mIEV$xIrI&) zsTvpEHTg)BOn7FY8SYQHnhXJnZVgHn0g9IMH&_U6nER4=Y+MyIjT*u$fOg6h&cUP{ zwFk2u^8ZXhvR(`+(*wR7bN;iExDaqL$!?{4e!rVv5(P*UnQi8Y9|&bToi{XGz%6|} zAm<&hBfzG7AKdRX&PRjNK#4wOpby+6eshMM+ur~W8Fa*(IUl$t|9ky^!vBBW^zw}~ zzZIuv9H3~_OQKi(27@<=U%AetQV2!79#O)tz~?*Jy@C^X!25ELvdW7EnSgnUsAsL@ z(*iSQz#D%Ao(eoj;05^Y*VksAh5+kl`%!97nFBKGyd!#mHqC?3HQ#KEkp|y#woOWr zIQ6Up$%Zbyxc6!K;p4&jB4B+NeWtjEG;qw0Kc{t|VExV1K$8Or6#zC&x-Y{D`kw>jqB{=_@g1Dc zh{6;2CL|m22sH00FWa(w!1_yI=whGJL2V17gVr|Nw30KB%V_6a4LhF4N@<5n)DFPB z;nD`u_JC# z2Mi&X%OLtRew)@(rz9gL73>lq*3_$Vt_1AsC$$_z9|{Gz8t}$~9|_85`2#?Xc3R|M zE^GWDK%%28+R|b{KPw~r&T#^efj$D(Db2ouG`)d>D5U7OfU?J&qT^+71Sseq{nsUd z^+g&J9?5`8*42Pzs38bMM{ajK{Xu+P0}3k0@#i}GkNq%(|9>)oEq4|YKFoPaK2eQ< zSU%MvhDP9IM6P=_gcn&?b%{BTR(-$+|CRtyhI<$eYTpcQM&fFn%Q=1q#-h7aQAn9 z(XZjlN!;88-Z?D2xYaQ$PLH9XM`JCjDUmHPIq)c!ZyGsow|e{U5JJlBqC_y?cZ|*I zl}l=vnHJd8L70BI%F||^Ko3{FKCDv8ii*@F$;i2+Q8}9*s(QXE3xLc8_G9W!Y zFOGZzP)E0YZV&nqmDI45L`$))OSQw!?9X9L`@{QW!@h4{!bCrvU00CES{YkLF35}L z7p{8!o@pKZ8Vs<-4*i^)et7XhJzT(xftr_BIJb4XXP6YWRFHa4f2@&zJno)=%g%O0 zU!7Sd-woJG&D$!p^ZQj0Hs%DEB$?m*b}k(}EsCjE*#3V(7qa#`YPnAq!tRRI{+ld>zTqGF#1-^BW|duyh$)Yr ztdd%^B=q?32Y9{$s{*f|OT)$n@kR2F%#wLI=dD(6<({PxIT6EziQXO)n|M9*mt>kg z*3)+o&>atzGAWps9J$}V9#JT`v-W!!Ge7EpyNTi${(vS8W^|0@{>nRltLh|{z*Xu~ zF3rt~QhsWxwdUr=<9{muKGh!EtR2M_2M`5hD0C+U)A=#Dps#o>0Orlh4l1rZ9w^{C zP%bJ7ag*yH1g54bHs*dRbB!$vjP1@CM3eefUI)Iq|5|t0_IUo0E%!IUp#;YAc7(Y1 zD0AV+naoWVs!^iL{Ix|oPR3I@@>lNMp4 zp{k$TEtY)8=|g82gBddaH0&d@-{v#NZ79T1F&6p8Y6`s zDt%D_BorbdQoL1AG*2YQS0*_TJx3eogjjB#(BsoFe9}_;WP;75um!NI)`wkFSj3h- zNAKbwvlrnT(6R7JL*K8FXyb6!FDURAkuGc6^a^25g1xB5Zwt|y;sMg=?J&X%8ccH@=jvz9Spv5Qqg>=6uy1Ul*h0oMg!`=*fLhbbEv>f@La@ z7Mb&XAY3#3nYta^v~_&!R5w2Uv;ciCMv}LMWAR}u><7Jt3>R*s!TI+>qbk<1dRuo9 zAcIK6O56rzo^73dSNj^}y1nMafP;*#xKe3m+Bgpt_3S-#d#=97O+$bHKvybKq;QoR z`_PILnYClW1eY}i0#O}%a+Nmrx;(qj2yyMTlVkgu!XNoy><-z)&mD&%x#P3t$L!d{ z5syl)%cZxe=xit0t{BHqe*@QZc}(!~8x*|#q7!}rR&~>vL?C~vyyVGTYK8P14aD4M ze?E@(KT=ZL(c{Eg?ya+K?$ITn1E8nvk!>CO{2vC+y$^8j>K}cUQ)lWp(;PRz)YotT&w_HDnEyYT0N*k_kHqX2-Plx_P;u^9x<&rym; zmxMs?>9Uq2TKn@?tE73aZP?4vUQ`x`UDh>n6ADKf{#vy3N^0zdYkbV+2zK{L*hc&8 zk)?Y*wj%&`gb<3{?J=7w&b7vgV+|Qj0tL9ObitZkh3y|4J&gJEGV*Sp5BaMf*J6`w zET10?SQ`y2sX1?@@j7bQdbcj~1OLh!e+RiMnS*wb-bQ@p8Vj_$l|N9D-qiXs$c@hf zkpB9_%8#|5_@tC#R%eIAM_W@?vl_;l8r<(J7XkRmW=+?S+7@*4Jr73;T=$qHP3&Xl zaZXacXJrrfQ5tuG40}zP>!#iYV=IEg38!$mu+Qz+;6Oq54`4lOBZC(T`)u=~#mrSW z#K(KYVDq&}Y8-yQO(>&YlBHk4P{rkhG3sM(H_#TngWf@0i&^&v$bN1vdCe~I4)R#E zZ!<2rO88{U+D#{-Qm9&XlPSU&}6`?jbU4$`EyZgSjn9tpnaoLwI+5_8RrE z@w;H(LRi-cs8gv0e%Nx%(+Z07a?H6{X6khVb^A{{rkqe}!jx$YR}{(IMQ+!u!}v!S zG;$kxL^yD*U$B`m5oI&nohinTT)E5TAUSX*f<{$4`vD-!Xv=0jpppQtYDZ1{R(%Sv zqCO5Da;VNC_swtjNSWj>HbH`WmNVMHG+m8VWo!BMc<{Q&L;K+jF>7$aPrYxA`^g@baK5x94i zAI{!SJU0_6Ydq5%CYFiWkrNx|FSmrwmBi{&Vv=szKHPl2^$hASxS0mWZy>R*JW&LB zrT77q8W*(HOvRZg#Ivn53}%9BJ-jA=_Bd&DR}lAclO?a>v4Ij~X1xnhe%Y~A=?G^krd&hh)Z0~{~;pnt>R9s3X+{KW-KX42F zW`uLd%JRMarqL{Avv=?&t}i{!TAfy3pNkY4bC~bDGGKs@UzN_A5x=m;B?}!UrOrSG z>Uk?ass^3g)CLm&V7wCdeUO^kVL3pNovO=7lfnx&!&Y*O82chQqu!2il&TE%@HV66 z!92M1Xta2Y{K8x~_K)4Qw)XHp|T?JVfo zBm6>9f;rsI$rA!onEmjvQmIswn?ifLQRJ2!2EgpE+<$}F#s>c@m@QuIB667OC1a{G z9=iR0*tLvTZZURLDranX@#^jkty7M?@{K zRi3bQ*7Ud32Sz|+hS#RD0Jxfkm`v&en)G7y;P!M7rWtx)=~<94bBG$E*ktHY3YdMW z^<`k)8t@>JPO8BIk$nnWo+~p&zmg#|gc8&P+S|{+&r@}sh!GxXgKlign>UKO$0Q!> zNKu`49^JSdFDyT&O+c#ade1x15Q33&jKL>jmxmU|6UP*wHa_AgKnY-F&xWSxpSE-X zyHaMsLC;LT2At>9!nKmI6k$b~Y+vstwGj9^A|hwlPm(N_OQh5x*8Gn}aZ4((n{#S+ zVS+jN_L<<~P8?S$KR01%?XFPp$NNM6uRkICWv9}U;U61)?RASiT)jirn3>|YRljii z?&eAF?o4vWft%^!w*JM5wJ!x@>GEsc0Wg=uya!gR4h7rH$j=--!)+_a^2djWY8vy5 zLz6S}uk#depSKg{Rma{^r-Nx+-5%XJnmreK(r$&Riz2t(n{H8XWU|Y-hWOFdzu+eU zR;*qYDU$=!4KLfPr3Rjs7tO^d6Tj2T?_a| zq(j!CvbW)HoPtAWs|%*=^>SjxYqhh`@_$i03mEg~ybM@54pYf6^gAK0@~+9q#30qD zz@L0bD&F)@TZ|Emf!e&6b8s1_^ELDLix_&BrNdYO@`yo5qdT1zxJJuyo5qE=RBJV>z$v5^xs)Wz?;X5b{CS7>a9JHQRL0-6|)Q6L!=trn`*pZmC>{;cCgC4)4csH3B6Ux(B^HbF0 zn1Z-nRqlQ6T*>|+#I00nEv}59JC%A1-Tx%-BU=8+!>VV5S zdt#c4evQZ_TDCRAfn#@`m0cXlVrmW1F6K9tV`1f)&qGo4Tg^|{vdO} zXVpL6Z*gDv=xH9!Xa2T9&7inhVLhz?b@nM!$oATMI~W?_eiw7P6oub`%pIK{TEH? zwj_E(Y^2gQWu}G<=t(TC+uS~9Yf;i=E6bdP1J@|?7#1Pht5URdhUoAnbTQWoQ@k4DoCV;q%++m;7hQzwaefb{Ch z(SPYZ81{~P`OWUE4jSBFxm1Qvnd~~1?Y6wwcs3snrk2$*^P7AyOV@l8bz7;RZh5&~ zJupbgF(!KQvmUMSz^be4FFHui4_PV0K6_W9SqGMJF5r)xkJkB)ql_8Qy6Tu>C=n{ zfEhgi%nVXXE&qG{f5QKN-Sp5C!1kcC2ezk(X4)gp1~-;m^1lHB!b^cL_3pbMn?#h& z9RSXr;QD*n69M$ejC`` zTOBb{)<1`*;alfxS2{QyFIfH^+Bli=$5u)N5|y+l^iyGd!h!6R0rU2XLG=nY5=cRK z)flo4E*t*;;PB_@!JnZCc5d}W)<|JVwnBincMkh#h0&B_* z-tr*9ys$U%HdP<6l|HXhgCEpOMQ9GU*)Xxu&&g;~)kxuMi%7s9kSypYEPTBaHdcwO zQEuguPe712&Eh>LZPq!ChKoJ}Z>R-taGazATw3H4oZPh%_cCF%K5$j9JT~sEblCvUrQmnN==$hvw5-Eylc%`pNX25FFKhN<`~B^M<4e* zQDqb~i(J|8*QBs4{9sZzqAP{$Ckt)CO}}l&G>YUs^|1=diE?*z!7qzeoaq_*onu)` zwnrJ8S5!>I>`dfHRcGYj`er3c-Db`lp>5(07Wt+rR8sf-(?TGv$SE*gOg?$~QHpwS zW$2d0#mV|P?~x%%Npb_NL+CQ4l2{+!z6#}lI9guSu#Mj_OT#FMdb zZq0{h?bvHguL-eSMJF(8DxJy;c>9*_+-WV%suve7T)EvMGnE^_BM|*PR)j@U^Bv38 z1eP}{TDNFuBJ;n?6Ft0>Q{XpR=R2?Ft>(BcY(nAQ>7{;MjZNa(#_o5sKDszmPS--t zk@7sT@8Sxy3kk3S2a_C$*Z*}ly#eD9OW%%2&%{vuMzOJP^ zJKG|Cr_&{$4VuVY;OEkQm|dKjua&`pbEr2~_A-rlg9>gJ{N8u!x2Ph1&8hkW)A6UH z>~{-k2!sLn?UV)HKNsT9ACaZKkv5X>Yxzye6wOJ6f|f-W*9^hL3LgRy(eU#Z{3Xex zvh6D!=~m!p)F{{Diffr`lhRR69$jN+42NOqtDGpC_lRFfQcrgUgO9(MyM4|YB3p=4 zO6S(+Gb61x`P_gSZr%S4f1{UUO2)2mhO_%PBs_YP((G|B(hnmvU$XN;Z=Jqmg@aG_ zGwSwbld_`NN4V_kHg1khqUU2}O??USp0I_0?}$iYLzPRRGn~#f&)1s&>=}vDWvbxa z;=A=V;R}w?EKJprJr-d?sy&*LUJL2o^cBKsb)}fTTAi1IdXNk3{;&4FE3Ap`-B%G* zL_kD9I*L+6z(SEOB1J$@s?wqqX;P#G2qXdu_@NYO(t9sK2rZBVRHRAogaoA5gdRvB zoN<48_W$hXIhW_=Jl@PjGPBlt%X;f?)sw{|exlqeIl_a{-z}+u z+xI%NPO-;w9v;Gqb~~ndZ|%S9o%F{H+s*x8oi4D0ze}f(HS*@<`9XIVKilw)UyD#? zxH`?@A$CQ2vvK`vKoa$bN#7K)V6fE8f?O>jd}?)tsMMyP2ATe(dtiYO=D8zG1EoDZ z4vo9>-7H8qK&`zdvrM)px2S3sYgZCN>YIDWrIizEPeH>yi2hm$@I49N1KwJYWGk$a*QlbHlz`Eud*W2Iyx8PVyS`S?NBz-J3qAY z3E_@V#v|Iu`Wkf`xdLhtUF2kq3nbHRg5*-F?S0=u?Nw=i){1+359zF5OH7}n3s>rsEVd!kh^TH<)H4>DIy z-{ikkUFPH(No7y>h0-lyU*;?4(NdorGTr})w9;$mJ-3x)2afib^xe@@5hcWVF8I3j zDkFzu47Lg%X-(F9nhKOI9htyLu`j!^22*^PpUBR+AO63LdbOpRCSH7nx>wRf)R)il z5m;TtOrnD(CC#a6*FhVB?!{GG!LI}%9e9Z8X~<#vnemJOa^8=C^`&qZUfJS;Rg~$T zw+7`@GcTeVF6rz69nDISb&Fwy9kG7;UN%sVQZFcq;vG}lu8!#-sg%atWPL#kllHp@ z6EzeH_@tllA>+o<@jezPxUbJGEffR&s=}g)!`7g+_2l+P3y+3z_*d>M;7 z?9c(9J?w+Vn8^AAvjhOoeS5?6@r2&OG1}eeW2zA5X3z1}b8X*b<6fQ}_cO22uC>bf zDz5~#0JV#99I5qjfW#9Uh<;LgX1wjgENc#PBa_4Jy)lL%m~yi`j~mfT)}~zjhr0Zv zlWR|cGz%`S6mB0fE3vZINpCy0z4ua1I|DbI#;Jd84BgTatdu7oPOTnweC)w6HO|g+ z!{ZEB_&~3p>(i}?4)Djo(N-*Ve216k3Nl~}R_0q`5(y01?>qdtrx!P0Fs* zeSpZkQBKb^oRiL!S1;I!;_FkI4lEn^S?!`HH@~>-@qJ0S`uUwJRkK=BxYby4&n{G=`qjdW`P@#_ z7yC*ckGnUM`rrWuhQq9DIY#^$fPXN+X)LP=7}Efs8hT)$A9LZig#108m~=d3+mL^AgA9 z{k&F*1>ybpb2m=&BsOQ@GYGa4^6a$IYHx_`-Hcr{^@G+G2L-lns8@O80#Y+u$-KPk zw7fU-LpM|6z;gPdDda?t`^t}CrZuyZgsX0S(BU!GZuaM73OC%1>*n1R5x=8m@X3<8 zN=LQ&ie^rD*4D{%1hqxo@TY^2HmYo4o3)|LlA)7X(>F4R(hd>G?>d8rd5!l;LMrg5+=@am zMcW(H$ld$B)WsRe`=);2j>6}-`y~5eI(+J_7x$URz!|7%OX#z~k*8UwNqUnb zO)D4D9^8O>!D$xEK5w2%y0afN)nkLxAvbOkSEy$d!MrY9NR!;#X9*}t#AWLKLb`-_ z`Aegz2^H#g$$Kua{`vy)QwBbwJ;7+CU}S@W#Mt&$v}Y-E<1M|aA=)p4lz0)c^Y0M6 zpC4==$*XI6dp68oSL^`kWE}w2m?}1FpGS!y|_U-nKHP#$q?uQPtffhjztg^rCtg( zD;b8ePo>Hpl}+v1#EY4JR1GAGNY#@*hdVI53#@t>ubVEf;EOKjbvpx@SLtJT;2qe# z@BJdUYVB!?Nmrh0+G3UFdDMKi|3UiMaRu-@ugnWf-0*y}nn5tjEAhqU|F*o)mV^tMMePx@;EBhec zt7+q%M8CIEFJTfzrey1p|kd%qCOVQfGXO;aJ6t8uT zTuiWh7ngOrwk-_w_6vDTIR3(6wm^zDQklapmVV@)yHdx4Wk@G!ZqoK|gjU+E=+zf? zHEizJ{uJX`u`_NHy_B+f&#fayLOLaQH`sJCMy?0L^-=@jSkrx++*l>yIv+=$1JQYV zrZ3FVf0vhIg7}0(bp^Xs)1-4mh2(7W-MI85s{Cx3*!|XP?I&F<>mG8rd;S9!yG2B7 z_=5PZkWVEOGEsY9duFr3)WkZ#M31V$JC#mTmEIdQ%*tfN(Kmfxk?#l!yd_sy5hzN& zsk}RkQwBJJWuUJ1YyYt#)yj$%h?}~3X%A)bK4Db(W9$q}>IWpPsJy2LWN))rdRDxT zhr!uo&5*=R>q2sm$EyhAGlnKwI5P5H8mNSDqH z_@-16OFtfgX-oV`3X{z}9s^f1ks145$ALQRoahwaRgjL`vGaUxVJ<3X3CTuJK*nRc4y9yov9j zF17yxAH8U=?Np;6H2tZQ6rNhbS{cdcc?8(@DaW0Gx803)_)fPDhVn5^^4a|b9ZdWr z)SP2fqBLONqY~5-sBW4*BKdAQ-e_bYl{jz})c*cd`k8d){tE}bBQJo~4`AB2v1zx~ z)7OXK($AcG_3YcX}QY0X`8!4wnV1G zQ5=6(&B^FUz)z7h7#=a&xJ#9HR9H9Mw+VFk$3lkA#bvQ6EB5Pd62Y-~9G6W3odpm7EeEr2aW|!MxgMach-gnoo&0y)jA6x_F%n__0 zu(j@tBf)673g-HTMIRf%Ry}6wBH=-ZHKB!2%j`vTB(Z~HOp->BjU@Y0@{SxS#Y`r4 zT+=kl9|+Ps^=5JUkp4YrHYLn3o543^_qNU9hezb6v||0cRxT+C@z~avOyj)mSXzAxvU=l8g4AkH=ISM0SK+9@M{Hl8w7$h@m$h zEgjF2+Z-0O*J(lJ5FyEBScqKO4E~-L%x8#=Lnq`kKv==d6?#G$C(P&3j&-#T(eArAs`Icy2PWI6l# zP)q}Lofr-)*p;P?8nXW^>(U*oax@{}3_Y|=2-x)=rE&1jj64lS&wQuZfi=9W)=icd zTi-GYZ2oB(txLl4$>lnKt63^uMan}it8?@Xv}|AgFI~48$X8tIla-3Ko$W2JJc3e$ zJjRB3SD413+(a1|+ZbvlE8Q;Y%@Vs#tDc!MAd_ zj3*fd-oW9f7gBLrlSdUA-*rE+9Q3tt3?%|N_oJr1!?U%aWeq}1(H|d&#y1L%zr*Ju zdlM8st*oGW&bOX<@h-hbPB~2#i%M=thiMb;issROF>dT}2aWFqIIfz##bNc_diB2j z%nV_Qwz9-(?Qha$%pA=QNZQSZ=$|ScU@_w@64&ihpCU7MFhc8dysMqYbeGe7tiL&- zu;``2ozKjc182!}HFjlhWOPub0|xdTIXxzACLMD&D!-*2vrAWKvI z?s@cl0bfiMo;*Bnb``qKJ2$(>HCDA**WRNJCAdYZ3Zwum9UC;aa2}`AMQ0r#T}uWV z?;vh`k|89jC(^RtjWDiMa&X2@KrB~a&Qs!+^4qEoW1Ga;Zc%1BPU{b=OR7;S()xI_ z?dR)z$AK!v^Dy=R>Ml^#dM9ytE)I*e5+p0S<$iqGJ1ohRER7PW6Zq6XfKkUTI5Ze$ zuaPW1apSlV-e@F(7|yHW6MDa7IW-CxakMMR#8Ey+VEBR$#!7v^&NjHlRdr|k)1KiE zK^OYD8XoND)E|DHVT;z5dcgbr)3>rbxpsHY$LO9N#~jw1kDp~$I#tFHsdP(GDi69^ zTDH0SF?xido^6^SOTe9I!0y=Psp4jXcgqB2JCnV$Sk~H=JaWm;m-el%u))HFR5GBgY($6W#rZcHdJ@Z9df8Ew&x+)449$ihcPi)OTB`=<@zo|Tw}P|W zgHNyVUNjSsSfvu=w719H3LL_H5)Te~PuU*U>lwRYk?Mm<^xe)NtMwY-Yzyb0qwR*F zCkSZ30!sf2K~PD;B<1{mSeL?#8VH+Z+1a!RzI8Q;JW*0ri>iOSXu}$}NQ2K*LaH4M z%`#8a)-59DeXpAI5tvj{<8gtTd9-5+?>XoXIX9Klo*( z!yL5ynu9b9I2kP{Of0Hl9Xk@{yGv3G9ep3d!u0PUI1~ z9hz}rq)3F;g;$zaiHd(_uCKB~TfY=47JP&QKPoQ;9T9!(zvz7DPFc=)UT8ZZKJvSo*Myzd45*hS?vr;Y~ePJ8WJMDWKfbBGDj%w z&N2j1dPF%uPe935ChLz+V|L#SFYxv4y6P{GQe}7(yNz3UN5s0tuDVDtD@7oG1%ZMsV9h8%&UT{)TH7B85 z>RGSR zvR8H{SZ{hhuDR%*c6yIZz=0A!eMjtX#f=x@MV- z2=*^f*c)l!ZbuLAEuCyUOuo1{r=&f>LC|L-xF%iSRBogXT;T95;|9|7hjB6vba`>b zK*{=3Wab*qU;Hryr(@1h8(}m}=W=MRhM97Y@|UfjZEW&deWFg<8V*ENUuigvb8|k5 zex5^MN@<@u{3!A`LaP;4IV+a5G;Uqunl_XBuw?#$X_{6ba>}AXPc3+1c?eauC`bz^ z>=M(sw{v3jrP|P_WVgvn9*0d2KXQyOKQ)uNCO#r_0FJp~IM-p7bz=n_B)eeN2x8J* zP7stX{+4lXP1s>Yu2FD)CsIuG#CRMd?F-T(A_MU03;Va0o6iyccX4|PvA;s}(e7!_ zY8fBZ#15uC0FFHg1+wVdQa+KATU05g>e%JF3-t_te*LW?r5D1<80 zK^^ku3fnDjvS84p@NGMg>8FwCHKsj(%r4OzqFqDp3919@?>Y2fC_DPO%ESa0wNpMH zL$0k6Nk%4oiQSo~BjuJ^YS5fuazRy^k&T-a!HF7phPrNaD^xmJ=u|n|aTOX`7Zq(Do3hvKvT=;uV6Ax1 zg;Os2=t*-PD7-6{tij536T4OMvWw&J-kJh(ze7kE#^Et7QsI zFwzXSVdG_48w|8{H!@I5)SL8?{GJad0fnGDI2B5{BXd~Vt>N2qVy1^8NV8gnE6am> zXV?s?d>_jP?-sryy;-YWvu7v-0LBlk%+8s`3XFR>06T6i^aI))x<5zC%uy~W>mh53 z;p3NxN$1U;D&YCkB&=lvwhY#9JKdJT+i|yErUS|gQs;dz5vp9g*Rb!pRpHh<=AU1(pH&Z-e2 zr`G6kyUB?JIK#hOFMd(1KQrVE?E6N~EeLJpucDia()XQwV<2(So+C@P=QsAsTmkho z++|X@vwMn^eIDU0g|w+K|^Xta~xYk!TvRbm72D>f3LVE+C}0o%XyF=`B5G7oC*Dl2})BDCt-sPm72*`?ywf z5)H=hiNkSO%d@(gh{HG_c^Z~oMT>7XCuWhxH0uUo#>n>v5X z^jF%bE{hS2PyzANF8UjKbB^EK^fC00h6+NxN0@D!6|!O)dor8_!uS*Hh=WIN8z-vL z55sfpuki?)RV9Epa{qJ>Qt|LYvCgVtK(QXf#D5;_O=C*E{?!jo>PanmUn32U>oq% z#8xR9d~G1{vDOd~TXnA~PcW+HpxZN4;kkhxG!xo_WX=y%J-$6#wA{e;R8`UE9{Ym@ z*g#5;ExscC15Cf@xyMzRQ@v&MS*prcR(v>7J%s&UaZUnY}P# zH4fBA0=o#1fp5E>NfdbCrfI?hRde&7IAJqW*^DtvK<PBL`I!` z2i04r%d*#SiSqp&Kl>yk`Z9SPjeWp4s3t;C=@bl__OTyjcfff9b5w2a%3J-^r%vYK zx`c!2Vz-tdT|N-)6>+AX3_|>>k$m~_pz_yt=!kGT5E|Lp6M4U|^K>V#`!k*9xQyGF z=vwIYn0f{nqXM;Rfvb(>DHj6Q)8&*SbzQ;y#nO?=PInMs(CfLWYnwwsj`Mo&E+pjO z!1CHfSv{6gxrw5zW_LtlGRt;+O?@J(xoT=&wS^aLQjjWN%d>Vqn6^23>xYvUHuwA8 z=J1q^vs_Ds^^xff5lfj$9;;saOAC|11w5m*C?2zY0T683Du;nP^^&QK%f;RC`@y@R z7+GzMYW?$wSWB=ss~n{i$pW|k_Q`Q`E4eyoa>>WGE9Gql_V99`iQixyDMyzSDD8?na5 zO1X9KS3U{$rHA?v%6Mm0BMWL8 z6mKlsI(qFk8=x)d`(C5=sxY=qv+%hRwk-A9)R`(d2jWEi?Hhp;4gA$L4>d!)<7CbJ z7JnXfOf#!6Q<1-0T!E9$_=Wf0Qit1yYH)oihm}QpICSP~4Z$g3L(ao-rVWw$^2F1V}x7rcSEfQXSjsbQY>ad8>fX$qCB zkL5p$R_+gXysT<2wy8|vb)Ey0sH;O!rI(eEh`)bJ$VoVcm7!;NZx)XX(s(4;pQmZdRwXs>7@VFXw{yVC`*w z36lF^-3!`m`g4eS*>mBSq9bMFM(`lvF8S+`zHCEGT`|OwH!5xmN;gtMYHIArKU&o_ zolsYYjhqf-Px+K9Dv;u*98qEl!d!^z%S6PoZ^?5>&_)_i zPEnZVVBDbI*x_7&D!H**#&ufio?J5pLG;tp8U%cip3526Mrs^*hz21Tk{)RUwCK5i zB)2*>b@ScHHC~0y6Fu)6Oi#dp0(}#Hn2u_a0A)RmHj`Ta)jNN64g7rfG`KrSp+^5% zmQ-MZg{i`1o#?h=vFCee-=lJir+sW)I8x;n1SPz)@y@#CUWrBlQn~iA6`p-*K6#17 z(FsHBu32mXvR8Ta{ZQ4EFB*@zGmN#zWtrDdX&n;%WpFQs()&7kPh-Z^4pkOPcZ7i; z#@h}0QF4Z#>FC~FSh`m4@C<;3+5W_XKAqZtL)s-Klw}d+zC4i!8EQz#<9@6L-#?6% zQ|8Tx_*gGt6>?YT3~;dKXVbd;_bgf?+#Q_}!`dm(j5p%%+38hHg^0diWBQS94v@l^ z%;R_^Xqu0HJMYCEKWC!$q;ZK+0$?|E7SS8!<)xCtL#^KWZsI@*R|^~1V$NuuQ9s-= znELp>%7?hD>@G5Tbu}#Sl~){MdVpwgT@}?3>aalf4W1X`PzA)hWUkA z#fqN@o%Mrh?s z9RaE`1y(p8z1oa{^D7ajF)kHzbpRusFpE_OO=F>yyyDww5@$YXdX@P<+JVRdUsR!2W2cA@pD)MYGU|?rV#Em8GfP)(ZNpH^6Rfem2$hd^t6&b6O12MUs z<1)6`?@%{zgx$`$u(bFKYeZ|p1x_@Rj*6DxHB(nQyzR-}1|WDCs8%7#Cu{EOOsdvb zLIWMf(aI{2mup->PK~Nq;-DANMB8j+@h2`X+kSQ|u#Br0Xd~(*0Sz&lfp}c&5@J(_ zD_zjrg2BcQyUI9j6AG5RvCP}m&V4_s(C5iBeot|EkBQIN^(mcLMr$4ABQpYu*#1oE z6tCCov%I}G_a+I^DQ(skYMOfSAecEvspbcu?qwX5zdY=OY)NJhG`h>rxt?Hj%B2A6 zLOC#Hr_-pyx6) zm&xTZsBUA{W@@aCHk|vgXJW(kfj2?)YTg1P6+~R%!nH0g%dkKcm(K8T()FpGi(j1VuwRwXnJT8MXW5YnM{}$9~4xsn!d`& zW`0)pHbY`x`-S4V(bV;J=+j4|I)nB&nAw*3v(6j5X~U9c2)7cWqU%Tx|Lm)5JANFe zxAm6vx0CPSU4wwMrt_Z+pLTw3AG(4^E84U2$pmm;)ywmPEQgY&YjHuOm-Gx1jLQiZ zaAFN2@j%bEP-MT49RT5u`|QY;J$&?9HjcLW4o}coj&1IpquCv<3DlGs(N z5+|IV&T%Iu^bqL1q^OA6-^~oCS3KHfswZK7mV8|C+SppQC3(F9%L3zu;}BA#_%B)Dl~L-QjeS}2D8mwcUHU`hIGkuYCY(gU`VPkMI>}6T#D~FOP_JO z8*jZ_#j})#RDWH1$5+oe<&b83TO0n3dP3kb@TZN)0Ev!0iD{bKT7aWgO>54xO$R1O z8WFZ&p?S;JD~b&~sdv_7AkRjuj}7f2PS`o^HA&dWfjn61A8WW)S$3$^a9izeK^Hjb zlkkenn=luYyk$&dKeR>N)O@neueS7QtvP@g6SGf`RuaSmlf9?BFKJ@}B#H`Vww}s<{3{JXsoFb64%gA~JsUCxCf=5*QyL%Yl8o8vmg~|uGyeW=2d#_?%hK(u z`e@2ka<+SSJ6GCcZFxjnI^Dy4i?~Ycn}4pK6L2u^ZI`;~cO3udW9>}*Y1_)z1WsHI zv2KcQ9w%R$kW*~hIjbY%;X*_o6)7H!dIllA<4Ko80J=J4DUl>TdoA;1m$*^MV1}UpxUO5ODBh7I>ruXzQipetv!I!09k+)I9Is!%u+# z!hjW@|J4LP1~kEa)qd{&%P-(zDjPr+nCAaV77N{;#kUVZ0PlipU}BL7z+hZpP)HLJ z{4Fxo6v(lldq51pK;PCGQ3G_;97vL7YX8a$kRu>&03r({MD?eDuxu(&?Ks09j^CXE z1$A*Js0AIPdHhQxT>swnduc&$07lctZqP&k|FL_^JbY*|6*s^I^ma|IQtw#-5B*Eu zh37$l4~)}S_N_l%8=ZgY(H(#fKM#DpSvWr32BXh%$*Tf*LmL)1(XKzMqCKD=EQHpb z|40p~PX8>mV4^8{C#v8)GH?8b-y8ejj_pIyy!Q%fR{NH~+(*qi~-3iIR z)$unIXs=%Y_WS6P6z88&|0S_070}{Tap^y-{7ujkk-NP$|DkxlH^*x^Kmu~+PQSOp zpP?!q0aN~mF8mR!C$NJ&YX<*l=br^;0aJd_D`@{8^vnZ1o_|^NKNolpnDRfi*B^R* z08w_=n8EGe3;wgfx4@MDsT#lk{=^D=qN^(J#cyT(v%tR$|I6_Ip+J8%{I5y*KMd3B zzb56c4gcfm{yNQLf1{MYQOciuSGVo_3oG7dlvk^0MC*$NdN!< literal 0 HcmV?d00001 diff --git a/test.svg b/test.svg new file mode 100644 index 000000000..30dc7f3e8 --- /dev/null +++ b/test.svg @@ -0,0 +1,95 @@ +testaINTbINTFKcINTFK PKdVARCHAR(255)FK UNQ + + + diff --git a/testdata/d2compiler/TestCompile/array-classes.exp.json b/testdata/d2compiler/TestCompile/array-classes.exp.json index 3b4e75a95..5b8f0f4d7 100644 --- a/testdata/d2compiler/TestCompile/array-classes.exp.json +++ b/testdata/d2compiler/TestCompile/array-classes.exp.json @@ -623,7 +623,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -658,11 +660,9 @@ "direction": { "value": "" }, - "constraint": null, - "classes": [ - "path", - "path2" - ] + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -736,11 +736,9 @@ "direction": { "value": "" }, - "constraint": null, - "classes": [ - "dragon_ball", - "path" - ] + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -812,11 +810,9 @@ "direction": { "value": "" }, - "constraint": null, - "classes": [ - "path", - "dragon_ball" - ] + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/basic_icon.exp.json b/testdata/d2compiler/TestCompile/basic_icon.exp.json index fec8c9f44..bc9297187 100644 --- a/testdata/d2compiler/TestCompile/basic_icon.exp.json +++ b/testdata/d2compiler/TestCompile/basic_icon.exp.json @@ -93,7 +93,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -153,7 +155,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/basic_sequence.exp.json b/testdata/d2compiler/TestCompile/basic_sequence.exp.json index 40ecd99ad..115675dbb 100644 --- a/testdata/d2compiler/TestCompile/basic_sequence.exp.json +++ b/testdata/d2compiler/TestCompile/basic_sequence.exp.json @@ -88,7 +88,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -135,7 +137,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/basic_shape.exp.json b/testdata/d2compiler/TestCompile/basic_shape.exp.json index 74758c4b0..d5d26fb77 100644 --- a/testdata/d2compiler/TestCompile/basic_shape.exp.json +++ b/testdata/d2compiler/TestCompile/basic_shape.exp.json @@ -88,7 +88,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -135,7 +137,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/basic_style.exp.json b/testdata/d2compiler/TestCompile/basic_style.exp.json index d69341d1c..cb68c4cc1 100644 --- a/testdata/d2compiler/TestCompile/basic_style.exp.json +++ b/testdata/d2compiler/TestCompile/basic_style.exp.json @@ -95,7 +95,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -146,7 +148,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/class-shape-class.exp.json b/testdata/d2compiler/TestCompile/class-shape-class.exp.json index dd334affa..a787bab08 100644 --- a/testdata/d2compiler/TestCompile/class-shape-class.exp.json +++ b/testdata/d2compiler/TestCompile/class-shape-class.exp.json @@ -212,7 +212,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -269,7 +271,9 @@ "direction": { "value": "" }, - "constraint": null, + "constraint": { + "value": "" + }, "classes": [ "classClass" ] diff --git a/testdata/d2compiler/TestCompile/class_paren.exp.json b/testdata/d2compiler/TestCompile/class_paren.exp.json index 7d81a32af..aeaf5b5d4 100644 --- a/testdata/d2compiler/TestCompile/class_paren.exp.json +++ b/testdata/d2compiler/TestCompile/class_paren.exp.json @@ -187,7 +187,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -255,7 +257,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/class_style.exp.json b/testdata/d2compiler/TestCompile/class_style.exp.json index 32a6cc903..d9df3a793 100644 --- a/testdata/d2compiler/TestCompile/class_style.exp.json +++ b/testdata/d2compiler/TestCompile/class_style.exp.json @@ -161,7 +161,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -222,7 +224,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/classes.exp.json b/testdata/d2compiler/TestCompile/classes.exp.json index f1518a445..dc7045842 100644 --- a/testdata/d2compiler/TestCompile/classes.exp.json +++ b/testdata/d2compiler/TestCompile/classes.exp.json @@ -649,7 +649,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -684,7 +686,9 @@ "direction": { "value": "" }, - "constraint": null, + "constraint": { + "value": "" + }, "classes": [ "path" ] @@ -758,7 +762,9 @@ "direction": { "value": "" }, - "constraint": null, + "constraint": { + "value": "" + }, "classes": [ "dragon_ball" ] @@ -830,7 +836,9 @@ "direction": { "value": "" }, - "constraint": null, + "constraint": { + "value": "" + }, "classes": [ "dragon_ball" ] @@ -882,7 +890,9 @@ "direction": { "value": "" }, - "constraint": null, + "constraint": { + "value": "" + }, "classes": [ "dragon_ball" ] diff --git a/testdata/d2compiler/TestCompile/constraint_label.exp.json b/testdata/d2compiler/TestCompile/constraint_label.exp.json index 789a5e3d0..f85092e4c 100644 --- a/testdata/d2compiler/TestCompile/constraint_label.exp.json +++ b/testdata/d2compiler/TestCompile/constraint_label.exp.json @@ -121,7 +121,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -168,9 +170,9 @@ "direction": { "value": "" }, - "constraint": [ - "BIZ" - ] + "constraint": { + "value": "BIZ" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/default_direction.exp.json b/testdata/d2compiler/TestCompile/default_direction.exp.json index b412ef6b2..32057225f 100644 --- a/testdata/d2compiler/TestCompile/default_direction.exp.json +++ b/testdata/d2compiler/TestCompile/default_direction.exp.json @@ -49,7 +49,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -96,7 +98,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/dimension_with_style.exp.json b/testdata/d2compiler/TestCompile/dimension_with_style.exp.json index 8ed777881..ef03ae945 100644 --- a/testdata/d2compiler/TestCompile/dimension_with_style.exp.json +++ b/testdata/d2compiler/TestCompile/dimension_with_style.exp.json @@ -123,7 +123,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -177,7 +179,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/dimensions_on_containers.exp.json b/testdata/d2compiler/TestCompile/dimensions_on_containers.exp.json index 1ce908eb3..9cfeaf3bb 100644 --- a/testdata/d2compiler/TestCompile/dimensions_on_containers.exp.json +++ b/testdata/d2compiler/TestCompile/dimensions_on_containers.exp.json @@ -957,7 +957,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -1004,7 +1006,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -1052,7 +1056,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -1103,7 +1109,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -1154,7 +1162,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -1202,7 +1212,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -1253,7 +1265,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -1304,7 +1318,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -1355,7 +1371,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -1406,7 +1424,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/dimensions_on_nonimage.exp.json b/testdata/d2compiler/TestCompile/dimensions_on_nonimage.exp.json index 35a80069c..639d347d6 100644 --- a/testdata/d2compiler/TestCompile/dimensions_on_nonimage.exp.json +++ b/testdata/d2compiler/TestCompile/dimensions_on_nonimage.exp.json @@ -151,7 +151,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -204,7 +206,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge.exp.json b/testdata/d2compiler/TestCompile/edge.exp.json index 2758dc7a9..f888ec849 100644 --- a/testdata/d2compiler/TestCompile/edge.exp.json +++ b/testdata/d2compiler/TestCompile/edge.exp.json @@ -72,7 +72,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -103,7 +105,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -150,7 +154,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -195,7 +201,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json b/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json index 4ef1b9aa6..b5b40590e 100644 --- a/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json +++ b/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json @@ -251,7 +251,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -276,7 +278,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "dst_arrow": true, "dstArrowhead": { @@ -299,7 +303,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "references": [ { @@ -322,7 +328,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -369,7 +377,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -414,7 +424,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_arrowhead_primary.exp.json b/testdata/d2compiler/TestCompile/edge_arrowhead_primary.exp.json index 56fbc9a01..8d8ed8127 100644 --- a/testdata/d2compiler/TestCompile/edge_arrowhead_primary.exp.json +++ b/testdata/d2compiler/TestCompile/edge_arrowhead_primary.exp.json @@ -111,7 +111,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -136,7 +138,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "dst_arrow": true, "references": [ @@ -160,7 +164,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -207,7 +213,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -252,7 +260,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_chain.exp.json b/testdata/d2compiler/TestCompile/edge_chain.exp.json index b49dbc80e..539f25157 100644 --- a/testdata/d2compiler/TestCompile/edge_chain.exp.json +++ b/testdata/d2compiler/TestCompile/edge_chain.exp.json @@ -119,7 +119,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -150,7 +152,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -180,7 +184,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -227,7 +233,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -292,7 +300,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -337,7 +347,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_chain_map.exp.json b/testdata/d2compiler/TestCompile/edge_chain_map.exp.json index fd4ad255a..79bb97959 100644 --- a/testdata/d2compiler/TestCompile/edge_chain_map.exp.json +++ b/testdata/d2compiler/TestCompile/edge_chain_map.exp.json @@ -148,7 +148,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -179,7 +181,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -209,7 +213,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -256,7 +262,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -321,7 +329,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -366,7 +376,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_column_index.exp.json b/testdata/d2compiler/TestCompile/edge_column_index.exp.json index 61de9cdce..1921eab2b 100644 --- a/testdata/d2compiler/TestCompile/edge_column_index.exp.json +++ b/testdata/d2compiler/TestCompile/edge_column_index.exp.json @@ -350,7 +350,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -383,7 +385,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -472,7 +476,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -500,7 +504,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": null, + "constraint": "", "reference": "" } ] @@ -521,7 +525,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -608,7 +614,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -636,7 +642,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": null, + "constraint": "", "reference": "" } ] @@ -657,7 +663,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json b/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json index f0f3c8d6a..7a53845c0 100644 --- a/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json +++ b/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json @@ -117,7 +117,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -152,7 +154,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -199,7 +203,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -244,7 +250,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json index 3ebde90fc..650bd2797 100644 --- a/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json @@ -160,7 +160,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -185,7 +187,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "dst_arrow": true, "references": [ @@ -212,7 +216,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -279,7 +285,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -344,7 +352,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json index e058522ff..ad7c1b473 100644 --- a/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json @@ -128,7 +128,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -153,7 +155,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "dst_arrow": true, "references": [ @@ -177,7 +181,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -224,7 +230,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -269,7 +277,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_index.exp.json b/testdata/d2compiler/TestCompile/edge_index.exp.json index 5d41e9a8f..ca945bea7 100644 --- a/testdata/d2compiler/TestCompile/edge_index.exp.json +++ b/testdata/d2compiler/TestCompile/edge_index.exp.json @@ -143,7 +143,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -177,7 +179,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -244,7 +248,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -309,7 +315,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_index_map.exp.json b/testdata/d2compiler/TestCompile/edge_index_map.exp.json index 294aa8bab..0cafc323b 100644 --- a/testdata/d2compiler/TestCompile/edge_index_map.exp.json +++ b/testdata/d2compiler/TestCompile/edge_index_map.exp.json @@ -162,7 +162,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -196,7 +198,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -263,7 +267,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -328,7 +334,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_index_nested.exp.json b/testdata/d2compiler/TestCompile/edge_index_nested.exp.json index 8d8b5b5b9..d0c580715 100644 --- a/testdata/d2compiler/TestCompile/edge_index_nested.exp.json +++ b/testdata/d2compiler/TestCompile/edge_index_nested.exp.json @@ -172,7 +172,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -206,7 +208,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -253,7 +257,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -318,7 +324,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -383,7 +391,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json b/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json index 93e05726c..312d38e8d 100644 --- a/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json +++ b/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json @@ -188,7 +188,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -222,7 +224,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -289,7 +293,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -354,7 +360,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -419,7 +427,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.exp.json b/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.exp.json index 27406389d..bcad40145 100644 --- a/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.exp.json +++ b/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.exp.json @@ -201,7 +201,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -239,7 +241,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -306,7 +310,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -371,7 +377,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -436,7 +444,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.exp.json b/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.exp.json index f8a4cfdcc..d3c7ca6ed 100644 --- a/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.exp.json +++ b/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.exp.json @@ -207,7 +207,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -245,7 +247,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -292,7 +296,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -337,7 +343,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -382,7 +390,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.exp.json b/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.exp.json index f445b6e7f..63647e828 100644 --- a/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.exp.json +++ b/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.exp.json @@ -220,7 +220,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -258,7 +260,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -305,7 +309,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -350,7 +356,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -395,7 +403,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.exp.json b/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.exp.json index 9e0282760..7da55f2d6 100644 --- a/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.exp.json +++ b/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.exp.json @@ -238,7 +238,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -276,7 +278,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -323,7 +327,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -368,7 +374,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -413,7 +421,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_label_map.exp.json b/testdata/d2compiler/TestCompile/edge_label_map.exp.json index 754144cf6..4be3fe8c2 100644 --- a/testdata/d2compiler/TestCompile/edge_label_map.exp.json +++ b/testdata/d2compiler/TestCompile/edge_label_map.exp.json @@ -128,7 +128,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -163,7 +165,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -210,7 +214,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -255,7 +261,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_map.exp.json b/testdata/d2compiler/TestCompile/edge_map.exp.json index 3bae02599..a5431b793 100644 --- a/testdata/d2compiler/TestCompile/edge_map.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map.exp.json @@ -111,7 +111,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -142,7 +144,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -189,7 +193,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -234,7 +240,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json index ba7165ab1..88a53d3d2 100644 --- a/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json @@ -140,7 +140,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -165,7 +167,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "dst_arrow": true, "references": [ @@ -189,7 +193,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -236,7 +242,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -281,7 +289,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json b/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json index 3fc0fe7e6..a3524f7da 100644 --- a/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json @@ -156,7 +156,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -194,7 +196,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -261,7 +265,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -326,7 +332,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json b/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json index 42c80b924..630447498 100644 --- a/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json @@ -174,7 +174,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -212,7 +214,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -279,7 +283,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -344,7 +350,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_map_nested.exp.json b/testdata/d2compiler/TestCompile/edge_map_nested.exp.json index b7a5e9a71..ef5f4f2e8 100644 --- a/testdata/d2compiler/TestCompile/edge_map_nested.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_nested.exp.json @@ -136,7 +136,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -171,7 +173,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -218,7 +222,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -263,7 +269,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json b/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json index 3b9735f8b..11f5a9a8e 100644 --- a/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json @@ -118,7 +118,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -153,7 +155,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -200,7 +204,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -245,7 +251,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json index f84f23bab..100752bf7 100644 --- a/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json @@ -228,7 +228,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -253,7 +255,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "dst_arrow": true, "dstArrowhead": { @@ -272,7 +276,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "references": [ { @@ -298,7 +304,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -365,7 +373,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -430,7 +440,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json index 2f5c7b058..9684e7d9b 100644 --- a/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json @@ -122,7 +122,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -147,7 +149,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "dst_arrow": true, "references": [ @@ -171,7 +175,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -218,7 +224,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -263,7 +271,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json index 8c13431a6..e1998a59b 100644 --- a/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json @@ -178,7 +178,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -203,7 +205,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "dst_arrow": true, "references": [ @@ -230,7 +234,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -297,7 +303,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -362,7 +370,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/escaped_id.exp.json b/testdata/d2compiler/TestCompile/escaped_id.exp.json index 796618579..a5135358f 100644 --- a/testdata/d2compiler/TestCompile/escaped_id.exp.json +++ b/testdata/d2compiler/TestCompile/escaped_id.exp.json @@ -49,7 +49,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -96,7 +98,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/fill-pattern.exp.json b/testdata/d2compiler/TestCompile/fill-pattern.exp.json index 63ae0bdc0..6b30f7fc0 100644 --- a/testdata/d2compiler/TestCompile/fill-pattern.exp.json +++ b/testdata/d2compiler/TestCompile/fill-pattern.exp.json @@ -117,7 +117,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -168,7 +170,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/grid.exp.json b/testdata/d2compiler/TestCompile/grid.exp.json index 92d184f76..6c45373de 100644 --- a/testdata/d2compiler/TestCompile/grid.exp.json +++ b/testdata/d2compiler/TestCompile/grid.exp.json @@ -113,7 +113,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -160,7 +162,9 @@ "direction": { "value": "" }, - "constraint": null, + "constraint": { + "value": "" + }, "gridRows": { "value": "200" }, diff --git a/testdata/d2compiler/TestCompile/image_style.exp.json b/testdata/d2compiler/TestCompile/image_style.exp.json index 37a47c513..deba163ae 100644 --- a/testdata/d2compiler/TestCompile/image_style.exp.json +++ b/testdata/d2compiler/TestCompile/image_style.exp.json @@ -170,7 +170,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -234,7 +236,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/link-board-key-nested.exp.json b/testdata/d2compiler/TestCompile/link-board-key-nested.exp.json index 8158ac8ca..a06090d29 100644 --- a/testdata/d2compiler/TestCompile/link-board-key-nested.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-key-nested.exp.json @@ -179,7 +179,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -226,7 +228,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -285,7 +289,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -471,7 +477,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -518,7 +526,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/link-board-mixed.exp.json b/testdata/d2compiler/TestCompile/link-board-mixed.exp.json index ecfe17242..5026294ec 100644 --- a/testdata/d2compiler/TestCompile/link-board-mixed.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-mixed.exp.json @@ -329,7 +329,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -410,7 +412,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -746,7 +750,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -777,7 +783,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -824,7 +832,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -869,7 +879,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -1207,7 +1219,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -1334,7 +1348,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/link-board-nested.exp.json b/testdata/d2compiler/TestCompile/link-board-nested.exp.json index 05aa0f0eb..79b61eb73 100644 --- a/testdata/d2compiler/TestCompile/link-board-nested.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-nested.exp.json @@ -208,7 +208,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -269,7 +271,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -484,7 +488,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -700,7 +706,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -747,7 +755,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/link-board-ok.exp.json b/testdata/d2compiler/TestCompile/link-board-ok.exp.json index 5d6526c97..77fab9ab6 100644 --- a/testdata/d2compiler/TestCompile/link-board-ok.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-ok.exp.json @@ -150,7 +150,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -211,7 +213,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -368,7 +372,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -415,7 +421,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/link-board-underscore.exp.json b/testdata/d2compiler/TestCompile/link-board-underscore.exp.json index 4fd1a2f08..2fba9e04d 100644 --- a/testdata/d2compiler/TestCompile/link-board-underscore.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-underscore.exp.json @@ -274,7 +274,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -321,7 +323,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -602,7 +606,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -649,7 +655,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -930,7 +938,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -991,7 +1001,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -1050,7 +1062,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/missing-class.exp.json b/testdata/d2compiler/TestCompile/missing-class.exp.json index 1aa7a9673..9ba720cd7 100644 --- a/testdata/d2compiler/TestCompile/missing-class.exp.json +++ b/testdata/d2compiler/TestCompile/missing-class.exp.json @@ -70,7 +70,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -128,7 +130,9 @@ "direction": { "value": "" }, - "constraint": null, + "constraint": { + "value": "" + }, "classes": [ "yo" ] diff --git a/testdata/d2compiler/TestCompile/near_constant.exp.json b/testdata/d2compiler/TestCompile/near_constant.exp.json index 6139e09c5..9d3e863ea 100644 --- a/testdata/d2compiler/TestCompile/near_constant.exp.json +++ b/testdata/d2compiler/TestCompile/near_constant.exp.json @@ -70,7 +70,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -143,7 +145,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/nested_sql.exp.json b/testdata/d2compiler/TestCompile/nested_sql.exp.json index 85cd7107e..9c3d344c9 100644 --- a/testdata/d2compiler/TestCompile/nested_sql.exp.json +++ b/testdata/d2compiler/TestCompile/nested_sql.exp.json @@ -183,7 +183,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -230,7 +232,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -286,7 +290,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -314,7 +318,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": null, + "constraint": "", "reference": "" } ] @@ -335,7 +339,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/nil_scope_obj_regression.exp.json b/testdata/d2compiler/TestCompile/nil_scope_obj_regression.exp.json index e2ab08f59..92b041542 100644 --- a/testdata/d2compiler/TestCompile/nil_scope_obj_regression.exp.json +++ b/testdata/d2compiler/TestCompile/nil_scope_obj_regression.exp.json @@ -112,7 +112,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -190,7 +192,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -235,7 +239,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/null.exp.json b/testdata/d2compiler/TestCompile/null.exp.json index 9781daf23..65705d6c7 100644 --- a/testdata/d2compiler/TestCompile/null.exp.json +++ b/testdata/d2compiler/TestCompile/null.exp.json @@ -49,7 +49,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -96,7 +98,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/path_link.exp.json b/testdata/d2compiler/TestCompile/path_link.exp.json index 69a66c765..8d2ad1a19 100644 --- a/testdata/d2compiler/TestCompile/path_link.exp.json +++ b/testdata/d2compiler/TestCompile/path_link.exp.json @@ -88,7 +88,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -138,7 +140,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/positions.exp.json b/testdata/d2compiler/TestCompile/positions.exp.json index 877d874c3..f639d6d9f 100644 --- a/testdata/d2compiler/TestCompile/positions.exp.json +++ b/testdata/d2compiler/TestCompile/positions.exp.json @@ -113,7 +113,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -166,7 +168,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/reordered-classes.exp.json b/testdata/d2compiler/TestCompile/reordered-classes.exp.json index 9264f93b5..556b25462 100644 --- a/testdata/d2compiler/TestCompile/reordered-classes.exp.json +++ b/testdata/d2compiler/TestCompile/reordered-classes.exp.json @@ -216,7 +216,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -274,7 +276,9 @@ "direction": { "value": "" }, - "constraint": null, + "constraint": { + "value": "" + }, "classes": [ "x" ] diff --git a/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json b/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json index b1b0e5261..3a21e6622 100644 --- a/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json +++ b/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json @@ -283,7 +283,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -399,7 +401,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -444,7 +448,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/root_direction.exp.json b/testdata/d2compiler/TestCompile/root_direction.exp.json index 98ba30eda..64fce1459 100644 --- a/testdata/d2compiler/TestCompile/root_direction.exp.json +++ b/testdata/d2compiler/TestCompile/root_direction.exp.json @@ -59,7 +59,9 @@ "direction": { "value": "right" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, diff --git a/testdata/d2compiler/TestCompile/root_sequence.exp.json b/testdata/d2compiler/TestCompile/root_sequence.exp.json index 353ce9a61..39d523dd3 100644 --- a/testdata/d2compiler/TestCompile/root_sequence.exp.json +++ b/testdata/d2compiler/TestCompile/root_sequence.exp.json @@ -59,7 +59,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, diff --git a/testdata/d2compiler/TestCompile/self-referencing.exp.json b/testdata/d2compiler/TestCompile/self-referencing.exp.json index f03dfd7bc..4529e7133 100644 --- a/testdata/d2compiler/TestCompile/self-referencing.exp.json +++ b/testdata/d2compiler/TestCompile/self-referencing.exp.json @@ -72,7 +72,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -103,7 +105,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -170,7 +174,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/sequence-timestamp.exp.json b/testdata/d2compiler/TestCompile/sequence-timestamp.exp.json index 4863b889f..b72c145c3 100644 --- a/testdata/d2compiler/TestCompile/sequence-timestamp.exp.json +++ b/testdata/d2compiler/TestCompile/sequence-timestamp.exp.json @@ -243,7 +243,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -274,7 +276,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -372,7 +376,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -437,7 +443,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -482,7 +490,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -527,7 +537,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -583,7 +595,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/sequence_container.exp.json b/testdata/d2compiler/TestCompile/sequence_container.exp.json index fa20f600f..e99e98406 100644 --- a/testdata/d2compiler/TestCompile/sequence_container.exp.json +++ b/testdata/d2compiler/TestCompile/sequence_container.exp.json @@ -268,7 +268,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -299,7 +301,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -329,7 +333,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -440,7 +446,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -549,7 +557,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -658,7 +668,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -767,7 +779,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -876,7 +890,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -985,7 +1001,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -1030,7 +1048,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/sequence_container_2.exp.json b/testdata/d2compiler/TestCompile/sequence_container_2.exp.json index 0c16a5702..d243d21d7 100644 --- a/testdata/d2compiler/TestCompile/sequence_container_2.exp.json +++ b/testdata/d2compiler/TestCompile/sequence_container_2.exp.json @@ -246,7 +246,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -277,7 +279,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -388,7 +392,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -497,7 +503,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -606,7 +614,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -651,7 +661,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -718,7 +730,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -785,7 +799,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -852,7 +868,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -897,7 +915,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/sequence_grouped_note.exp.json b/testdata/d2compiler/TestCompile/sequence_grouped_note.exp.json index 574aaf9dd..d9046aa5e 100644 --- a/testdata/d2compiler/TestCompile/sequence_grouped_note.exp.json +++ b/testdata/d2compiler/TestCompile/sequence_grouped_note.exp.json @@ -168,7 +168,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -215,7 +217,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -291,7 +295,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -336,7 +342,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -392,7 +400,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/sequence_scoping.exp.json b/testdata/d2compiler/TestCompile/sequence_scoping.exp.json index 3742eb6d6..a16a4da10 100644 --- a/testdata/d2compiler/TestCompile/sequence_scoping.exp.json +++ b/testdata/d2compiler/TestCompile/sequence_scoping.exp.json @@ -356,7 +356,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -387,7 +389,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -417,7 +421,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -447,7 +453,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -494,7 +502,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -590,7 +600,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -759,7 +771,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -804,7 +818,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -860,7 +876,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -989,7 +1007,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -1056,7 +1076,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/set_direction.exp.json b/testdata/d2compiler/TestCompile/set_direction.exp.json index dc8c57b5b..655ebf0ae 100644 --- a/testdata/d2compiler/TestCompile/set_direction.exp.json +++ b/testdata/d2compiler/TestCompile/set_direction.exp.json @@ -88,7 +88,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -135,7 +137,9 @@ "direction": { "value": "left" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/single_dimension_on_circle.exp.json b/testdata/d2compiler/TestCompile/single_dimension_on_circle.exp.json index ebca6e33c..258a6a4a5 100644 --- a/testdata/d2compiler/TestCompile/single_dimension_on_circle.exp.json +++ b/testdata/d2compiler/TestCompile/single_dimension_on_circle.exp.json @@ -122,7 +122,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -172,7 +174,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/sql-constraints.exp.json b/testdata/d2compiler/TestCompile/sql-constraints.exp.json deleted file mode 100644 index 8a1742a81..000000000 --- a/testdata/d2compiler/TestCompile/sql-constraints.exp.json +++ /dev/null @@ -1,372 +0,0 @@ -{ - "graph": { - "name": "", - "isFolderOnly": false, - "ast": { - "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,0:0:0-4:1:110", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,0:0:0-4:1:110", - "key": { - "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,0:3:3-4:0:109", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,1:2:7-1:18:23", - "key": { - "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,1:2:7-1:7:12", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,1:2:7-1:7:12", - "value": [ - { - "string": "shape", - "raw_string": "shape" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,1:9:14-1:18:23", - "value": [ - { - "string": "sql_table", - "raw_string": "sql_table" - } - ] - } - } - } - }, - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,2:2:26-2:34:58", - "key": { - "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,2:2:26-2:3:27", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,2:2:26-2:3:27", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "primary": { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,2:5:29-2:8:32", - "value": [ - { - "string": "int", - "raw_string": "int" - } - ] - } - }, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,2:9:33-2:33:57", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,2:10:34-2:33:57", - "key": { - "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,2:10:34-2:20:44", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,2:10:34-2:20:44", - "value": [ - { - "string": "constraint", - "raw_string": "constraint" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,2:22:46-2:33:57", - "value": [ - { - "string": "primary_key", - "raw_string": "primary_key" - } - ] - } - } - } - } - ] - } - } - } - }, - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,3:2:61-3:49:108", - "key": { - "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,3:2:61-3:3:62", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,3:2:61-3:3:62", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "primary": { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,3:5:64-3:8:67", - "value": [ - { - "string": "int", - "raw_string": "int" - } - ] - } - }, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,3:9:68-3:48:107", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,3:10:69-3:48:107", - "key": { - "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,3:10:69-3:20:79", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,3:10:69-3:20:79", - "value": [ - { - "string": "constraint", - "raw_string": "constraint" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "array": { - "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,3:22:81-3:47:106", - "nodes": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,3:23:82-3:34:93", - "value": [ - { - "string": "primary_key", - "raw_string": "primary_key" - } - ] - } - }, - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,3:36:95-3:47:106", - "value": [ - { - "string": "foreign_key", - "raw_string": "foreign_key" - } - ] - } - } - ] - } - } - } - } - ] - } - } - } - } - ] - } - } - } - } - ] - }, - "root": { - "id": "", - "id_val": "", - "attributes": { - "label": { - "value": "" - }, - "labelDimensions": { - "width": 0, - "height": 0 - }, - "style": {}, - "near_key": null, - "shape": { - "value": "" - }, - "direction": { - "value": "" - }, - "constraint": null - }, - "zIndex": 0 - }, - "edges": null, - "objects": [ - { - "id": "x", - "id_val": "x", - "references": [ - { - "key": { - "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "key_path_index": 0, - "map_key_edge_index": -1 - } - ], - "sql_table": { - "columns": [ - { - "name": { - "label": "a", - "fontSize": 0, - "fontFamily": "", - "language": "", - "color": "", - "italic": false, - "bold": false, - "underline": false, - "labelWidth": 0, - "labelHeight": 0 - }, - "type": { - "label": "int", - "fontSize": 0, - "fontFamily": "", - "language": "", - "color": "", - "italic": false, - "bold": false, - "underline": false, - "labelWidth": 0, - "labelHeight": 0 - }, - "constraint": [ - "primary_key" - ], - "reference": "" - }, - { - "name": { - "label": "b", - "fontSize": 0, - "fontFamily": "", - "language": "", - "color": "", - "italic": false, - "bold": false, - "underline": false, - "labelWidth": 0, - "labelHeight": 0 - }, - "type": { - "label": "int", - "fontSize": 0, - "fontFamily": "", - "language": "", - "color": "", - "italic": false, - "bold": false, - "underline": false, - "labelWidth": 0, - "labelHeight": 0 - }, - "constraint": [ - "primary_key", - "foreign_key" - ], - "reference": "" - } - ] - }, - "attributes": { - "label": { - "value": "x" - }, - "labelDimensions": { - "width": 0, - "height": 0 - }, - "style": {}, - "near_key": null, - "shape": { - "value": "sql_table" - }, - "direction": { - "value": "" - }, - "constraint": null - }, - "zIndex": 0 - } - ] - }, - "err": null -} diff --git a/testdata/d2compiler/TestCompile/sql-regression.exp.json b/testdata/d2compiler/TestCompile/sql-regression.exp.json index 539adf1c0..29516d953 100644 --- a/testdata/d2compiler/TestCompile/sql-regression.exp.json +++ b/testdata/d2compiler/TestCompile/sql-regression.exp.json @@ -225,7 +225,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -276,7 +278,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -332,7 +336,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": null, + "constraint": "", "reference": "" } ] @@ -353,7 +357,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -398,7 +404,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/sql_paren.exp.json b/testdata/d2compiler/TestCompile/sql_paren.exp.json index eba972c81..4b2e0bb0a 100644 --- a/testdata/d2compiler/TestCompile/sql_paren.exp.json +++ b/testdata/d2compiler/TestCompile/sql_paren.exp.json @@ -164,7 +164,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -222,7 +224,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -250,7 +252,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": null, + "constraint": "", "reference": "" } ] @@ -271,7 +273,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/stroke-width.exp.json b/testdata/d2compiler/TestCompile/stroke-width.exp.json index 47a541da5..4f6868c69 100644 --- a/testdata/d2compiler/TestCompile/stroke-width.exp.json +++ b/testdata/d2compiler/TestCompile/stroke-width.exp.json @@ -95,7 +95,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -146,7 +148,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/table_connection_attr.exp.json b/testdata/d2compiler/TestCompile/table_connection_attr.exp.json index b959db14d..32b14aa78 100644 --- a/testdata/d2compiler/TestCompile/table_connection_attr.exp.json +++ b/testdata/d2compiler/TestCompile/table_connection_attr.exp.json @@ -309,7 +309,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -346,7 +348,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -435,7 +439,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": null, + "constraint": "", "reference": "" } ] @@ -456,7 +460,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -543,7 +549,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": null, + "constraint": "", "reference": "" } ] @@ -564,7 +570,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/table_style.exp.json b/testdata/d2compiler/TestCompile/table_style.exp.json index 57da002b7..56abfa352 100644 --- a/testdata/d2compiler/TestCompile/table_style.exp.json +++ b/testdata/d2compiler/TestCompile/table_style.exp.json @@ -161,7 +161,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -219,7 +221,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": null, + "constraint": "", "reference": "" } ] @@ -244,7 +246,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/table_style_map.exp.json b/testdata/d2compiler/TestCompile/table_style_map.exp.json index ec723d05d..9c2291acb 100644 --- a/testdata/d2compiler/TestCompile/table_style_map.exp.json +++ b/testdata/d2compiler/TestCompile/table_style_map.exp.json @@ -212,7 +212,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -270,7 +272,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": null, + "constraint": "", "reference": "" } ] @@ -298,7 +300,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/text-transform.exp.json b/testdata/d2compiler/TestCompile/text-transform.exp.json index d27559b8a..7a15df912 100644 --- a/testdata/d2compiler/TestCompile/text-transform.exp.json +++ b/testdata/d2compiler/TestCompile/text-transform.exp.json @@ -293,7 +293,9 @@ "direction": { "value": "right" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -328,7 +330,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -421,7 +425,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -512,7 +518,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/underscore_connection.exp.json b/testdata/d2compiler/TestCompile/underscore_connection.exp.json index 65295864e..0ede3dff7 100644 --- a/testdata/d2compiler/TestCompile/underscore_connection.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_connection.exp.json @@ -145,7 +145,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -176,7 +178,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -223,7 +227,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -332,7 +338,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -399,7 +407,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -466,7 +476,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/underscore_edge.exp.json b/testdata/d2compiler/TestCompile/underscore_edge.exp.json index 518dfce6a..e2e362d3e 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge.exp.json @@ -123,7 +123,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -154,7 +156,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -232,7 +236,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -288,7 +294,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json index 1f457aafb..b172abb7c 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json @@ -182,7 +182,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -213,7 +215,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -243,7 +247,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -352,7 +358,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -408,7 +416,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -464,7 +474,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json index cadedf170..45d5e9c44 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json @@ -189,7 +189,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -220,7 +222,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -250,7 +254,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -328,7 +334,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -404,7 +412,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -449,7 +459,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json index a25963442..cfc16dc74 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json @@ -194,7 +194,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -228,7 +230,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -275,7 +279,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -320,7 +326,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -365,7 +373,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json index ef0e52e5e..436f040f2 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json @@ -163,7 +163,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -194,7 +196,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -241,7 +245,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -317,7 +323,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -384,7 +392,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/underscore_parent_create.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_create.exp.json index 210d82d17..4db535bae 100644 --- a/testdata/d2compiler/TestCompile/underscore_parent_create.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_parent_create.exp.json @@ -89,7 +89,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -136,7 +138,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -192,7 +196,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/underscore_parent_not_root.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_not_root.exp.json index 61dfa7869..fc6b50a55 100644 --- a/testdata/d2compiler/TestCompile/underscore_parent_not_root.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_parent_not_root.exp.json @@ -118,7 +118,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -165,7 +167,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -210,7 +214,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -266,7 +272,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/underscore_parent_preference_1.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_preference_1.exp.json index 4db434860..52086b6ae 100644 --- a/testdata/d2compiler/TestCompile/underscore_parent_preference_1.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_parent_preference_1.exp.json @@ -132,7 +132,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -179,7 +181,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -255,7 +259,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/underscore_parent_preference_2.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_preference_2.exp.json index 5281966f7..f3243d490 100644 --- a/testdata/d2compiler/TestCompile/underscore_parent_preference_2.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_parent_preference_2.exp.json @@ -132,7 +132,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -210,7 +212,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -255,7 +259,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/underscore_parent_squared.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_squared.exp.json index ea0c6e33c..c81350873 100644 --- a/testdata/d2compiler/TestCompile/underscore_parent_squared.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_parent_squared.exp.json @@ -129,7 +129,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -176,7 +178,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -221,7 +225,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -288,7 +294,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/underscore_unresolved_obj.exp.json b/testdata/d2compiler/TestCompile/underscore_unresolved_obj.exp.json index d494bc12b..d5c56bdee 100644 --- a/testdata/d2compiler/TestCompile/underscore_unresolved_obj.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_unresolved_obj.exp.json @@ -89,7 +89,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -136,7 +138,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -192,7 +196,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/unescaped_id_cr.exp.json b/testdata/d2compiler/TestCompile/unescaped_id_cr.exp.json index 2b2f1b4f8..7a73c0b08 100644 --- a/testdata/d2compiler/TestCompile/unescaped_id_cr.exp.json +++ b/testdata/d2compiler/TestCompile/unescaped_id_cr.exp.json @@ -49,7 +49,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -96,7 +98,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/url_link.exp.json b/testdata/d2compiler/TestCompile/url_link.exp.json index ac23a6997..6bd4fe629 100644 --- a/testdata/d2compiler/TestCompile/url_link.exp.json +++ b/testdata/d2compiler/TestCompile/url_link.exp.json @@ -88,7 +88,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -138,7 +140,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/url_link_and_not_url_tooltip_concurrently.exp.json b/testdata/d2compiler/TestCompile/url_link_and_not_url_tooltip_concurrently.exp.json index 414c8364a..eef3087ba 100644 --- a/testdata/d2compiler/TestCompile/url_link_and_not_url_tooltip_concurrently.exp.json +++ b/testdata/d2compiler/TestCompile/url_link_and_not_url_tooltip_concurrently.exp.json @@ -121,7 +121,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -174,7 +176,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/url_tooltip.exp.json b/testdata/d2compiler/TestCompile/url_tooltip.exp.json index d59351628..8895108bd 100644 --- a/testdata/d2compiler/TestCompile/url_tooltip.exp.json +++ b/testdata/d2compiler/TestCompile/url_tooltip.exp.json @@ -88,7 +88,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -138,7 +140,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/wrong_column_index.exp.json b/testdata/d2compiler/TestCompile/wrong_column_index.exp.json index 5032468f6..1d80ecd54 100644 --- a/testdata/d2compiler/TestCompile/wrong_column_index.exp.json +++ b/testdata/d2compiler/TestCompile/wrong_column_index.exp.json @@ -710,7 +710,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -743,7 +745,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -832,9 +836,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": [ - "primary_key" - ], + "constraint": "primary_key", "reference": "" }, { @@ -862,7 +864,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -890,7 +892,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -918,7 +920,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -946,9 +948,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": [ - "foreign_key" - ], + "constraint": "foreign_key", "reference": "" }, { @@ -976,9 +976,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": [ - "foreign_key" - ], + "constraint": "foreign_key", "reference": "" } ] @@ -999,7 +997,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -1086,7 +1086,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": null, + "constraint": "", "reference": "" }, { @@ -1114,9 +1114,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": [ - "foreign_key" - ], + "constraint": "foreign_key", "reference": "" }, { @@ -1144,9 +1142,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": [ - "foreign_key" - ], + "constraint": "foreign_key", "reference": "" } ] @@ -1167,7 +1163,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile2/boards/isFolderOnly.exp.json b/testdata/d2compiler/TestCompile2/boards/isFolderOnly.exp.json index 4bcd01085..0a2c78652 100644 --- a/testdata/d2compiler/TestCompile2/boards/isFolderOnly.exp.json +++ b/testdata/d2compiler/TestCompile2/boards/isFolderOnly.exp.json @@ -307,7 +307,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -622,7 +624,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -669,7 +673,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -983,7 +989,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -1030,7 +1038,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -1344,7 +1354,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -1391,7 +1403,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -1705,7 +1719,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -1752,7 +1768,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile2/boards/recursive.exp.json b/testdata/d2compiler/TestCompile2/boards/recursive.exp.json index 5294489e9..ffb88ac9e 100644 --- a/testdata/d2compiler/TestCompile2/boards/recursive.exp.json +++ b/testdata/d2compiler/TestCompile2/boards/recursive.exp.json @@ -315,7 +315,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -362,7 +364,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -684,7 +688,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -731,7 +737,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -1053,7 +1061,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -1100,7 +1110,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -1422,7 +1434,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -1469,7 +1483,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -1514,7 +1530,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -1836,7 +1854,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -1883,7 +1903,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -1928,7 +1950,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -1973,7 +1997,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile2/boards/root.exp.json b/testdata/d2compiler/TestCompile2/boards/root.exp.json index 782eb55ea..e53b1ebc1 100644 --- a/testdata/d2compiler/TestCompile2/boards/root.exp.json +++ b/testdata/d2compiler/TestCompile2/boards/root.exp.json @@ -182,7 +182,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -229,7 +231,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -418,7 +422,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -465,7 +471,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -654,7 +662,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -701,7 +711,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.exp.json b/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.exp.json index 8e76d61e4..1ae53eaf1 100644 --- a/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.exp.json +++ b/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.exp.json @@ -214,7 +214,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -245,7 +247,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -292,7 +296,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -337,7 +343,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -558,7 +566,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -596,7 +606,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -663,7 +675,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -728,7 +742,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestCreate/base.exp.json b/testdata/d2oracle/TestCreate/base.exp.json index f552f394a..00929a93d 100644 --- a/testdata/d2oracle/TestCreate/base.exp.json +++ b/testdata/d2oracle/TestCreate/base.exp.json @@ -49,7 +49,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -96,7 +98,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestCreate/container.exp.json b/testdata/d2oracle/TestCreate/container.exp.json index 26f8e503a..313bc4453 100644 --- a/testdata/d2oracle/TestCreate/container.exp.json +++ b/testdata/d2oracle/TestCreate/container.exp.json @@ -78,7 +78,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -125,7 +127,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -170,7 +174,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestCreate/container_edge.exp.json b/testdata/d2oracle/TestCreate/container_edge.exp.json index 68fd9cc28..a27ba3057 100644 --- a/testdata/d2oracle/TestCreate/container_edge.exp.json +++ b/testdata/d2oracle/TestCreate/container_edge.exp.json @@ -101,7 +101,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -132,7 +134,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -179,7 +183,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -224,7 +230,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -269,7 +277,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestCreate/container_edge_label.exp.json b/testdata/d2oracle/TestCreate/container_edge_label.exp.json index 9caf6498b..0a36050a2 100644 --- a/testdata/d2oracle/TestCreate/container_edge_label.exp.json +++ b/testdata/d2oracle/TestCreate/container_edge_label.exp.json @@ -111,7 +111,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -142,7 +144,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -189,7 +193,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -234,7 +240,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -279,7 +287,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestCreate/edge.exp.json b/testdata/d2oracle/TestCreate/edge.exp.json index df430f4d7..15e79deed 100644 --- a/testdata/d2oracle/TestCreate/edge.exp.json +++ b/testdata/d2oracle/TestCreate/edge.exp.json @@ -72,7 +72,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -103,7 +105,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -150,7 +154,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -195,7 +201,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestCreate/edge_nested.exp.json b/testdata/d2oracle/TestCreate/edge_nested.exp.json index 2061d8072..f67e5d529 100644 --- a/testdata/d2oracle/TestCreate/edge_nested.exp.json +++ b/testdata/d2oracle/TestCreate/edge_nested.exp.json @@ -88,7 +88,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -119,7 +121,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -166,7 +170,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -211,7 +217,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -256,7 +264,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestCreate/edge_scope.exp.json b/testdata/d2oracle/TestCreate/edge_scope.exp.json index b31ac207b..d6026c51c 100644 --- a/testdata/d2oracle/TestCreate/edge_scope.exp.json +++ b/testdata/d2oracle/TestCreate/edge_scope.exp.json @@ -101,7 +101,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -132,7 +134,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -179,7 +183,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -224,7 +230,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -269,7 +277,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json b/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json index 62c427f4a..c35a7b9bb 100644 --- a/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json +++ b/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json @@ -101,7 +101,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -132,7 +134,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -179,7 +183,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -224,7 +230,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -269,7 +277,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json b/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json index 393dade54..580de558b 100644 --- a/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json +++ b/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json @@ -112,7 +112,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -143,7 +145,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -201,7 +205,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -257,7 +263,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -302,7 +310,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -347,7 +357,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestCreate/edge_unique.exp.json b/testdata/d2oracle/TestCreate/edge_unique.exp.json index c110db69f..d24660ebe 100644 --- a/testdata/d2oracle/TestCreate/edge_unique.exp.json +++ b/testdata/d2oracle/TestCreate/edge_unique.exp.json @@ -258,7 +258,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -289,7 +291,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -319,7 +323,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -349,7 +355,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -379,7 +387,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -426,7 +436,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -471,7 +483,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -556,7 +570,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -641,7 +657,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -726,7 +744,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestCreate/gen_key.exp.json b/testdata/d2oracle/TestCreate/gen_key.exp.json index 6d3333c4f..13f651219 100644 --- a/testdata/d2oracle/TestCreate/gen_key.exp.json +++ b/testdata/d2oracle/TestCreate/gen_key.exp.json @@ -72,7 +72,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -119,7 +121,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -164,7 +168,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestCreate/gen_key_n.exp.json b/testdata/d2oracle/TestCreate/gen_key_n.exp.json index a2e5c227f..b7f76f285 100644 --- a/testdata/d2oracle/TestCreate/gen_key_n.exp.json +++ b/testdata/d2oracle/TestCreate/gen_key_n.exp.json @@ -330,7 +330,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -399,7 +401,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -466,7 +470,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -533,7 +539,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -578,7 +586,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -623,7 +633,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -668,7 +680,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -713,7 +727,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -758,7 +774,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -803,7 +821,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -848,7 +868,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -893,7 +915,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -938,7 +962,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -983,7 +1009,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -1028,7 +1056,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestCreate/gen_key_nested.exp.json b/testdata/d2oracle/TestCreate/gen_key_nested.exp.json index 8e43202e6..64facd4a0 100644 --- a/testdata/d2oracle/TestCreate/gen_key_nested.exp.json +++ b/testdata/d2oracle/TestCreate/gen_key_nested.exp.json @@ -138,7 +138,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -271,7 +273,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -402,7 +406,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -533,7 +539,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -611,7 +619,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -689,7 +699,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestCreate/gen_key_scope.exp.json b/testdata/d2oracle/TestCreate/gen_key_scope.exp.json index 39d9d5b91..8151a96d6 100644 --- a/testdata/d2oracle/TestCreate/gen_key_scope.exp.json +++ b/testdata/d2oracle/TestCreate/gen_key_scope.exp.json @@ -123,7 +123,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -192,7 +194,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -259,7 +263,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -326,7 +332,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -371,7 +379,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -416,7 +426,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestCreate/gen_key_suffix.exp.json b/testdata/d2oracle/TestCreate/gen_key_suffix.exp.json index 2cc74b8aa..fb3bda2ab 100644 --- a/testdata/d2oracle/TestCreate/gen_key_suffix.exp.json +++ b/testdata/d2oracle/TestCreate/gen_key_suffix.exp.json @@ -72,7 +72,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -119,7 +121,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -164,7 +168,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestCreate/make_scope_multiline.exp.json b/testdata/d2oracle/TestCreate/make_scope_multiline.exp.json index dfc4c5ab0..c8a266867 100644 --- a/testdata/d2oracle/TestCreate/make_scope_multiline.exp.json +++ b/testdata/d2oracle/TestCreate/make_scope_multiline.exp.json @@ -111,7 +111,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -158,7 +160,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -203,7 +207,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.exp.json b/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.exp.json index d66653ae1..a3ca572b8 100644 --- a/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.exp.json +++ b/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.exp.json @@ -157,7 +157,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -204,7 +206,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -249,7 +253,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -294,7 +300,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -339,7 +347,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.exp.json b/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.exp.json index 0d04cefa4..736cd373f 100644 --- a/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.exp.json +++ b/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.exp.json @@ -157,7 +157,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -204,7 +206,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -249,7 +253,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -294,7 +300,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -339,7 +347,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestCreate/nested.exp.json b/testdata/d2oracle/TestCreate/nested.exp.json index aa857c317..24fc23908 100644 --- a/testdata/d2oracle/TestCreate/nested.exp.json +++ b/testdata/d2oracle/TestCreate/nested.exp.json @@ -71,7 +71,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -140,7 +142,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -207,7 +211,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -274,7 +280,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestCreate/scope.exp.json b/testdata/d2oracle/TestCreate/scope.exp.json index f33cce3d9..ed300d55d 100644 --- a/testdata/d2oracle/TestCreate/scope.exp.json +++ b/testdata/d2oracle/TestCreate/scope.exp.json @@ -100,7 +100,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -169,7 +171,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -236,7 +240,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -303,7 +309,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -348,7 +356,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/arrowhead.exp.json b/testdata/d2oracle/TestDelete/arrowhead.exp.json index 5c9f8c316..e9c991074 100644 --- a/testdata/d2oracle/TestDelete/arrowhead.exp.json +++ b/testdata/d2oracle/TestDelete/arrowhead.exp.json @@ -72,7 +72,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -103,7 +105,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -150,7 +154,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -195,7 +201,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/arrowhead_label.exp.json b/testdata/d2oracle/TestDelete/arrowhead_label.exp.json index 000bc8a0f..ee16c6be0 100644 --- a/testdata/d2oracle/TestDelete/arrowhead_label.exp.json +++ b/testdata/d2oracle/TestDelete/arrowhead_label.exp.json @@ -122,7 +122,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -148,7 +150,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "references": [ { @@ -171,7 +175,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -218,7 +224,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -263,7 +271,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/arrowhead_map.exp.json b/testdata/d2oracle/TestDelete/arrowhead_map.exp.json index fcbab2448..148b37cf2 100644 --- a/testdata/d2oracle/TestDelete/arrowhead_map.exp.json +++ b/testdata/d2oracle/TestDelete/arrowhead_map.exp.json @@ -72,7 +72,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -103,7 +105,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -150,7 +154,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -195,7 +201,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/arrowhead_shape.exp.json b/testdata/d2oracle/TestDelete/arrowhead_shape.exp.json index 2aaf8ac4f..748dc7359 100644 --- a/testdata/d2oracle/TestDelete/arrowhead_shape.exp.json +++ b/testdata/d2oracle/TestDelete/arrowhead_shape.exp.json @@ -72,7 +72,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -103,7 +105,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -150,7 +154,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -195,7 +201,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/breakup_arrowhead.exp.json b/testdata/d2oracle/TestDelete/breakup_arrowhead.exp.json index 59968f1d6..81f128ca2 100644 --- a/testdata/d2oracle/TestDelete/breakup_arrowhead.exp.json +++ b/testdata/d2oracle/TestDelete/breakup_arrowhead.exp.json @@ -49,7 +49,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -96,7 +98,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/chaos_1.exp.json b/testdata/d2oracle/TestDelete/chaos_1.exp.json index 0beb5eec5..281f52204 100644 --- a/testdata/d2oracle/TestDelete/chaos_1.exp.json +++ b/testdata/d2oracle/TestDelete/chaos_1.exp.json @@ -263,7 +263,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -288,7 +290,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "dst_arrow": true, "references": [ @@ -312,7 +316,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -419,7 +425,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -464,7 +472,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -509,7 +519,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/children.exp.json b/testdata/d2oracle/TestDelete/children.exp.json index 553912d8a..59151d5ca 100644 --- a/testdata/d2oracle/TestDelete/children.exp.json +++ b/testdata/d2oracle/TestDelete/children.exp.json @@ -95,7 +95,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -126,7 +128,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -173,7 +177,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -218,7 +224,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -263,7 +271,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/children_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_conflicts.exp.json index bfed5014b..b98430de1 100644 --- a/testdata/d2oracle/TestDelete/children_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_conflicts.exp.json @@ -72,7 +72,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -119,7 +121,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -164,7 +168,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json index 222e31cae..577ecc875 100644 --- a/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json @@ -128,7 +128,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -159,7 +161,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -226,7 +230,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -271,7 +277,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -316,7 +324,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json index 7b07abca7..c04e1106e 100644 --- a/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json @@ -221,7 +221,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -252,7 +254,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -282,7 +286,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -349,7 +355,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -414,7 +422,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -479,7 +489,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -524,7 +536,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -569,7 +583,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/children_flat_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_flat_conflicts.exp.json index fe212f64a..3cfa85bc2 100644 --- a/testdata/d2oracle/TestDelete/children_flat_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_flat_conflicts.exp.json @@ -105,7 +105,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -172,7 +174,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -217,7 +221,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json index 3aa36137a..f1dda9f2b 100644 --- a/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json @@ -197,7 +197,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -228,7 +230,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -315,7 +319,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -380,7 +386,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -425,7 +433,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -470,7 +480,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/children_nested_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_nested_conflicts.exp.json index 0cfaf5c8d..f63710718 100644 --- a/testdata/d2oracle/TestDelete/children_nested_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_nested_conflicts.exp.json @@ -101,7 +101,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -148,7 +150,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -193,7 +197,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -238,7 +244,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/children_nested_referenced_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_nested_referenced_conflicts.exp.json index 489e99551..6c0c07b4d 100644 --- a/testdata/d2oracle/TestDelete/children_nested_referenced_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_nested_referenced_conflicts.exp.json @@ -160,7 +160,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -269,7 +271,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -356,7 +360,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -401,7 +407,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/children_no_self_conflict.exp.json b/testdata/d2oracle/TestDelete/children_no_self_conflict.exp.json index 656125a78..d2734da1d 100644 --- a/testdata/d2oracle/TestDelete/children_no_self_conflict.exp.json +++ b/testdata/d2oracle/TestDelete/children_no_self_conflict.exp.json @@ -49,7 +49,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -96,7 +98,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/children_order.exp.json b/testdata/d2oracle/TestDelete/children_order.exp.json index 208847bc1..c9255013d 100644 --- a/testdata/d2oracle/TestDelete/children_order.exp.json +++ b/testdata/d2oracle/TestDelete/children_order.exp.json @@ -124,7 +124,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -171,7 +173,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -216,7 +220,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -261,7 +267,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -306,7 +314,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/children_referenced_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_referenced_conflicts.exp.json index 25088c478..f9acfe369 100644 --- a/testdata/d2oracle/TestDelete/children_referenced_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_referenced_conflicts.exp.json @@ -105,7 +105,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -172,7 +174,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -217,7 +221,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/children_scope.exp.json b/testdata/d2oracle/TestDelete/children_scope.exp.json index 77fec0e58..7557b9508 100644 --- a/testdata/d2oracle/TestDelete/children_scope.exp.json +++ b/testdata/d2oracle/TestDelete/children_scope.exp.json @@ -135,7 +135,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -166,7 +168,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -224,7 +228,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -280,7 +286,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -325,7 +333,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -370,7 +380,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -415,7 +427,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/class_refs.exp.json b/testdata/d2oracle/TestDelete/class_refs.exp.json index 965ae6c65..7196b7cab 100644 --- a/testdata/d2oracle/TestDelete/class_refs.exp.json +++ b/testdata/d2oracle/TestDelete/class_refs.exp.json @@ -25,7 +25,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, diff --git a/testdata/d2oracle/TestDelete/conflicts_generated.exp.json b/testdata/d2oracle/TestDelete/conflicts_generated.exp.json index 295ba993d..06b5c7bfb 100644 --- a/testdata/d2oracle/TestDelete/conflicts_generated.exp.json +++ b/testdata/d2oracle/TestDelete/conflicts_generated.exp.json @@ -124,7 +124,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -171,7 +173,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -216,7 +220,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -261,7 +267,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -306,7 +314,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/conflicts_generated_continued.exp.json b/testdata/d2oracle/TestDelete/conflicts_generated_continued.exp.json index b6b34b741..c11ac7776 100644 --- a/testdata/d2oracle/TestDelete/conflicts_generated_continued.exp.json +++ b/testdata/d2oracle/TestDelete/conflicts_generated_continued.exp.json @@ -95,7 +95,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -142,7 +144,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -187,7 +191,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -232,7 +238,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/container_near.exp.json b/testdata/d2oracle/TestDelete/container_near.exp.json index 62e53d145..9f216275b 100644 --- a/testdata/d2oracle/TestDelete/container_near.exp.json +++ b/testdata/d2oracle/TestDelete/container_near.exp.json @@ -173,7 +173,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -235,7 +237,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -280,7 +284,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -340,7 +346,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/delete_container_of_near.exp.json b/testdata/d2oracle/TestDelete/delete_container_of_near.exp.json index 7cf2ae66d..f070f1b82 100644 --- a/testdata/d2oracle/TestDelete/delete_container_of_near.exp.json +++ b/testdata/d2oracle/TestDelete/delete_container_of_near.exp.json @@ -481,7 +481,9 @@ "direction": { "value": "down" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -512,7 +514,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -542,7 +546,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -572,7 +578,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -602,7 +610,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -632,7 +642,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -662,7 +674,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -692,7 +706,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -722,7 +738,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -752,7 +770,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -799,7 +819,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -844,7 +866,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -889,7 +913,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -934,7 +960,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -999,7 +1027,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -1064,7 +1094,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -1149,7 +1181,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -1260,7 +1294,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -1325,7 +1361,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -1390,7 +1428,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -1435,7 +1475,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/delete_icon.exp.json b/testdata/d2oracle/TestDelete/delete_icon.exp.json index 016b3f03f..fd520cb59 100644 --- a/testdata/d2oracle/TestDelete/delete_icon.exp.json +++ b/testdata/d2oracle/TestDelete/delete_icon.exp.json @@ -99,7 +99,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -157,7 +159,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -216,7 +220,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/delete_link.exp.json b/testdata/d2oracle/TestDelete/delete_link.exp.json index b90432335..8971321a5 100644 --- a/testdata/d2oracle/TestDelete/delete_link.exp.json +++ b/testdata/d2oracle/TestDelete/delete_link.exp.json @@ -49,7 +49,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -96,7 +98,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/delete_near.exp.json b/testdata/d2oracle/TestDelete/delete_near.exp.json index 123053d74..2a1816a00 100644 --- a/testdata/d2oracle/TestDelete/delete_near.exp.json +++ b/testdata/d2oracle/TestDelete/delete_near.exp.json @@ -72,7 +72,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -119,7 +121,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -164,7 +168,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/delete_needed_flat_near.exp.json b/testdata/d2oracle/TestDelete/delete_needed_flat_near.exp.json index 1572242cc..3358a6682 100644 --- a/testdata/d2oracle/TestDelete/delete_needed_flat_near.exp.json +++ b/testdata/d2oracle/TestDelete/delete_needed_flat_near.exp.json @@ -72,7 +72,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -119,7 +121,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -164,7 +168,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/delete_redundant_flat_near.exp.json b/testdata/d2oracle/TestDelete/delete_redundant_flat_near.exp.json index dc12090dc..35cb1e9ee 100644 --- a/testdata/d2oracle/TestDelete/delete_redundant_flat_near.exp.json +++ b/testdata/d2oracle/TestDelete/delete_redundant_flat_near.exp.json @@ -72,7 +72,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -119,7 +121,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -164,7 +168,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/delete_tooltip.exp.json b/testdata/d2oracle/TestDelete/delete_tooltip.exp.json index 374052ed6..e69deea55 100644 --- a/testdata/d2oracle/TestDelete/delete_tooltip.exp.json +++ b/testdata/d2oracle/TestDelete/delete_tooltip.exp.json @@ -49,7 +49,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -96,7 +98,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/drop_value.exp.json b/testdata/d2oracle/TestDelete/drop_value.exp.json index ffa928761..e433d441d 100644 --- a/testdata/d2oracle/TestDelete/drop_value.exp.json +++ b/testdata/d2oracle/TestDelete/drop_value.exp.json @@ -60,7 +60,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -118,7 +120,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -174,7 +178,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/drop_value_with_primary.exp.json b/testdata/d2oracle/TestDelete/drop_value_with_primary.exp.json index b77b63a71..95bfecfae 100644 --- a/testdata/d2oracle/TestDelete/drop_value_with_primary.exp.json +++ b/testdata/d2oracle/TestDelete/drop_value_with_primary.exp.json @@ -49,7 +49,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -96,7 +98,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/duplicate_generated.exp.json b/testdata/d2oracle/TestDelete/duplicate_generated.exp.json index c157119f0..795869ebc 100644 --- a/testdata/d2oracle/TestDelete/duplicate_generated.exp.json +++ b/testdata/d2oracle/TestDelete/duplicate_generated.exp.json @@ -164,7 +164,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -211,7 +213,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -256,7 +260,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -301,7 +307,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -346,7 +354,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -391,7 +401,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -436,7 +448,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/edge-only-style.exp.json b/testdata/d2oracle/TestDelete/edge-only-style.exp.json index fee3e930b..d933367e3 100644 --- a/testdata/d2oracle/TestDelete/edge-only-style.exp.json +++ b/testdata/d2oracle/TestDelete/edge-only-style.exp.json @@ -72,7 +72,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -103,7 +105,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -150,7 +154,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -195,7 +201,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json b/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json index 832bed2b7..6742da8ec 100644 --- a/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json +++ b/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json @@ -105,7 +105,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -136,7 +138,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -236,7 +240,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -303,7 +309,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -370,7 +378,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -426,7 +436,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/edge_common.exp.json b/testdata/d2oracle/TestDelete/edge_common.exp.json index bbd0cd522..ac36a9a41 100644 --- a/testdata/d2oracle/TestDelete/edge_common.exp.json +++ b/testdata/d2oracle/TestDelete/edge_common.exp.json @@ -72,7 +72,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -103,7 +105,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -150,7 +154,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -195,7 +201,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/edge_common_2.exp.json b/testdata/d2oracle/TestDelete/edge_common_2.exp.json index a9d2f67b9..0577b3292 100644 --- a/testdata/d2oracle/TestDelete/edge_common_2.exp.json +++ b/testdata/d2oracle/TestDelete/edge_common_2.exp.json @@ -72,7 +72,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -103,7 +105,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -150,7 +154,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -195,7 +201,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/edge_common_3.exp.json b/testdata/d2oracle/TestDelete/edge_common_3.exp.json index 038ad6051..24b5ee815 100644 --- a/testdata/d2oracle/TestDelete/edge_common_3.exp.json +++ b/testdata/d2oracle/TestDelete/edge_common_3.exp.json @@ -94,7 +94,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -183,7 +185,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -239,7 +243,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -295,7 +301,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/edge_common_4.exp.json b/testdata/d2oracle/TestDelete/edge_common_4.exp.json index 22dc9057c..f6af89f48 100644 --- a/testdata/d2oracle/TestDelete/edge_common_4.exp.json +++ b/testdata/d2oracle/TestDelete/edge_common_4.exp.json @@ -94,7 +94,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -183,7 +185,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -239,7 +243,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -295,7 +301,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/edge_conflict.exp.json b/testdata/d2oracle/TestDelete/edge_conflict.exp.json index 5b48fa07b..8a1b3829f 100644 --- a/testdata/d2oracle/TestDelete/edge_conflict.exp.json +++ b/testdata/d2oracle/TestDelete/edge_conflict.exp.json @@ -117,7 +117,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -148,7 +150,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -237,7 +241,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -293,7 +299,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -349,7 +357,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -394,7 +404,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/edge_decrement.exp.json b/testdata/d2oracle/TestDelete/edge_decrement.exp.json index 77e73adcd..1eaab9e89 100644 --- a/testdata/d2oracle/TestDelete/edge_decrement.exp.json +++ b/testdata/d2oracle/TestDelete/edge_decrement.exp.json @@ -454,7 +454,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -488,7 +490,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -521,7 +525,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -554,7 +560,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -587,7 +595,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -774,7 +784,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -959,7 +971,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/edge_first.exp.json b/testdata/d2oracle/TestDelete/edge_first.exp.json index 2aaf53d9b..2d55e252c 100644 --- a/testdata/d2oracle/TestDelete/edge_first.exp.json +++ b/testdata/d2oracle/TestDelete/edge_first.exp.json @@ -183,7 +183,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -214,7 +216,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -244,7 +248,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -313,7 +319,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -380,7 +388,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -447,7 +457,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -492,7 +504,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -537,7 +551,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -602,7 +618,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -647,7 +665,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/edge_flat_style.exp.json b/testdata/d2oracle/TestDelete/edge_flat_style.exp.json index 9a91e3f76..ef273a614 100644 --- a/testdata/d2oracle/TestDelete/edge_flat_style.exp.json +++ b/testdata/d2oracle/TestDelete/edge_flat_style.exp.json @@ -49,7 +49,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -96,7 +98,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/edge_identical_child.exp.json b/testdata/d2oracle/TestDelete/edge_identical_child.exp.json index 3fc606cbf..64b346930 100644 --- a/testdata/d2oracle/TestDelete/edge_identical_child.exp.json +++ b/testdata/d2oracle/TestDelete/edge_identical_child.exp.json @@ -105,7 +105,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -136,7 +138,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -205,7 +209,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -272,7 +278,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -339,7 +347,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -395,7 +405,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -451,7 +463,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/edge_key_style.exp.json b/testdata/d2oracle/TestDelete/edge_key_style.exp.json index 167f0bb48..b0339c5b1 100644 --- a/testdata/d2oracle/TestDelete/edge_key_style.exp.json +++ b/testdata/d2oracle/TestDelete/edge_key_style.exp.json @@ -72,7 +72,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -103,7 +105,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -150,7 +154,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -195,7 +201,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/edge_last.exp.json b/testdata/d2oracle/TestDelete/edge_last.exp.json index 47b0c0ff7..116cd398e 100644 --- a/testdata/d2oracle/TestDelete/edge_last.exp.json +++ b/testdata/d2oracle/TestDelete/edge_last.exp.json @@ -220,7 +220,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -251,7 +253,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -281,7 +285,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -311,7 +317,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -380,7 +388,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -447,7 +457,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -514,7 +526,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -559,7 +573,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -624,7 +640,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -689,7 +707,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -734,7 +754,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -779,7 +801,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/edge_map_style.exp.json b/testdata/d2oracle/TestDelete/edge_map_style.exp.json index 2c3e64a6b..b34908eab 100644 --- a/testdata/d2oracle/TestDelete/edge_map_style.exp.json +++ b/testdata/d2oracle/TestDelete/edge_map_style.exp.json @@ -72,7 +72,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -103,7 +105,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -150,7 +154,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -195,7 +201,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/edge_middle.exp.json b/testdata/d2oracle/TestDelete/edge_middle.exp.json index 50c978d8b..5b25a1b51 100644 --- a/testdata/d2oracle/TestDelete/edge_middle.exp.json +++ b/testdata/d2oracle/TestDelete/edge_middle.exp.json @@ -206,7 +206,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -237,7 +239,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -267,7 +271,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -297,7 +303,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -366,7 +374,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -433,7 +443,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -500,7 +512,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -545,7 +559,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -610,7 +626,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -655,7 +673,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -700,7 +720,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -745,7 +767,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/empty_map.exp.json b/testdata/d2oracle/TestDelete/empty_map.exp.json index 948977db5..fc8d49b06 100644 --- a/testdata/d2oracle/TestDelete/empty_map.exp.json +++ b/testdata/d2oracle/TestDelete/empty_map.exp.json @@ -78,7 +78,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -125,7 +127,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -170,7 +174,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/flat.exp.json b/testdata/d2oracle/TestDelete/flat.exp.json index f40d4a886..60ff925c4 100644 --- a/testdata/d2oracle/TestDelete/flat.exp.json +++ b/testdata/d2oracle/TestDelete/flat.exp.json @@ -25,7 +25,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, diff --git a/testdata/d2oracle/TestDelete/flat_reserved.exp.json b/testdata/d2oracle/TestDelete/flat_reserved.exp.json index 9a2d4d6ef..08ee89d3d 100644 --- a/testdata/d2oracle/TestDelete/flat_reserved.exp.json +++ b/testdata/d2oracle/TestDelete/flat_reserved.exp.json @@ -72,7 +72,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -103,7 +105,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -150,7 +154,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -195,7 +201,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/hoist_children.exp.json b/testdata/d2oracle/TestDelete/hoist_children.exp.json index a8fdd39cd..e7e88fd2e 100644 --- a/testdata/d2oracle/TestDelete/hoist_children.exp.json +++ b/testdata/d2oracle/TestDelete/hoist_children.exp.json @@ -78,7 +78,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -125,7 +127,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -170,7 +174,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json b/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json index b0ee953db..20fbe284e 100644 --- a/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json +++ b/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json @@ -95,7 +95,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -126,7 +128,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -173,7 +177,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -218,7 +224,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -263,7 +271,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/key_with_edges.exp.json b/testdata/d2oracle/TestDelete/key_with_edges.exp.json index b627b4c4c..bb035803a 100644 --- a/testdata/d2oracle/TestDelete/key_with_edges.exp.json +++ b/testdata/d2oracle/TestDelete/key_with_edges.exp.json @@ -94,7 +94,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -183,7 +185,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -239,7 +243,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -295,7 +301,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/key_with_edges_2.exp.json b/testdata/d2oracle/TestDelete/key_with_edges_2.exp.json index 3d1f7b584..ae47c4e08 100644 --- a/testdata/d2oracle/TestDelete/key_with_edges_2.exp.json +++ b/testdata/d2oracle/TestDelete/key_with_edges_2.exp.json @@ -60,7 +60,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -118,7 +120,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -174,7 +178,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/key_with_edges_3.exp.json b/testdata/d2oracle/TestDelete/key_with_edges_3.exp.json index 1506c5f02..6a9419684 100644 --- a/testdata/d2oracle/TestDelete/key_with_edges_3.exp.json +++ b/testdata/d2oracle/TestDelete/key_with_edges_3.exp.json @@ -60,7 +60,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -118,7 +120,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -174,7 +178,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/key_with_edges_4.exp.json b/testdata/d2oracle/TestDelete/key_with_edges_4.exp.json index 605af29ab..98077ceb8 100644 --- a/testdata/d2oracle/TestDelete/key_with_edges_4.exp.json +++ b/testdata/d2oracle/TestDelete/key_with_edges_4.exp.json @@ -94,7 +94,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -183,7 +185,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -239,7 +243,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -295,7 +301,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/left.exp.json b/testdata/d2oracle/TestDelete/left.exp.json index ecb9c0394..beb1a5894 100644 --- a/testdata/d2oracle/TestDelete/left.exp.json +++ b/testdata/d2oracle/TestDelete/left.exp.json @@ -49,7 +49,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -96,7 +98,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/multi_near.exp.json b/testdata/d2oracle/TestDelete/multi_near.exp.json index 270b09dfa..4c73064fa 100644 --- a/testdata/d2oracle/TestDelete/multi_near.exp.json +++ b/testdata/d2oracle/TestDelete/multi_near.exp.json @@ -196,7 +196,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -243,7 +245,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -303,7 +307,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -363,7 +369,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -408,7 +416,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/multi_path_map_conflict.exp.json b/testdata/d2oracle/TestDelete/multi_path_map_conflict.exp.json index 2ffbd61e7..41419ac2a 100644 --- a/testdata/d2oracle/TestDelete/multi_path_map_conflict.exp.json +++ b/testdata/d2oracle/TestDelete/multi_path_map_conflict.exp.json @@ -130,7 +130,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -197,7 +199,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -242,7 +246,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -287,7 +293,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/multi_path_map_no_conflict.exp.json b/testdata/d2oracle/TestDelete/multi_path_map_no_conflict.exp.json index 770427f9f..7b3dcc4f0 100644 --- a/testdata/d2oracle/TestDelete/multi_path_map_no_conflict.exp.json +++ b/testdata/d2oracle/TestDelete/multi_path_map_no_conflict.exp.json @@ -101,7 +101,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -148,7 +150,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -193,7 +197,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -238,7 +244,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/multiple_flat_middle_container.exp.json b/testdata/d2oracle/TestDelete/multiple_flat_middle_container.exp.json index a50fae2dd..232329175 100644 --- a/testdata/d2oracle/TestDelete/multiple_flat_middle_container.exp.json +++ b/testdata/d2oracle/TestDelete/multiple_flat_middle_container.exp.json @@ -94,7 +94,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -183,7 +185,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -239,7 +243,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -295,7 +301,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/multiple_flat_style.exp.json b/testdata/d2oracle/TestDelete/multiple_flat_style.exp.json index daca2a820..dfe56bd26 100644 --- a/testdata/d2oracle/TestDelete/multiple_flat_style.exp.json +++ b/testdata/d2oracle/TestDelete/multiple_flat_style.exp.json @@ -77,7 +77,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -150,7 +152,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/multiple_map_styles.exp.json b/testdata/d2oracle/TestDelete/multiple_map_styles.exp.json index 786326a20..be177a849 100644 --- a/testdata/d2oracle/TestDelete/multiple_map_styles.exp.json +++ b/testdata/d2oracle/TestDelete/multiple_map_styles.exp.json @@ -113,7 +113,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -164,7 +166,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/near.exp.json b/testdata/d2oracle/TestDelete/near.exp.json index 0ce229964..66eadc967 100644 --- a/testdata/d2oracle/TestDelete/near.exp.json +++ b/testdata/d2oracle/TestDelete/near.exp.json @@ -49,7 +49,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -96,7 +98,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/nested.exp.json b/testdata/d2oracle/TestDelete/nested.exp.json index 462b1f7c6..0b8366219 100644 --- a/testdata/d2oracle/TestDelete/nested.exp.json +++ b/testdata/d2oracle/TestDelete/nested.exp.json @@ -71,7 +71,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -140,7 +142,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -207,7 +211,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -274,7 +280,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/nested_2.exp.json b/testdata/d2oracle/TestDelete/nested_2.exp.json index d473f7e02..79da6066b 100644 --- a/testdata/d2oracle/TestDelete/nested_2.exp.json +++ b/testdata/d2oracle/TestDelete/nested_2.exp.json @@ -71,7 +71,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -140,7 +142,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -207,7 +211,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -274,7 +280,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json b/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json index 83b5b9dce..d19aea41f 100644 --- a/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json +++ b/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json @@ -101,7 +101,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -132,7 +134,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -179,7 +183,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -224,7 +230,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -269,7 +277,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/nested_flat_style.exp.json b/testdata/d2oracle/TestDelete/nested_flat_style.exp.json index 6536e0ab9..48543dc61 100644 --- a/testdata/d2oracle/TestDelete/nested_flat_style.exp.json +++ b/testdata/d2oracle/TestDelete/nested_flat_style.exp.json @@ -49,7 +49,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -96,7 +98,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/nested_reserved.exp.json b/testdata/d2oracle/TestDelete/nested_reserved.exp.json index 38b307002..bd59d8373 100644 --- a/testdata/d2oracle/TestDelete/nested_reserved.exp.json +++ b/testdata/d2oracle/TestDelete/nested_reserved.exp.json @@ -105,7 +105,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -205,7 +207,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -303,7 +307,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -370,7 +376,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/nested_underscore_update.exp.json b/testdata/d2oracle/TestDelete/nested_underscore_update.exp.json index 075d9a1ac..ae69040d8 100644 --- a/testdata/d2oracle/TestDelete/nested_underscore_update.exp.json +++ b/testdata/d2oracle/TestDelete/nested_underscore_update.exp.json @@ -89,7 +89,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -136,7 +138,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -192,7 +196,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/node_in_edge.exp.json b/testdata/d2oracle/TestDelete/node_in_edge.exp.json index 8f4726d3c..691e5ab52 100644 --- a/testdata/d2oracle/TestDelete/node_in_edge.exp.json +++ b/testdata/d2oracle/TestDelete/node_in_edge.exp.json @@ -170,7 +170,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -201,7 +203,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -231,7 +235,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -278,7 +284,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -323,7 +331,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -368,7 +378,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -413,7 +425,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -458,7 +472,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -503,7 +519,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json b/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json index 2bfddb865..8dc6bd161 100644 --- a/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json +++ b/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json @@ -209,7 +209,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -240,7 +242,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -270,7 +274,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -300,7 +306,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -347,7 +355,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -412,7 +422,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -477,7 +489,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -522,7 +536,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -578,7 +594,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -634,7 +652,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -679,7 +699,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/only-underscore-nested.exp.json b/testdata/d2oracle/TestDelete/only-underscore-nested.exp.json index f82d339c6..0a3a1ad73 100644 --- a/testdata/d2oracle/TestDelete/only-underscore-nested.exp.json +++ b/testdata/d2oracle/TestDelete/only-underscore-nested.exp.json @@ -101,7 +101,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -148,7 +150,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -193,7 +197,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -238,7 +244,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/only-underscore.exp.json b/testdata/d2oracle/TestDelete/only-underscore.exp.json index c5893a70c..675240729 100644 --- a/testdata/d2oracle/TestDelete/only-underscore.exp.json +++ b/testdata/d2oracle/TestDelete/only-underscore.exp.json @@ -78,7 +78,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -125,7 +127,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -170,7 +174,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json b/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json index 76471937a..fdbb6c2d5 100644 --- a/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json +++ b/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json @@ -168,7 +168,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -199,7 +201,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -270,7 +274,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -335,7 +341,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json b/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json index 70fa358cf..34ac25510 100644 --- a/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json +++ b/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json @@ -168,7 +168,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -203,7 +205,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -270,7 +274,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -335,7 +341,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/order_1.exp.json b/testdata/d2oracle/TestDelete/order_1.exp.json index 97813befe..11726eded 100644 --- a/testdata/d2oracle/TestDelete/order_1.exp.json +++ b/testdata/d2oracle/TestDelete/order_1.exp.json @@ -95,7 +95,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -126,7 +128,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -173,7 +177,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -218,7 +224,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -263,7 +271,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/order_2.exp.json b/testdata/d2oracle/TestDelete/order_2.exp.json index fb792b501..03170d8fa 100644 --- a/testdata/d2oracle/TestDelete/order_2.exp.json +++ b/testdata/d2oracle/TestDelete/order_2.exp.json @@ -72,7 +72,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -119,7 +121,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -164,7 +168,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/order_3.exp.json b/testdata/d2oracle/TestDelete/order_3.exp.json index 3d12f9941..70949b8f9 100644 --- a/testdata/d2oracle/TestDelete/order_3.exp.json +++ b/testdata/d2oracle/TestDelete/order_3.exp.json @@ -72,7 +72,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -119,7 +121,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -164,7 +168,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/order_4.exp.json b/testdata/d2oracle/TestDelete/order_4.exp.json index b742e3635..6a678dd41 100644 --- a/testdata/d2oracle/TestDelete/order_4.exp.json +++ b/testdata/d2oracle/TestDelete/order_4.exp.json @@ -49,7 +49,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -96,7 +98,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/order_5.exp.json b/testdata/d2oracle/TestDelete/order_5.exp.json index e444a45fd..144fd9070 100644 --- a/testdata/d2oracle/TestDelete/order_5.exp.json +++ b/testdata/d2oracle/TestDelete/order_5.exp.json @@ -147,7 +147,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -178,7 +180,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -208,7 +212,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -255,7 +261,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -300,7 +308,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -345,7 +355,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -390,7 +402,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -435,7 +449,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/order_6.exp.json b/testdata/d2oracle/TestDelete/order_6.exp.json index b34decb23..982b01acc 100644 --- a/testdata/d2oracle/TestDelete/order_6.exp.json +++ b/testdata/d2oracle/TestDelete/order_6.exp.json @@ -123,7 +123,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -212,7 +214,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -257,7 +261,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -324,7 +330,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -391,7 +399,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/order_7.exp.json b/testdata/d2oracle/TestDelete/order_7.exp.json index 021a65f8c..b4aaa8cf5 100644 --- a/testdata/d2oracle/TestDelete/order_7.exp.json +++ b/testdata/d2oracle/TestDelete/order_7.exp.json @@ -134,7 +134,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -234,7 +236,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -279,7 +283,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -357,7 +363,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -435,7 +443,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -513,7 +523,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/order_8.exp.json b/testdata/d2oracle/TestDelete/order_8.exp.json index 962ecad45..670615295 100644 --- a/testdata/d2oracle/TestDelete/order_8.exp.json +++ b/testdata/d2oracle/TestDelete/order_8.exp.json @@ -141,7 +141,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -188,7 +190,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -233,7 +237,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -278,7 +284,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -323,7 +331,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -368,7 +378,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/save_map.exp.json b/testdata/d2oracle/TestDelete/save_map.exp.json index 52ae16215..90e716053 100644 --- a/testdata/d2oracle/TestDelete/save_map.exp.json +++ b/testdata/d2oracle/TestDelete/save_map.exp.json @@ -88,7 +88,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -135,7 +137,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/save_map_with_primary.exp.json b/testdata/d2oracle/TestDelete/save_map_with_primary.exp.json index bbfef6014..548eacac3 100644 --- a/testdata/d2oracle/TestDelete/save_map_with_primary.exp.json +++ b/testdata/d2oracle/TestDelete/save_map_with_primary.exp.json @@ -98,7 +98,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -145,7 +147,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/shape_class.exp.json b/testdata/d2oracle/TestDelete/shape_class.exp.json index e5f1f7ea9..30a5cbbf9 100644 --- a/testdata/d2oracle/TestDelete/shape_class.exp.json +++ b/testdata/d2oracle/TestDelete/shape_class.exp.json @@ -49,7 +49,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -96,7 +98,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/shape_sql_table.exp.json b/testdata/d2oracle/TestDelete/shape_sql_table.exp.json index ed75f0a6f..7b51e91f9 100644 --- a/testdata/d2oracle/TestDelete/shape_sql_table.exp.json +++ b/testdata/d2oracle/TestDelete/shape_sql_table.exp.json @@ -269,7 +269,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -300,7 +302,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -347,7 +351,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -454,9 +460,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": [ - "primary_key" - ], + "constraint": "primary_key", "reference": "" } ] @@ -477,7 +481,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -522,7 +528,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/singular_flat_style.exp.json b/testdata/d2oracle/TestDelete/singular_flat_style.exp.json index 4468c2179..ceb705b2d 100644 --- a/testdata/d2oracle/TestDelete/singular_flat_style.exp.json +++ b/testdata/d2oracle/TestDelete/singular_flat_style.exp.json @@ -49,7 +49,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -96,7 +98,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/singular_map_style.exp.json b/testdata/d2oracle/TestDelete/singular_map_style.exp.json index 341dfb3c4..8c846d60e 100644 --- a/testdata/d2oracle/TestDelete/singular_map_style.exp.json +++ b/testdata/d2oracle/TestDelete/singular_map_style.exp.json @@ -49,7 +49,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -96,7 +98,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/table_refs.exp.json b/testdata/d2oracle/TestDelete/table_refs.exp.json index 3f8867f6f..7cd4b6e1a 100644 --- a/testdata/d2oracle/TestDelete/table_refs.exp.json +++ b/testdata/d2oracle/TestDelete/table_refs.exp.json @@ -145,7 +145,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -234,7 +236,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": null, + "constraint": "", "reference": "" } ] @@ -255,7 +257,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/underscore_no_conflict.exp.json b/testdata/d2oracle/TestDelete/underscore_no_conflict.exp.json index 0d57688ed..ba51e7d5a 100644 --- a/testdata/d2oracle/TestDelete/underscore_no_conflict.exp.json +++ b/testdata/d2oracle/TestDelete/underscore_no_conflict.exp.json @@ -112,7 +112,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -159,7 +161,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -215,7 +219,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -260,7 +266,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/underscore_remove.exp.json b/testdata/d2oracle/TestDelete/underscore_remove.exp.json index 5036b08e4..d05524d74 100644 --- a/testdata/d2oracle/TestDelete/underscore_remove.exp.json +++ b/testdata/d2oracle/TestDelete/underscore_remove.exp.json @@ -141,7 +141,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -172,7 +174,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -202,7 +206,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -249,7 +255,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -294,7 +302,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -339,7 +349,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -384,7 +396,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -429,7 +443,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/width.exp.json b/testdata/d2oracle/TestDelete/width.exp.json index 9b46cd396..9f0aea140 100644 --- a/testdata/d2oracle/TestDelete/width.exp.json +++ b/testdata/d2oracle/TestDelete/width.exp.json @@ -49,7 +49,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -96,7 +98,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/append_multiple_styles.exp.json b/testdata/d2oracle/TestMove/append_multiple_styles.exp.json index c85307811..4ae722c82 100644 --- a/testdata/d2oracle/TestMove/append_multiple_styles.exp.json +++ b/testdata/d2oracle/TestMove/append_multiple_styles.exp.json @@ -233,7 +233,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -280,7 +282,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -352,7 +356,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/basic.exp.json b/testdata/d2oracle/TestMove/basic.exp.json index cf783246e..395accc11 100644 --- a/testdata/d2oracle/TestMove/basic.exp.json +++ b/testdata/d2oracle/TestMove/basic.exp.json @@ -49,7 +49,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -96,7 +98,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/basic_nested.exp.json b/testdata/d2oracle/TestMove/basic_nested.exp.json index 416933111..3d50e422a 100644 --- a/testdata/d2oracle/TestMove/basic_nested.exp.json +++ b/testdata/d2oracle/TestMove/basic_nested.exp.json @@ -78,7 +78,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -125,7 +127,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -170,7 +174,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/basic_out_of_container.exp.json b/testdata/d2oracle/TestMove/basic_out_of_container.exp.json index fbe57ba9f..72d30748b 100644 --- a/testdata/d2oracle/TestMove/basic_out_of_container.exp.json +++ b/testdata/d2oracle/TestMove/basic_out_of_container.exp.json @@ -72,7 +72,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -119,7 +121,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -164,7 +168,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/between_containers.exp.json b/testdata/d2oracle/TestMove/between_containers.exp.json index 539d1eb0f..76f5a3554 100644 --- a/testdata/d2oracle/TestMove/between_containers.exp.json +++ b/testdata/d2oracle/TestMove/between_containers.exp.json @@ -101,7 +101,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -148,7 +150,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -193,7 +197,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -238,7 +244,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/chain_connected_nested.exp.json b/testdata/d2oracle/TestMove/chain_connected_nested.exp.json index 3f2051aba..031cbc070 100644 --- a/testdata/d2oracle/TestMove/chain_connected_nested.exp.json +++ b/testdata/d2oracle/TestMove/chain_connected_nested.exp.json @@ -132,7 +132,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -163,7 +165,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -193,7 +197,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -260,7 +266,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -325,7 +333,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -370,7 +380,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.exp.json b/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.exp.json index 30e25898c..5810e288e 100644 --- a/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.exp.json +++ b/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.exp.json @@ -120,7 +120,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -151,7 +153,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -181,7 +185,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -239,7 +245,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -295,7 +303,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -360,7 +370,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -405,7 +417,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/connected_nested.exp.json b/testdata/d2oracle/TestMove/connected_nested.exp.json index a8295f2bf..de374c82f 100644 --- a/testdata/d2oracle/TestMove/connected_nested.exp.json +++ b/testdata/d2oracle/TestMove/connected_nested.exp.json @@ -95,7 +95,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -126,7 +128,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -173,7 +177,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -218,7 +224,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -263,7 +271,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/container_conflicts_generated.exp.json b/testdata/d2oracle/TestMove/container_conflicts_generated.exp.json index 0c7173d53..5e3a6e282 100644 --- a/testdata/d2oracle/TestMove/container_conflicts_generated.exp.json +++ b/testdata/d2oracle/TestMove/container_conflicts_generated.exp.json @@ -139,7 +139,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -186,7 +188,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -231,7 +235,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -276,7 +282,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -321,7 +329,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/container_multiple_refs_with_underscore.exp.json b/testdata/d2oracle/TestMove/container_multiple_refs_with_underscore.exp.json index 24692953a..1d6a6ebc1 100644 --- a/testdata/d2oracle/TestMove/container_multiple_refs_with_underscore.exp.json +++ b/testdata/d2oracle/TestMove/container_multiple_refs_with_underscore.exp.json @@ -78,7 +78,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -125,7 +127,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -170,7 +174,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/container_near.exp.json b/testdata/d2oracle/TestMove/container_near.exp.json index 2ea7eccbb..05201a9b6 100644 --- a/testdata/d2oracle/TestMove/container_near.exp.json +++ b/testdata/d2oracle/TestMove/container_near.exp.json @@ -203,7 +203,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -250,7 +252,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -332,7 +336,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -388,7 +394,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -444,7 +452,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -489,7 +499,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -534,7 +546,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/duplicate.exp.json b/testdata/d2oracle/TestMove/duplicate.exp.json index 6ea0399ea..aeb168979 100644 --- a/testdata/d2oracle/TestMove/duplicate.exp.json +++ b/testdata/d2oracle/TestMove/duplicate.exp.json @@ -134,7 +134,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -201,7 +203,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -246,7 +250,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/duplicate_generated.exp.json b/testdata/d2oracle/TestMove/duplicate_generated.exp.json index 4412a6bb0..22654afcc 100644 --- a/testdata/d2oracle/TestMove/duplicate_generated.exp.json +++ b/testdata/d2oracle/TestMove/duplicate_generated.exp.json @@ -193,7 +193,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -240,7 +242,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -285,7 +289,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -330,7 +336,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -375,7 +383,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -420,7 +430,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -465,7 +477,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -510,7 +524,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/edge_across_containers.exp.json b/testdata/d2oracle/TestMove/edge_across_containers.exp.json index c8bc7c1ed..bc9126e8a 100644 --- a/testdata/d2oracle/TestMove/edge_across_containers.exp.json +++ b/testdata/d2oracle/TestMove/edge_across_containers.exp.json @@ -146,7 +146,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -177,7 +179,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -224,7 +228,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -311,7 +317,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -378,7 +386,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -423,7 +433,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/edge_basic.exp.json b/testdata/d2oracle/TestMove/edge_basic.exp.json index 5ac3d39dc..c8b153273 100644 --- a/testdata/d2oracle/TestMove/edge_basic.exp.json +++ b/testdata/d2oracle/TestMove/edge_basic.exp.json @@ -72,7 +72,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -103,7 +105,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -150,7 +154,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -195,7 +201,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/edge_chain_basic.exp.json b/testdata/d2oracle/TestMove/edge_chain_basic.exp.json index 16bc91df2..ce721c308 100644 --- a/testdata/d2oracle/TestMove/edge_chain_basic.exp.json +++ b/testdata/d2oracle/TestMove/edge_chain_basic.exp.json @@ -109,7 +109,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -140,7 +142,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -170,7 +174,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -217,7 +223,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -282,7 +290,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -327,7 +337,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/edge_chain_circular.exp.json b/testdata/d2oracle/TestMove/edge_chain_circular.exp.json index eee4a6c53..653ab7d08 100644 --- a/testdata/d2oracle/TestMove/edge_chain_circular.exp.json +++ b/testdata/d2oracle/TestMove/edge_chain_circular.exp.json @@ -160,7 +160,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -191,7 +193,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -221,7 +225,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -268,7 +274,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -355,7 +363,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -420,7 +430,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json b/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json index 7e6bab461..d49f6a447 100644 --- a/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json +++ b/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json @@ -143,7 +143,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -174,7 +176,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -204,7 +208,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -282,7 +288,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -338,7 +346,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -403,7 +413,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -448,7 +460,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json b/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json index 9458469ea..575675351 100644 --- a/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json +++ b/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json @@ -160,7 +160,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -191,7 +193,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -221,7 +225,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -268,7 +274,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -313,7 +321,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -400,7 +410,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -445,7 +457,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/edge_conflict.exp.json b/testdata/d2oracle/TestMove/edge_conflict.exp.json index e10a2cb4d..a908608d3 100644 --- a/testdata/d2oracle/TestMove/edge_conflict.exp.json +++ b/testdata/d2oracle/TestMove/edge_conflict.exp.json @@ -146,7 +146,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -177,7 +179,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -266,7 +270,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -322,7 +328,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -378,7 +386,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -423,7 +433,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -468,7 +480,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/edge_into_container.exp.json b/testdata/d2oracle/TestMove/edge_into_container.exp.json index ebb40a815..8c1cfb37a 100644 --- a/testdata/d2oracle/TestMove/edge_into_container.exp.json +++ b/testdata/d2oracle/TestMove/edge_into_container.exp.json @@ -135,7 +135,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -166,7 +168,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -244,7 +248,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -289,7 +295,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -345,7 +353,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -390,7 +400,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/edge_nested_basic.exp.json b/testdata/d2oracle/TestMove/edge_nested_basic.exp.json index 1ae49d92e..24a4ba70e 100644 --- a/testdata/d2oracle/TestMove/edge_nested_basic.exp.json +++ b/testdata/d2oracle/TestMove/edge_nested_basic.exp.json @@ -101,7 +101,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -132,7 +134,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -179,7 +183,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -224,7 +230,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -269,7 +277,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/edge_out_of_container.exp.json b/testdata/d2oracle/TestMove/edge_out_of_container.exp.json index da6e089a8..fbf01a18f 100644 --- a/testdata/d2oracle/TestMove/edge_out_of_container.exp.json +++ b/testdata/d2oracle/TestMove/edge_out_of_container.exp.json @@ -112,7 +112,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -143,7 +145,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -190,7 +194,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -246,7 +252,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -291,7 +299,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/extend_map.exp.json b/testdata/d2oracle/TestMove/extend_map.exp.json index 5883a2402..a9bc27742 100644 --- a/testdata/d2oracle/TestMove/extend_map.exp.json +++ b/testdata/d2oracle/TestMove/extend_map.exp.json @@ -159,7 +159,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -226,7 +228,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -271,7 +275,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -316,7 +322,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -361,7 +369,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/extend_stationary_path.exp.json b/testdata/d2oracle/TestMove/extend_stationary_path.exp.json index f65c5ef79..c1388762e 100644 --- a/testdata/d2oracle/TestMove/extend_stationary_path.exp.json +++ b/testdata/d2oracle/TestMove/extend_stationary_path.exp.json @@ -152,7 +152,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -241,7 +243,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -328,7 +332,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -415,7 +421,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/flat_between_containers.exp.json b/testdata/d2oracle/TestMove/flat_between_containers.exp.json index ed420bc52..f383bbd08 100644 --- a/testdata/d2oracle/TestMove/flat_between_containers.exp.json +++ b/testdata/d2oracle/TestMove/flat_between_containers.exp.json @@ -101,7 +101,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -148,7 +150,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -193,7 +197,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -238,7 +244,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/flat_merge.exp.json b/testdata/d2oracle/TestMove/flat_merge.exp.json index f9404e9b9..1a71d4059 100644 --- a/testdata/d2oracle/TestMove/flat_merge.exp.json +++ b/testdata/d2oracle/TestMove/flat_merge.exp.json @@ -134,7 +134,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -181,7 +183,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -226,7 +230,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -271,7 +277,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -316,7 +324,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/flat_middle_container.exp.json b/testdata/d2oracle/TestMove/flat_middle_container.exp.json index fe7060966..7ee1856dc 100644 --- a/testdata/d2oracle/TestMove/flat_middle_container.exp.json +++ b/testdata/d2oracle/TestMove/flat_middle_container.exp.json @@ -112,7 +112,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -170,7 +172,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -226,7 +230,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -271,7 +277,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -316,7 +324,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/flat_nested_merge.exp.json b/testdata/d2oracle/TestMove/flat_nested_merge.exp.json index 12346aca8..455a2f981 100644 --- a/testdata/d2oracle/TestMove/flat_nested_merge.exp.json +++ b/testdata/d2oracle/TestMove/flat_nested_merge.exp.json @@ -190,7 +190,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -270,7 +272,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -348,7 +352,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -426,7 +432,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -504,7 +512,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -560,7 +570,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -616,7 +628,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -683,7 +697,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -750,7 +766,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -817,7 +835,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -862,7 +882,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/flat_nested_merge_multiple_refs.exp.json b/testdata/d2oracle/TestMove/flat_nested_merge_multiple_refs.exp.json index 9eda1abc2..177336e19 100644 --- a/testdata/d2oracle/TestMove/flat_nested_merge_multiple_refs.exp.json +++ b/testdata/d2oracle/TestMove/flat_nested_merge_multiple_refs.exp.json @@ -288,7 +288,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -430,7 +432,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -581,7 +585,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -732,7 +738,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -777,7 +785,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -822,7 +832,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -867,7 +879,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -912,7 +926,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -990,7 +1006,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/flat_reparent_with_map_value.exp.json b/testdata/d2oracle/TestMove/flat_reparent_with_map_value.exp.json index f587d63fd..6da1ee6d5 100644 --- a/testdata/d2oracle/TestMove/flat_reparent_with_map_value.exp.json +++ b/testdata/d2oracle/TestMove/flat_reparent_with_map_value.exp.json @@ -111,7 +111,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -158,7 +160,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -203,7 +207,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/flat_reparent_with_mixed_map_value.exp.json b/testdata/d2oracle/TestMove/flat_reparent_with_mixed_map_value.exp.json index 4210e6a2a..c5c8e6e7d 100644 --- a/testdata/d2oracle/TestMove/flat_reparent_with_mixed_map_value.exp.json +++ b/testdata/d2oracle/TestMove/flat_reparent_with_mixed_map_value.exp.json @@ -152,7 +152,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -199,7 +201,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -244,7 +248,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -289,7 +295,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/flat_reparent_with_value.exp.json b/testdata/d2oracle/TestMove/flat_reparent_with_value.exp.json index 936069718..f17aff8a0 100644 --- a/testdata/d2oracle/TestMove/flat_reparent_with_value.exp.json +++ b/testdata/d2oracle/TestMove/flat_reparent_with_value.exp.json @@ -82,7 +82,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -129,7 +131,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -174,7 +178,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/flat_style.exp.json b/testdata/d2oracle/TestMove/flat_style.exp.json index 9a3353650..66f168b08 100644 --- a/testdata/d2oracle/TestMove/flat_style.exp.json +++ b/testdata/d2oracle/TestMove/flat_style.exp.json @@ -161,7 +161,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -208,7 +210,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -324,7 +328,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/full_edge_slice.exp.json b/testdata/d2oracle/TestMove/full_edge_slice.exp.json index 7b5c9799d..9ae346bc4 100644 --- a/testdata/d2oracle/TestMove/full_edge_slice.exp.json +++ b/testdata/d2oracle/TestMove/full_edge_slice.exp.json @@ -215,7 +215,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -246,7 +248,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -276,7 +280,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -354,7 +360,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -399,7 +407,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -495,7 +505,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -571,7 +583,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/full_slice.exp.json b/testdata/d2oracle/TestMove/full_slice.exp.json index 5264e53dd..bd3bf0e72 100644 --- a/testdata/d2oracle/TestMove/full_slice.exp.json +++ b/testdata/d2oracle/TestMove/full_slice.exp.json @@ -101,7 +101,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -148,7 +150,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -193,7 +197,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -238,7 +244,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/gnarly_1.exp.json b/testdata/d2oracle/TestMove/gnarly_1.exp.json index ae3f67e35..7f572e447 100644 --- a/testdata/d2oracle/TestMove/gnarly_1.exp.json +++ b/testdata/d2oracle/TestMove/gnarly_1.exp.json @@ -359,7 +359,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -390,7 +392,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -420,7 +424,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -450,7 +456,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -519,7 +527,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -586,7 +596,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -653,7 +665,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -760,7 +774,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -827,7 +843,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -894,7 +912,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -939,7 +959,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -1046,7 +1068,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -1122,7 +1146,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -1178,7 +1204,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -1234,7 +1262,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -1290,7 +1320,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/hoist_container_children.exp.json b/testdata/d2oracle/TestMove/hoist_container_children.exp.json index 828b515b7..da7bbfa2f 100644 --- a/testdata/d2oracle/TestMove/hoist_container_children.exp.json +++ b/testdata/d2oracle/TestMove/hoist_container_children.exp.json @@ -124,7 +124,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -171,7 +173,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -216,7 +220,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -261,7 +267,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -306,7 +314,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/into_container_existing_map.exp.json b/testdata/d2oracle/TestMove/into_container_existing_map.exp.json index fdb447e25..d693f7bd4 100644 --- a/testdata/d2oracle/TestMove/into_container_existing_map.exp.json +++ b/testdata/d2oracle/TestMove/into_container_existing_map.exp.json @@ -101,7 +101,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -148,7 +150,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -193,7 +197,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -238,7 +244,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/into_container_nonexisting_map.exp.json b/testdata/d2oracle/TestMove/into_container_nonexisting_map.exp.json index 787da3561..406d1ef9f 100644 --- a/testdata/d2oracle/TestMove/into_container_nonexisting_map.exp.json +++ b/testdata/d2oracle/TestMove/into_container_nonexisting_map.exp.json @@ -78,7 +78,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -125,7 +127,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -170,7 +174,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/into_container_with_flat_keys.exp.json b/testdata/d2oracle/TestMove/into_container_with_flat_keys.exp.json index 7ed84d7a5..135a83ef7 100644 --- a/testdata/d2oracle/TestMove/into_container_with_flat_keys.exp.json +++ b/testdata/d2oracle/TestMove/into_container_with_flat_keys.exp.json @@ -212,7 +212,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -259,7 +261,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -314,7 +318,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/into_container_with_flat_style.exp.json b/testdata/d2oracle/TestMove/into_container_with_flat_style.exp.json index 22709097f..bba5f98b6 100644 --- a/testdata/d2oracle/TestMove/into_container_with_flat_style.exp.json +++ b/testdata/d2oracle/TestMove/into_container_with_flat_style.exp.json @@ -118,7 +118,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -169,7 +171,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -214,7 +218,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/map_transplant.exp.json b/testdata/d2oracle/TestMove/map_transplant.exp.json index 223c5c8d3..586e8b616 100644 --- a/testdata/d2oracle/TestMove/map_transplant.exp.json +++ b/testdata/d2oracle/TestMove/map_transplant.exp.json @@ -221,7 +221,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -268,7 +270,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -313,7 +317,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -358,7 +364,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -407,7 +415,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/map_with_label.exp.json b/testdata/d2oracle/TestMove/map_with_label.exp.json index 45253ad5f..7a1c7fd9f 100644 --- a/testdata/d2oracle/TestMove/map_with_label.exp.json +++ b/testdata/d2oracle/TestMove/map_with_label.exp.json @@ -111,7 +111,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -158,7 +160,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -203,7 +207,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -248,7 +254,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/merge_nested_maps.exp.json b/testdata/d2oracle/TestMove/merge_nested_maps.exp.json index 54b97c569..b6c858933 100644 --- a/testdata/d2oracle/TestMove/merge_nested_maps.exp.json +++ b/testdata/d2oracle/TestMove/merge_nested_maps.exp.json @@ -272,7 +272,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -319,7 +321,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -468,7 +472,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -524,7 +530,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -600,7 +608,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -667,7 +677,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -734,7 +746,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -779,7 +793,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -824,7 +840,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/merge_reserved.exp.json b/testdata/d2oracle/TestMove/merge_reserved.exp.json index 15bad681f..59eadcb67 100644 --- a/testdata/d2oracle/TestMove/merge_reserved.exp.json +++ b/testdata/d2oracle/TestMove/merge_reserved.exp.json @@ -263,7 +263,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -310,7 +312,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -448,7 +452,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -504,7 +510,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -560,7 +568,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -616,7 +626,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -661,7 +673,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/middle_container.exp.json b/testdata/d2oracle/TestMove/middle_container.exp.json index 1b3c7ee23..12bae318b 100644 --- a/testdata/d2oracle/TestMove/middle_container.exp.json +++ b/testdata/d2oracle/TestMove/middle_container.exp.json @@ -101,7 +101,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -148,7 +150,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -193,7 +197,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -238,7 +244,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/middle_container_generated_conflict.exp.json b/testdata/d2oracle/TestMove/middle_container_generated_conflict.exp.json index 71050570c..a309e0c34 100644 --- a/testdata/d2oracle/TestMove/middle_container_generated_conflict.exp.json +++ b/testdata/d2oracle/TestMove/middle_container_generated_conflict.exp.json @@ -295,7 +295,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -326,7 +328,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -356,7 +360,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -496,7 +502,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -572,7 +580,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -648,7 +658,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -713,7 +725,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -789,7 +803,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -834,7 +850,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/move_container_children.exp.json b/testdata/d2oracle/TestMove/move_container_children.exp.json index 4df2648ca..3a76c1c31 100644 --- a/testdata/d2oracle/TestMove/move_container_children.exp.json +++ b/testdata/d2oracle/TestMove/move_container_children.exp.json @@ -147,7 +147,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -194,7 +196,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -239,7 +243,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -284,7 +290,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -329,7 +337,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -374,7 +384,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/move_container_conflict_children.exp.json b/testdata/d2oracle/TestMove/move_container_conflict_children.exp.json index 513f59915..1f7889425 100644 --- a/testdata/d2oracle/TestMove/move_container_conflict_children.exp.json +++ b/testdata/d2oracle/TestMove/move_container_conflict_children.exp.json @@ -147,7 +147,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -194,7 +196,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -239,7 +243,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -284,7 +290,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -329,7 +337,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -374,7 +384,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/move_into_key_with_value.exp.json b/testdata/d2oracle/TestMove/move_into_key_with_value.exp.json index 4f3b67fa0..2feb2e4b4 100644 --- a/testdata/d2oracle/TestMove/move_into_key_with_value.exp.json +++ b/testdata/d2oracle/TestMove/move_into_key_with_value.exp.json @@ -88,7 +88,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -135,7 +137,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -180,7 +184,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/move_out_of_edge.exp.json b/testdata/d2oracle/TestMove/move_out_of_edge.exp.json index 0e30a304a..a8f68bf18 100644 --- a/testdata/d2oracle/TestMove/move_out_of_edge.exp.json +++ b/testdata/d2oracle/TestMove/move_out_of_edge.exp.json @@ -128,7 +128,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -159,7 +161,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -217,7 +221,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -273,7 +279,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -340,7 +348,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -407,7 +417,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -474,7 +486,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -519,7 +533,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/move_out_of_nested_edge.exp.json b/testdata/d2oracle/TestMove/move_out_of_nested_edge.exp.json index a27cfd89f..45411b8f5 100644 --- a/testdata/d2oracle/TestMove/move_out_of_nested_edge.exp.json +++ b/testdata/d2oracle/TestMove/move_out_of_nested_edge.exp.json @@ -168,7 +168,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -199,7 +201,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -257,7 +261,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -313,7 +319,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -411,7 +419,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -509,7 +519,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -576,7 +588,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -621,7 +635,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/multiple_nesting_levels.exp.json b/testdata/d2oracle/TestMove/multiple_nesting_levels.exp.json index a954f0406..3bfdd13a4 100644 --- a/testdata/d2oracle/TestMove/multiple_nesting_levels.exp.json +++ b/testdata/d2oracle/TestMove/multiple_nesting_levels.exp.json @@ -283,7 +283,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -383,7 +385,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -523,7 +527,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -683,7 +689,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -728,7 +736,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -773,7 +783,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -840,7 +852,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -918,7 +932,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/near.exp.json b/testdata/d2oracle/TestMove/near.exp.json index 852a73b54..31cde246f 100644 --- a/testdata/d2oracle/TestMove/near.exp.json +++ b/testdata/d2oracle/TestMove/near.exp.json @@ -140,7 +140,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -213,7 +215,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -258,7 +262,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -303,7 +309,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/nested-underscore-move-out.exp.json b/testdata/d2oracle/TestMove/nested-underscore-move-out.exp.json index b0c57105a..1dc1b90c3 100644 --- a/testdata/d2oracle/TestMove/nested-underscore-move-out.exp.json +++ b/testdata/d2oracle/TestMove/nested-underscore-move-out.exp.json @@ -101,7 +101,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -148,7 +150,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -193,7 +197,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -238,7 +244,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/nhooyr_one.exp.json b/testdata/d2oracle/TestMove/nhooyr_one.exp.json index d66f6960c..59cd0e06b 100644 --- a/testdata/d2oracle/TestMove/nhooyr_one.exp.json +++ b/testdata/d2oracle/TestMove/nhooyr_one.exp.json @@ -130,7 +130,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -177,7 +179,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -222,7 +226,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -267,7 +273,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -312,7 +320,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/nhooyr_two.exp.json b/testdata/d2oracle/TestMove/nhooyr_two.exp.json index f5c587e61..3faa27f08 100644 --- a/testdata/d2oracle/TestMove/nhooyr_two.exp.json +++ b/testdata/d2oracle/TestMove/nhooyr_two.exp.json @@ -176,7 +176,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -207,7 +209,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -254,7 +258,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -299,7 +305,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -344,7 +352,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -389,7 +399,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -434,7 +446,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -479,7 +493,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/out_of_newline_container.exp.json b/testdata/d2oracle/TestMove/out_of_newline_container.exp.json index 406266d42..b4979b03d 100644 --- a/testdata/d2oracle/TestMove/out_of_newline_container.exp.json +++ b/testdata/d2oracle/TestMove/out_of_newline_container.exp.json @@ -72,7 +72,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -119,7 +121,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -164,7 +168,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/parentheses.exp.json b/testdata/d2oracle/TestMove/parentheses.exp.json index cf72f932a..d59d54b5f 100644 --- a/testdata/d2oracle/TestMove/parentheses.exp.json +++ b/testdata/d2oracle/TestMove/parentheses.exp.json @@ -111,7 +111,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -142,7 +144,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -189,7 +193,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -265,7 +271,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -321,7 +329,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/partial_edge_slice.exp.json b/testdata/d2oracle/TestMove/partial_edge_slice.exp.json index 710b71d9b..aee09a349 100644 --- a/testdata/d2oracle/TestMove/partial_edge_slice.exp.json +++ b/testdata/d2oracle/TestMove/partial_edge_slice.exp.json @@ -118,7 +118,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -149,7 +151,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -196,7 +200,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -261,7 +267,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -306,7 +314,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/partial_slice.exp.json b/testdata/d2oracle/TestMove/partial_slice.exp.json index adc1a450c..b2ff45583 100644 --- a/testdata/d2oracle/TestMove/partial_slice.exp.json +++ b/testdata/d2oracle/TestMove/partial_slice.exp.json @@ -72,7 +72,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -119,7 +121,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -164,7 +168,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/rename_2.exp.json b/testdata/d2oracle/TestMove/rename_2.exp.json index 4d9afd231..c998f5188 100644 --- a/testdata/d2oracle/TestMove/rename_2.exp.json +++ b/testdata/d2oracle/TestMove/rename_2.exp.json @@ -147,7 +147,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -194,7 +196,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -239,7 +243,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -284,7 +290,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -329,7 +337,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -374,7 +384,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/reuse_map.exp.json b/testdata/d2oracle/TestMove/reuse_map.exp.json index d50ff4940..4913ec646 100644 --- a/testdata/d2oracle/TestMove/reuse_map.exp.json +++ b/testdata/d2oracle/TestMove/reuse_map.exp.json @@ -164,7 +164,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -211,7 +213,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -287,7 +291,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -332,7 +338,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -377,7 +385,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -433,7 +443,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/slice_style.exp.json b/testdata/d2oracle/TestMove/slice_style.exp.json index b0f40fb09..364a1ec65 100644 --- a/testdata/d2oracle/TestMove/slice_style.exp.json +++ b/testdata/d2oracle/TestMove/slice_style.exp.json @@ -116,7 +116,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -163,7 +165,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -252,7 +256,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/underscore-connection.exp.json b/testdata/d2oracle/TestMove/underscore-connection.exp.json index ffa45addb..45a2ba38c 100644 --- a/testdata/d2oracle/TestMove/underscore-connection.exp.json +++ b/testdata/d2oracle/TestMove/underscore-connection.exp.json @@ -220,7 +220,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -251,7 +253,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -298,7 +302,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -427,7 +433,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -514,7 +522,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -601,7 +611,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/underscore_children.exp.json b/testdata/d2oracle/TestMove/underscore_children.exp.json index e12a60427..34035e86c 100644 --- a/testdata/d2oracle/TestMove/underscore_children.exp.json +++ b/testdata/d2oracle/TestMove/underscore_children.exp.json @@ -112,7 +112,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -159,7 +161,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -235,7 +239,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/underscore_edge_children.exp.json b/testdata/d2oracle/TestMove/underscore_edge_children.exp.json index da36792ce..720b01ae2 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_children.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_children.exp.json @@ -135,7 +135,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -166,7 +168,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -213,7 +217,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -289,7 +295,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -334,7 +342,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json index a1ec31cc3..7c6bb7452 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json @@ -101,7 +101,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -132,7 +134,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -179,7 +183,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -224,7 +230,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -269,7 +277,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json index dd300395c..6c97bcbec 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json @@ -112,7 +112,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -143,7 +145,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -190,7 +194,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -266,7 +272,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -322,7 +330,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json index f3d86845a..daa84062c 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json @@ -112,7 +112,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -143,7 +145,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -190,7 +194,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -246,7 +252,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -291,7 +299,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json index 09588a797..66b9b06c8 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json @@ -101,7 +101,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -132,7 +134,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -179,7 +183,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -224,7 +230,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -269,7 +277,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json index 68957c378..7b1a4901d 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json @@ -134,7 +134,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -165,7 +167,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -212,7 +216,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -310,7 +316,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -377,7 +385,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/underscore_edge_split.exp.json b/testdata/d2oracle/TestMove/underscore_edge_split.exp.json index 316581086..777d6ba3e 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_split.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_split.exp.json @@ -164,7 +164,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -195,7 +197,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -242,7 +246,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -287,7 +293,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -343,7 +351,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -388,7 +398,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -433,7 +445,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/underscore_merge.exp.json b/testdata/d2oracle/TestMove/underscore_merge.exp.json index 853d19030..6c3414052 100644 --- a/testdata/d2oracle/TestMove/underscore_merge.exp.json +++ b/testdata/d2oracle/TestMove/underscore_merge.exp.json @@ -144,7 +144,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -191,7 +193,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -236,7 +240,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -301,7 +307,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/underscore_split.exp.json b/testdata/d2oracle/TestMove/underscore_split.exp.json index 46394f97a..e190dfd0e 100644 --- a/testdata/d2oracle/TestMove/underscore_split.exp.json +++ b/testdata/d2oracle/TestMove/underscore_split.exp.json @@ -141,7 +141,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -188,7 +190,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -233,7 +237,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -289,7 +295,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -334,7 +342,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/underscore_split_out.exp.json b/testdata/d2oracle/TestMove/underscore_split_out.exp.json index 502f2ad3b..2656b7b49 100644 --- a/testdata/d2oracle/TestMove/underscore_split_out.exp.json +++ b/testdata/d2oracle/TestMove/underscore_split_out.exp.json @@ -199,7 +199,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -246,7 +248,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -291,7 +295,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -367,7 +373,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -412,7 +420,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -457,7 +467,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/underscore_transplant.exp.json b/testdata/d2oracle/TestMove/underscore_transplant.exp.json index 3f94db4a3..1c92d49c1 100644 --- a/testdata/d2oracle/TestMove/underscore_transplant.exp.json +++ b/testdata/d2oracle/TestMove/underscore_transplant.exp.json @@ -101,7 +101,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -148,7 +150,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -193,7 +197,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -238,7 +244,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/unique_name.exp.json b/testdata/d2oracle/TestMove/unique_name.exp.json index db79c3a90..7f676ea29 100644 --- a/testdata/d2oracle/TestMove/unique_name.exp.json +++ b/testdata/d2oracle/TestMove/unique_name.exp.json @@ -158,7 +158,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -236,7 +238,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -312,7 +316,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -357,7 +363,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -402,7 +410,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/unique_name_with_references.exp.json b/testdata/d2oracle/TestMove/unique_name_with_references.exp.json index 75ef2e6c3..504797987 100644 --- a/testdata/d2oracle/TestMove/unique_name_with_references.exp.json +++ b/testdata/d2oracle/TestMove/unique_name_with_references.exp.json @@ -181,7 +181,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -212,7 +214,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -290,7 +294,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -335,7 +341,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -411,7 +419,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -456,7 +466,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -501,7 +513,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestRename/arrows.exp.json b/testdata/d2oracle/TestRename/arrows.exp.json index 053fc2385..65601ceb2 100644 --- a/testdata/d2oracle/TestRename/arrows.exp.json +++ b/testdata/d2oracle/TestRename/arrows.exp.json @@ -72,7 +72,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -103,7 +105,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -150,7 +154,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -195,7 +201,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestRename/arrows_chain.exp.json b/testdata/d2oracle/TestRename/arrows_chain.exp.json index dea6f70fe..ebbc0754c 100644 --- a/testdata/d2oracle/TestRename/arrows_chain.exp.json +++ b/testdata/d2oracle/TestRename/arrows_chain.exp.json @@ -146,7 +146,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -177,7 +179,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -207,7 +211,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -237,7 +243,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -284,7 +292,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -349,7 +359,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -414,7 +426,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -459,7 +473,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestRename/arrows_complex.exp.json b/testdata/d2oracle/TestRename/arrows_complex.exp.json index 71ad234df..92260d221 100644 --- a/testdata/d2oracle/TestRename/arrows_complex.exp.json +++ b/testdata/d2oracle/TestRename/arrows_complex.exp.json @@ -126,7 +126,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -157,7 +159,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -215,7 +219,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -271,7 +277,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -316,7 +324,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -361,7 +371,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestRename/arrows_trim_common.exp.json b/testdata/d2oracle/TestRename/arrows_trim_common.exp.json index 249395f9d..bda0cfb12 100644 --- a/testdata/d2oracle/TestRename/arrows_trim_common.exp.json +++ b/testdata/d2oracle/TestRename/arrows_trim_common.exp.json @@ -162,7 +162,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -193,7 +195,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -223,7 +227,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -253,7 +259,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -300,7 +308,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -345,7 +355,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -410,7 +422,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -475,7 +489,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -520,7 +536,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json b/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json index ee47fe5d2..d5603eef6 100644 --- a/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json +++ b/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json @@ -212,7 +212,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -243,7 +245,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -273,7 +277,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -303,7 +309,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -516,7 +524,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -572,7 +582,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -659,7 +671,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -746,7 +760,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -802,7 +818,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestRename/complex_edge_1.exp.json b/testdata/d2oracle/TestRename/complex_edge_1.exp.json index f9331bf08..1fb5764c4 100644 --- a/testdata/d2oracle/TestRename/complex_edge_1.exp.json +++ b/testdata/d2oracle/TestRename/complex_edge_1.exp.json @@ -126,7 +126,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -157,7 +159,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -215,7 +219,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -271,7 +277,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -316,7 +324,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -361,7 +371,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestRename/complex_edge_2.exp.json b/testdata/d2oracle/TestRename/complex_edge_2.exp.json index ff471c689..d060f7c14 100644 --- a/testdata/d2oracle/TestRename/complex_edge_2.exp.json +++ b/testdata/d2oracle/TestRename/complex_edge_2.exp.json @@ -126,7 +126,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -157,7 +159,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -215,7 +219,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -271,7 +277,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -316,7 +324,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -361,7 +371,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestRename/conflict.exp.json b/testdata/d2oracle/TestRename/conflict.exp.json index c882e1f56..bda1da047 100644 --- a/testdata/d2oracle/TestRename/conflict.exp.json +++ b/testdata/d2oracle/TestRename/conflict.exp.json @@ -72,7 +72,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -119,7 +121,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -164,7 +168,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestRename/conflict_2.exp.json b/testdata/d2oracle/TestRename/conflict_2.exp.json index 3fbd503aa..dd888cf03 100644 --- a/testdata/d2oracle/TestRename/conflict_2.exp.json +++ b/testdata/d2oracle/TestRename/conflict_2.exp.json @@ -123,7 +123,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -192,7 +194,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -259,7 +263,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -326,7 +332,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -371,7 +379,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -416,7 +426,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestRename/conflict_with_dots.exp.json b/testdata/d2oracle/TestRename/conflict_with_dots.exp.json index 229aff72e..09834764a 100644 --- a/testdata/d2oracle/TestRename/conflict_with_dots.exp.json +++ b/testdata/d2oracle/TestRename/conflict_with_dots.exp.json @@ -72,7 +72,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -119,7 +121,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -164,7 +168,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestRename/conflict_with_numbers.exp.json b/testdata/d2oracle/TestRename/conflict_with_numbers.exp.json index 85b87e0db..73c080df8 100644 --- a/testdata/d2oracle/TestRename/conflict_with_numbers.exp.json +++ b/testdata/d2oracle/TestRename/conflict_with_numbers.exp.json @@ -72,7 +72,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -119,7 +121,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -164,7 +168,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestRename/container.exp.json b/testdata/d2oracle/TestRename/container.exp.json index c8585d3f3..830fb8025 100644 --- a/testdata/d2oracle/TestRename/container.exp.json +++ b/testdata/d2oracle/TestRename/container.exp.json @@ -751,7 +751,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -785,7 +787,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -815,7 +819,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -845,7 +851,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -875,7 +883,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -905,7 +915,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -935,7 +947,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -965,7 +979,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -1253,7 +1269,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -1539,7 +1557,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -1814,7 +1834,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -1932,7 +1954,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -2050,7 +2074,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -2137,7 +2163,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -2224,7 +2252,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -2269,7 +2299,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -2334,7 +2366,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -2379,7 +2413,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -2424,7 +2460,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -2491,7 +2529,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -2558,7 +2598,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -2625,7 +2667,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -2681,7 +2725,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -2737,7 +2783,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestRename/edges.exp.json b/testdata/d2oracle/TestRename/edges.exp.json index 3c353fee3..678a43a46 100644 --- a/testdata/d2oracle/TestRename/edges.exp.json +++ b/testdata/d2oracle/TestRename/edges.exp.json @@ -416,7 +416,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -447,7 +449,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -477,7 +481,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -507,7 +513,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -537,7 +545,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -567,7 +577,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -597,7 +609,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -768,7 +782,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -957,7 +973,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -1044,7 +1062,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -1131,7 +1151,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -1218,7 +1240,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -1305,7 +1329,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -1350,7 +1376,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -1415,7 +1443,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestRename/flat.exp.json b/testdata/d2oracle/TestRename/flat.exp.json index 028991927..f8921a5c2 100644 --- a/testdata/d2oracle/TestRename/flat.exp.json +++ b/testdata/d2oracle/TestRename/flat.exp.json @@ -49,7 +49,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -96,7 +98,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestRename/generated.exp.json b/testdata/d2oracle/TestRename/generated.exp.json index 7d2554939..443c2a35e 100644 --- a/testdata/d2oracle/TestRename/generated.exp.json +++ b/testdata/d2oracle/TestRename/generated.exp.json @@ -49,7 +49,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -96,7 +98,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestRename/near.exp.json b/testdata/d2oracle/TestRename/near.exp.json index 50bf9b91d..13468f6f7 100644 --- a/testdata/d2oracle/TestRename/near.exp.json +++ b/testdata/d2oracle/TestRename/near.exp.json @@ -111,7 +111,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -173,7 +175,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -218,7 +222,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestRename/nested.exp.json b/testdata/d2oracle/TestRename/nested.exp.json index 9fde64d16..710fc49b7 100644 --- a/testdata/d2oracle/TestRename/nested.exp.json +++ b/testdata/d2oracle/TestRename/nested.exp.json @@ -178,7 +178,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -322,7 +324,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -464,7 +468,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -606,7 +612,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -748,7 +756,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -857,7 +867,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/base.exp.json b/testdata/d2oracle/TestSet/base.exp.json index 18dbe52f0..f7f02cc90 100644 --- a/testdata/d2oracle/TestSet/base.exp.json +++ b/testdata/d2oracle/TestSet/base.exp.json @@ -49,7 +49,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -96,7 +98,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/block_string_multiline.exp.json b/testdata/d2oracle/TestSet/block_string_multiline.exp.json index b42981de5..700fc13d6 100644 --- a/testdata/d2oracle/TestSet/block_string_multiline.exp.json +++ b/testdata/d2oracle/TestSet/block_string_multiline.exp.json @@ -56,7 +56,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -104,7 +106,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/block_string_oneline.exp.json b/testdata/d2oracle/TestSet/block_string_oneline.exp.json index 2324b55be..4e6c158d4 100644 --- a/testdata/d2oracle/TestSet/block_string_oneline.exp.json +++ b/testdata/d2oracle/TestSet/block_string_oneline.exp.json @@ -56,7 +56,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -104,7 +106,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/classes-style.exp.json b/testdata/d2oracle/TestSet/classes-style.exp.json index bd8c593c8..7606c8653 100644 --- a/testdata/d2oracle/TestSet/classes-style.exp.json +++ b/testdata/d2oracle/TestSet/classes-style.exp.json @@ -227,7 +227,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -331,7 +333,9 @@ "direction": { "value": "" }, - "constraint": null, + "constraint": { + "value": "" + }, "classes": [ "a" ] diff --git a/testdata/d2oracle/TestSet/dupe-classes-style.exp.json b/testdata/d2oracle/TestSet/dupe-classes-style.exp.json index 04d724c19..50a62f7bf 100644 --- a/testdata/d2oracle/TestSet/dupe-classes-style.exp.json +++ b/testdata/d2oracle/TestSet/dupe-classes-style.exp.json @@ -227,7 +227,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -331,7 +333,9 @@ "direction": { "value": "" }, - "constraint": null, + "constraint": { + "value": "" + }, "classes": [ "a" ] diff --git a/testdata/d2oracle/TestSet/edge.exp.json b/testdata/d2oracle/TestSet/edge.exp.json index cbc71edfb..2c76cca83 100644 --- a/testdata/d2oracle/TestSet/edge.exp.json +++ b/testdata/d2oracle/TestSet/edge.exp.json @@ -82,7 +82,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -113,7 +115,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -160,7 +164,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -205,7 +211,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/edge_append_style.exp.json b/testdata/d2oracle/TestSet/edge_append_style.exp.json index d3fe03683..c8f216c65 100644 --- a/testdata/d2oracle/TestSet/edge_append_style.exp.json +++ b/testdata/d2oracle/TestSet/edge_append_style.exp.json @@ -117,7 +117,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -152,7 +154,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -199,7 +203,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -244,7 +250,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/edge_chain.exp.json b/testdata/d2oracle/TestSet/edge_chain.exp.json index 37845d039..51b4137c9 100644 --- a/testdata/d2oracle/TestSet/edge_chain.exp.json +++ b/testdata/d2oracle/TestSet/edge_chain.exp.json @@ -209,7 +209,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -243,7 +245,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -273,7 +277,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -320,7 +326,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -385,7 +393,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -470,7 +480,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -515,7 +527,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json b/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json index d43649e4c..301659aa6 100644 --- a/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json +++ b/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json @@ -192,7 +192,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -230,7 +232,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -260,7 +264,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -327,7 +333,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -412,7 +420,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -457,7 +467,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json b/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json index ac3a85f1f..7e2d1bd9e 100644 --- a/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json +++ b/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json @@ -276,7 +276,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -307,7 +309,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -350,7 +354,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -397,7 +403,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -502,7 +510,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -587,7 +597,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json b/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json index 64642fa83..672a3f564 100644 --- a/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json +++ b/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json @@ -232,7 +232,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -270,7 +272,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -300,7 +304,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -347,7 +353,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -412,7 +420,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -497,7 +507,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -542,7 +554,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.exp.json b/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.exp.json index c3607a42e..ded67e709 100644 --- a/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.exp.json +++ b/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.exp.json @@ -197,7 +197,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -223,7 +225,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "references": [ { @@ -249,7 +253,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -279,7 +285,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -346,7 +354,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -431,7 +441,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -476,7 +488,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/edge_index_case.exp.json b/testdata/d2oracle/TestSet/edge_index_case.exp.json index 4f6183aac..f0ae94d5d 100644 --- a/testdata/d2oracle/TestSet/edge_index_case.exp.json +++ b/testdata/d2oracle/TestSet/edge_index_case.exp.json @@ -186,7 +186,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -217,7 +219,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -247,7 +251,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -294,7 +300,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -339,7 +347,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -384,7 +394,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -429,7 +441,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -474,7 +488,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -519,7 +535,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/edge_index_merge_style.exp.json b/testdata/d2oracle/TestSet/edge_index_merge_style.exp.json index c3a27950a..c1c983fad 100644 --- a/testdata/d2oracle/TestSet/edge_index_merge_style.exp.json +++ b/testdata/d2oracle/TestSet/edge_index_merge_style.exp.json @@ -193,7 +193,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -231,7 +233,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -261,7 +265,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -328,7 +334,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -413,7 +421,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -458,7 +468,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/edge_index_nested.exp.json b/testdata/d2oracle/TestSet/edge_index_nested.exp.json index e9b1ced7c..be7387a8d 100644 --- a/testdata/d2oracle/TestSet/edge_index_nested.exp.json +++ b/testdata/d2oracle/TestSet/edge_index_nested.exp.json @@ -111,7 +111,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -142,7 +144,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -189,7 +193,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -234,7 +240,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -279,7 +287,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/edge_key_and_key.exp.json b/testdata/d2oracle/TestSet/edge_key_and_key.exp.json index 01df66472..ab67c717c 100644 --- a/testdata/d2oracle/TestSet/edge_key_and_key.exp.json +++ b/testdata/d2oracle/TestSet/edge_key_and_key.exp.json @@ -162,7 +162,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -197,7 +199,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -306,7 +310,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -362,7 +368,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -418,7 +426,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/edge_label.exp.json b/testdata/d2oracle/TestSet/edge_label.exp.json index b7ad2f213..a55c91c0a 100644 --- a/testdata/d2oracle/TestSet/edge_label.exp.json +++ b/testdata/d2oracle/TestSet/edge_label.exp.json @@ -127,7 +127,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -162,7 +164,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -209,7 +213,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -254,7 +260,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/edge_merge_arrowhead.exp.json b/testdata/d2oracle/TestSet/edge_merge_arrowhead.exp.json index d57cb0b28..124ccee33 100644 --- a/testdata/d2oracle/TestSet/edge_merge_arrowhead.exp.json +++ b/testdata/d2oracle/TestSet/edge_merge_arrowhead.exp.json @@ -169,7 +169,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -195,7 +197,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "references": [ { @@ -218,7 +222,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -265,7 +271,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -310,7 +318,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/edge_merge_style.exp.json b/testdata/d2oracle/TestSet/edge_merge_style.exp.json index 57edaa2e2..cc5c9b6eb 100644 --- a/testdata/d2oracle/TestSet/edge_merge_style.exp.json +++ b/testdata/d2oracle/TestSet/edge_merge_style.exp.json @@ -164,7 +164,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -202,7 +204,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -249,7 +253,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -294,7 +300,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json b/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json index 21e350ee7..73a1c5b79 100644 --- a/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json +++ b/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json @@ -111,7 +111,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -142,7 +144,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -189,7 +193,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -234,7 +240,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -279,7 +287,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json b/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json index 275675bb2..4781ea1c7 100644 --- a/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json +++ b/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json @@ -157,7 +157,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -192,7 +194,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -239,7 +243,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -284,7 +290,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -329,7 +337,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/edge_replace_arrowhead.exp.json b/testdata/d2oracle/TestSet/edge_replace_arrowhead.exp.json index fbe9611da..ed0a6baff 100644 --- a/testdata/d2oracle/TestSet/edge_replace_arrowhead.exp.json +++ b/testdata/d2oracle/TestSet/edge_replace_arrowhead.exp.json @@ -122,7 +122,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -148,7 +150,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "references": [ { @@ -171,7 +175,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -218,7 +224,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -263,7 +271,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.exp.json b/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.exp.json index 79cab4cf1..da49006e5 100644 --- a/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.exp.json +++ b/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.exp.json @@ -160,7 +160,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -186,7 +188,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "references": [ { @@ -212,7 +216,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -279,7 +285,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -344,7 +352,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/edge_set_arrowhead.exp.json b/testdata/d2oracle/TestSet/edge_set_arrowhead.exp.json index 989d7fd47..e3c6f6c31 100644 --- a/testdata/d2oracle/TestSet/edge_set_arrowhead.exp.json +++ b/testdata/d2oracle/TestSet/edge_set_arrowhead.exp.json @@ -122,7 +122,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -148,7 +150,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "references": [ { @@ -171,7 +175,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -218,7 +224,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -263,7 +271,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/expanded_map_style.exp.json b/testdata/d2oracle/TestSet/expanded_map_style.exp.json index eab037808..0ce80a7cf 100644 --- a/testdata/d2oracle/TestSet/expanded_map_style.exp.json +++ b/testdata/d2oracle/TestSet/expanded_map_style.exp.json @@ -113,7 +113,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -164,7 +166,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/icon.exp.json b/testdata/d2oracle/TestSet/icon.exp.json index 1ccc50dfe..529342cc8 100644 --- a/testdata/d2oracle/TestSet/icon.exp.json +++ b/testdata/d2oracle/TestSet/icon.exp.json @@ -88,7 +88,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -148,7 +150,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/inline_style.exp.json b/testdata/d2oracle/TestSet/inline_style.exp.json index 2d9c5fe49..25d9c3795 100644 --- a/testdata/d2oracle/TestSet/inline_style.exp.json +++ b/testdata/d2oracle/TestSet/inline_style.exp.json @@ -139,7 +139,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -193,7 +195,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/label.exp.json b/testdata/d2oracle/TestSet/label.exp.json index b091d0d7e..c6f1534ec 100644 --- a/testdata/d2oracle/TestSet/label.exp.json +++ b/testdata/d2oracle/TestSet/label.exp.json @@ -59,7 +59,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -106,7 +108,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/label_primary.exp.json b/testdata/d2oracle/TestSet/label_primary.exp.json index b8b0c6533..5d048c690 100644 --- a/testdata/d2oracle/TestSet/label_primary.exp.json +++ b/testdata/d2oracle/TestSet/label_primary.exp.json @@ -107,7 +107,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -138,7 +140,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -185,7 +189,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -230,7 +236,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -275,7 +283,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/label_replace.exp.json b/testdata/d2oracle/TestSet/label_replace.exp.json index 976aa222f..81e138012 100644 --- a/testdata/d2oracle/TestSet/label_replace.exp.json +++ b/testdata/d2oracle/TestSet/label_replace.exp.json @@ -59,7 +59,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -106,7 +108,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/label_unset.exp.json b/testdata/d2oracle/TestSet/label_unset.exp.json index c1cd12102..dc2d78f06 100644 --- a/testdata/d2oracle/TestSet/label_unset.exp.json +++ b/testdata/d2oracle/TestSet/label_unset.exp.json @@ -49,7 +49,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -96,7 +98,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/map_key_missing.exp.json b/testdata/d2oracle/TestSet/map_key_missing.exp.json index d1b913626..03123bb2c 100644 --- a/testdata/d2oracle/TestSet/map_key_missing.exp.json +++ b/testdata/d2oracle/TestSet/map_key_missing.exp.json @@ -105,7 +105,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -136,7 +138,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -203,7 +207,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -248,7 +254,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/nested_alex.exp.json b/testdata/d2oracle/TestSet/nested_alex.exp.json index edcad2764..da163d796 100644 --- a/testdata/d2oracle/TestSet/nested_alex.exp.json +++ b/testdata/d2oracle/TestSet/nested_alex.exp.json @@ -177,7 +177,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -208,7 +210,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -255,7 +259,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -300,7 +306,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -365,7 +373,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/new_style.exp.json b/testdata/d2oracle/TestSet/new_style.exp.json index 79c6afd5d..ca0879f88 100644 --- a/testdata/d2oracle/TestSet/new_style.exp.json +++ b/testdata/d2oracle/TestSet/new_style.exp.json @@ -95,7 +95,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -146,7 +148,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/replace_arrowhead.exp.json b/testdata/d2oracle/TestSet/replace_arrowhead.exp.json index a932bd7a8..248870e77 100644 --- a/testdata/d2oracle/TestSet/replace_arrowhead.exp.json +++ b/testdata/d2oracle/TestSet/replace_arrowhead.exp.json @@ -122,7 +122,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -148,7 +150,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "references": [ { @@ -171,7 +175,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -218,7 +224,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -263,7 +271,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/replace_arrowhead_map.exp.json b/testdata/d2oracle/TestSet/replace_arrowhead_map.exp.json index 846722df0..3de2bb5bc 100644 --- a/testdata/d2oracle/TestSet/replace_arrowhead_map.exp.json +++ b/testdata/d2oracle/TestSet/replace_arrowhead_map.exp.json @@ -140,7 +140,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -166,7 +168,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "references": [ { @@ -189,7 +193,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -236,7 +242,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -281,7 +289,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/replace_dimensions.exp.json b/testdata/d2oracle/TestSet/replace_dimensions.exp.json index 958b2baa9..b999b3e57 100644 --- a/testdata/d2oracle/TestSet/replace_dimensions.exp.json +++ b/testdata/d2oracle/TestSet/replace_dimensions.exp.json @@ -84,7 +84,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -134,7 +136,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/replace_edge_style.exp.json b/testdata/d2oracle/TestSet/replace_edge_style.exp.json index caaec8158..f5ce4d7f6 100644 --- a/testdata/d2oracle/TestSet/replace_edge_style.exp.json +++ b/testdata/d2oracle/TestSet/replace_edge_style.exp.json @@ -158,7 +158,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -196,7 +198,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -243,7 +247,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -288,7 +294,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/replace_edge_style_map.exp.json b/testdata/d2oracle/TestSet/replace_edge_style_map.exp.json index ab62815ba..4499d37b8 100644 --- a/testdata/d2oracle/TestSet/replace_edge_style_map.exp.json +++ b/testdata/d2oracle/TestSet/replace_edge_style_map.exp.json @@ -136,7 +136,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -171,7 +173,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } @@ -218,7 +222,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -263,7 +269,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/replace_fill_pattern.exp.json b/testdata/d2oracle/TestSet/replace_fill_pattern.exp.json index 876fd7eac..c783b3862 100644 --- a/testdata/d2oracle/TestSet/replace_fill_pattern.exp.json +++ b/testdata/d2oracle/TestSet/replace_fill_pattern.exp.json @@ -99,7 +99,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -150,7 +152,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/replace_link.exp.json b/testdata/d2oracle/TestSet/replace_link.exp.json index 028881270..24e0ad009 100644 --- a/testdata/d2oracle/TestSet/replace_link.exp.json +++ b/testdata/d2oracle/TestSet/replace_link.exp.json @@ -88,7 +88,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -138,7 +140,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/replace_position.exp.json b/testdata/d2oracle/TestSet/replace_position.exp.json index e41ab8f9a..eb08e4668 100644 --- a/testdata/d2oracle/TestSet/replace_position.exp.json +++ b/testdata/d2oracle/TestSet/replace_position.exp.json @@ -142,7 +142,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -198,7 +200,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/replace_shape.exp.json b/testdata/d2oracle/TestSet/replace_shape.exp.json index 9fa391b04..93089429f 100644 --- a/testdata/d2oracle/TestSet/replace_shape.exp.json +++ b/testdata/d2oracle/TestSet/replace_shape.exp.json @@ -70,7 +70,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -128,7 +130,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/replace_style.exp.json b/testdata/d2oracle/TestSet/replace_style.exp.json index 47a623194..424697d3c 100644 --- a/testdata/d2oracle/TestSet/replace_style.exp.json +++ b/testdata/d2oracle/TestSet/replace_style.exp.json @@ -77,7 +77,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -150,7 +152,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/replace_style_edgecase.exp.json b/testdata/d2oracle/TestSet/replace_style_edgecase.exp.json index 197c9461b..346ff1af8 100644 --- a/testdata/d2oracle/TestSet/replace_style_edgecase.exp.json +++ b/testdata/d2oracle/TestSet/replace_style_edgecase.exp.json @@ -132,7 +132,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -250,7 +252,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/replace_tooltip.exp.json b/testdata/d2oracle/TestSet/replace_tooltip.exp.json index 323a44945..a5d18437f 100644 --- a/testdata/d2oracle/TestSet/replace_tooltip.exp.json +++ b/testdata/d2oracle/TestSet/replace_tooltip.exp.json @@ -88,7 +88,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -138,7 +140,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/set_dimensions.exp.json b/testdata/d2oracle/TestSet/set_dimensions.exp.json index ee588adbb..adfb943b6 100644 --- a/testdata/d2oracle/TestSet/set_dimensions.exp.json +++ b/testdata/d2oracle/TestSet/set_dimensions.exp.json @@ -84,7 +84,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -134,7 +136,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/set_fill_pattern.exp.json b/testdata/d2oracle/TestSet/set_fill_pattern.exp.json index 3f1377fda..6984ebd04 100644 --- a/testdata/d2oracle/TestSet/set_fill_pattern.exp.json +++ b/testdata/d2oracle/TestSet/set_fill_pattern.exp.json @@ -99,7 +99,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -150,7 +152,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/set_position.exp.json b/testdata/d2oracle/TestSet/set_position.exp.json index 7ae4b113f..5b0379637 100644 --- a/testdata/d2oracle/TestSet/set_position.exp.json +++ b/testdata/d2oracle/TestSet/set_position.exp.json @@ -84,7 +84,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -134,7 +136,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/set_tooltip.exp.json b/testdata/d2oracle/TestSet/set_tooltip.exp.json index c8bc0b3b1..ac8684a61 100644 --- a/testdata/d2oracle/TestSet/set_tooltip.exp.json +++ b/testdata/d2oracle/TestSet/set_tooltip.exp.json @@ -88,7 +88,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -138,7 +140,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/shape.exp.json b/testdata/d2oracle/TestSet/shape.exp.json index 96f6dc008..b972a20aa 100644 --- a/testdata/d2oracle/TestSet/shape.exp.json +++ b/testdata/d2oracle/TestSet/shape.exp.json @@ -88,7 +88,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -135,7 +137,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/shape_nested_style_set.exp.json b/testdata/d2oracle/TestSet/shape_nested_style_set.exp.json index 1b73a82ac..301e3e04b 100644 --- a/testdata/d2oracle/TestSet/shape_nested_style_set.exp.json +++ b/testdata/d2oracle/TestSet/shape_nested_style_set.exp.json @@ -95,7 +95,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -146,7 +148,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/unapplied-classes-style-2.exp.json b/testdata/d2oracle/TestSet/unapplied-classes-style-2.exp.json index cc1895eef..9821f6bd4 100644 --- a/testdata/d2oracle/TestSet/unapplied-classes-style-2.exp.json +++ b/testdata/d2oracle/TestSet/unapplied-classes-style-2.exp.json @@ -201,7 +201,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -252,7 +254,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/unapplied-classes-style.exp.json b/testdata/d2oracle/TestSet/unapplied-classes-style.exp.json index e8fb954b9..003a21036 100644 --- a/testdata/d2oracle/TestSet/unapplied-classes-style.exp.json +++ b/testdata/d2oracle/TestSet/unapplied-classes-style.exp.json @@ -183,7 +183,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 }, @@ -256,7 +258,9 @@ "direction": { "value": "" }, - "constraint": null + "constraint": { + "value": "" + } }, "zIndex": 0 } From a2c06de30b337b54e688888e2241c211879450ac Mon Sep 17 00:00:00 2001 From: satoqz Date: Mon, 1 May 2023 14:22:34 +0200 Subject: [PATCH 05/62] remove temporary testing files --- test.d2 | 7 ---- test.png | Bin 41263 -> 0 bytes test.svg | 95 ------------------------------------------------------- 3 files changed, 102 deletions(-) delete mode 100644 test.d2 delete mode 100644 test.png delete mode 100644 test.svg diff --git a/test.d2 b/test.d2 deleted file mode 100644 index 929bb580f..000000000 --- a/test.d2 +++ /dev/null @@ -1,7 +0,0 @@ -test: { - shape: sql_table - a: INT - b: INT {constraint: foreign_key} - c: INT {constraint: [foreign_key; primary_key]} - d: VARCHAR(255) {constraint: [foreign_key; unique]} -} diff --git a/test.png b/test.png deleted file mode 100644 index b48521e7cbd95b1ef2625cb8b5b0ce67ffb93f48..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 41263 zcmeGEcT|&E_%;eF0*VYal-?8(lqMoI5I_Y~6j13^L3)#x&?BItB1EMsB@v|8NC`bU z^d5Q#rMD32HRS97GxMACo_BrUKWBYweee7+E6xMi&)#>xuYKLT(NtGuIL>zb(4j*N zcW&Q$c<9iP{zHeTc8<}4C)^Ruz2M`Th29;@`}YrB0slUBi0bgkLsZ~jM{Zp^bm;J@ zy?_4!{{IsA?-1;&$aN7h;oHhew+?+2FzE!34!b^7y>TeJg=6N>A)Z5bZYgPbn9L6y zjW*IAQuu9p<2L`r_xL2;nfq^_F9kf*QanqoeE4ug!paG{Q=b*X1$ZRbG!;+1p`xN{ zH=Hhic}3Zl>Lb_3_2M5*mQsB~eSHx4LfmH4a#<_6b)kGJet9!)HP*>;a#%#%vMKts z3H7m4Jc`c`9j4m6{idHh)aC91!EYya18KTyQ0pMLb{-%BXs zC6E5!)_hA90DBw#`NIEr4_G0fQ0Ctcs2`p^mH()!^X$K0b1J|2-w$}+Cp<^TT}V#; z_iLV`9Zvk~EQkEh(ohr5ib*K{`z+KBuK#{;?5hBeb;|3s%LhU@kOq%+%#nYejYs*g z5=8ml{nP(bWQPtb4RHMX0o7$7uFGb&Zx2>FIOnnc$$vjM^`8h2boieLssFRW1NZyS zkwLusFBa}w!++@nq>TU4$$ka!Uq*iZUs3Z{(fD6osQ6s*ztVcYl>e`^=285wJ2~jW z{ts>N9F7@5W|O5C$4zV1%uOb4{ng~2IxQ%KyZ498!q1Jh6Nbw?is*BoW$om_zxrOn zZqL|?`+be~ug=%Mk6OpXrr2Zr2m7Z}JbU?8Rs^3ye#@y)&w9`d`_rCcQCO&^Wl1`J zCiUKTNPk4JOokFQHG%eW{*yENI^bkFl@GZ$`GWS$seJa--dFw3hm}glEL#pV#CB5= z@AyuZ-NFJu0~U@gwx__4m5w_^AD|FHpm9GDCiBIgvg(z>FEArT{6f(u@%?VmzvdKJ zHL*oS|I>4{@u!$Pwp(Di_cz!t?UxDoCt$V8r|Q-`;M4!DLnZ zQu7|@T;j3Tot(_1Jq?!oihp%yUt(^0;AK}oF|yqTtD?==ZEL}9LStkC_nUX?KftPD zv-aT;bjSWX`u|V0&Xa*2N>YoGw%VxY>vA50hMFHmJ?Lprq=L~k z!))7BG->f@s|wa}h?-Ec6)eU=u{`UGz;HgKJ7jX61Lk;Ta^uzBccumgYLajYrC$PI zjn#dSeumW)i(JY}G>-!3;5^%QDxG4dAv%?-Jnyyf(8oCW(Wn%zj;l(grnrj57Ivg$ z%!L4${7yB?5sLj^|M(m|bh}HkI~0IWoabD9ZqhwHm#-l+^ICeE*<0!!-o&9RV)Tc1 z4r4z1Y)<`SIslrXhbhO&NL~DT85}1qEvtkP9LLmcmvxb347)91%@4meVqNKOPFn4L zcd=JJR{HWn*_?k7Va?lYut?)dcGq{Bqg7jTIp^jw3k))I|Gc)?ZAgAIKr9knD4O$+ zmUJ-CCpfMaiIE2djtHGg(A@+cz5L*4d0m=fLBLwO8sfZT$-=kk zp%mSf**YX?FQ#5?ov(eGK+aJg6sm<~1r!yzCm2OW;&lTN4 z1e)ElE$;>5!pxt_>W-cUaYMxjgT&X4q>hl($WGQ2f=6_tHD> zQ3X9sMhILbeC@5FC!RA=$DFycuI5| zIAydK*BjS(uP?|fib$Xhh!Fh~M_mM$KAjZLny0`}|a}NXfH7=SFQz z)tO+)?M)^_!nImB4k>4kWAPbOY7SL%Of4k96h0?90cQ_YFxtuJg~gDA?}S~dJ)U9D z#vQ^b)g!jE5Zf`TTI!q9N0b}R$aI0c-pdB#DvJ1)`2(b%=}Ro&g1H0Uv8(R>ymzcVWBSjTEnUs$HpM{ByPBS&hYPjV$M zuB(j+#yIq5W<9YoWeL=f&d6Ldgxtn2oJECEV##ww5fDs_!j<@4t^l{mzgiM;(!cB| zp>g-B9BlAOjHOPU=ME+xGBz&CD z8h)!0^S_Nt!+~qA8pB*_BE=rIUQ#12R`W$2(B^(M$5*g1_b3(OaJfOb`qGK58LN19 zUeRqeec#jhjb<*V_EcC`0Gw=YY1$|RcrqLF_lafU_v`4PB^B$quAQkYcr_MRy3WzO zLL3oY*y@qM41QB9@O(qZc&X;JD(Va+BE;0v^~Ys}FYk+(0G8?RQ9QXM2t}!2! z6|3hOqW#&Q!N@HnTH5*HrPuYU4MFkG^yZ7V*C*ME!jKhf1mI@W!ganqqHINslpd_Q>es2^tN$-=i~m~;J0 zD+!2*XJ@xcjN`~cu?=_bbOL>C^wff5_dGw!hb>s7SY2PqyDF^9+^-E& zLGCr?(`)X22|k%EuD`aWc(=YnwFZ@4 zR9OD#5t&4l@EK9EA=d2hD=I3 zr4W6@cc0bgd?xM8+GQgt8Ft7{`k=?C3j*eil$})#hf^YkkMF>w zg4zi^&!mab4@aHsVe{daADJg=dJxI}$3wm5Ie}x51D_GhUfYDiw~eACf{}8VB$xN- zCl>jw#f^nvLWQ>q~XFlPI!OH%3QIpQyFgvKba*LR0_7M;V#=T zFUaRAifmLx2zvWX6VDOgH%FdE31kAP^|sG=Fj48#5*VcPtR{KCS^8>~7A*1+HAS&Y zmt0BiOD$`4YJTUITOdwB9=pp6+s;4F-<;e~_gE@lT=w(6`^U5bBB)<&xO#Us5`x{t ztaHhi)HaF^4mb|fmrj$8X0g@B^_CwrdpjVIY^J@8AJ+hZ#Pt4(fGXw9PkZa(QN*HE zQLzypUjuDx0<-m!rJC(b+34s#JN))GVI!Sh? z079ZIk%R6jXMWfh_)I&Wv>DL^KPl^A1#WABiG3>B)$VxdN%0j@B~GLd~Vn z6v>Ei=7~Xe2Qh$qH?D6-V z+tfd5|Kb8H_E~j|b&x}mQX^hglkoa5qNDE8UYuhea6BF3xRf;AUoh9?SH3li8|xle z2p#7o9Ng+F?t(b8&DHCu1%lW4p$fcxNVU?xRIrD1%A@} z$KEwP`T__q7bN))Jcxl(hbVqvz?dB-TI=4Ms#2l!<6jzT_N(P%S{FdHPMC~Uq4d>B z?KS!zfX$qa2|G|IE#pIzCM!Q=3|>{iMk zGb!62RISu(is13{3+!gq;BmE^x;-`6+v#-scL$|1A9&1X+hTJTJbrM+A@&^bk8>EA zH~RtF8r;^G9)4^8`W!uY+#!QG4Me1p`c3Qrw}=477Lh8G@__OhUPlN#{y+QR)~xx$0wJ32<`?$?`N>Oa5-?T7i;OgUU=Vn$Wb-|N z{o1}#uj(G&zQ7o$xCykgsS|3ic$og~5vHN{dogUEL4m&mR1@}GJ;w=rR?OMC9Vm2@ zYE5~o1xIlsQ-Q8so8WQ6B3kr-?e+v$^Q&kJ}hN?dv)^_m-OmRlv|4#grZ_u(^>{3E2ZZ`yAd*SjytKvv>QL zfBvzO*xzn}qVHw?L`U5KyrU88^7P1YJx#XU=~wsmGhvhV_lmkI9?c4{UPS~iyXN~f zuSf-=0U#aV*f<>1)4X?bf2YsCPXV!8Qu!}|gbpOp_ne9;oK~phJmWrs=XwrEUhID- z`Mu@h0GkIwH@&h2pumnC;&f2_I|z~0*w%w64-Y*|+HQ9KQvWEqN|`r1^bI3_%Z@Q< z;mt>UVQ(CVN+P<_Vw}nW;xfD0jtSz-*L9m|Pg)rfMwsd(I&irC+$~jIUs#3}vQF*o z$A9p6FY`p!(wv$W?_Z!#ORA{91`(ta_9ZhH!S`~6);WM%g#cl9Fw z38%GXCx=o`AM==;$gZ?t6{B-VxwU&Uz00pozR5N&jodArAU4|OhXl4jm!qfq@>H#2 zoS}QVs>=eZa#Tw+mjOp~)jMn4fP7BFM>24`WX-R%x$-4Q1?T5GK!`>UiF`P+7xWZ^ zsON)at0sQZ0<&TFpWDBMYzto=5lmz@LM1_*{XKa6@o-Y*HIWZtw6n ztO8-}iHRr4HbMpCW)86Ia`ez}-75y}Hlf!iIb9zA!B(W`ow6yvccfH9VDTlwS^nA} z7-v(ZUz$_>9`MmmxZ_xVu*fxmR~+7;!1MFW-;eMH6z$9W5ACN`2VApRTJiYRMXot& zo>JATkz93#e*JAkWSl7NN(K^Qpv#sYW$IWDnp^fH{h}!(>>We5X7L1|=oxhjPb8Z$@CRzM{7+LL5Z^2RUBblCE7VJVw%iC1zBE2skJ|2Xu`1d1H`HBV1;jH2p3I~_tJ*Lwz z;&IqsYt8xMv4@zgx68Hd!Rw)S!W4p!#%~Cym;QX|@$*e9@{UQ2(^Y|8*zl{DnfH^F zyi+)_p~8|Q0t-cUZbqJ~3`v-rirKdqa;qPYHM5K4^mU4HoV|nY-%hxoKP~9L2J+w9 zi=B!uG~e_zKf();+pFTvD;m0=S?0fe@NSG@ zm878q6JQ*^Hh;AvTN6quy1rI0^>rtO4S#%V79Zy@q~ zOXKK$P338zNlTtAmi8Wxe#rU}o^MD$>6xvaqy(YsyVI*~(u&)-8%rAako4qID;8?= zTQor}N+bzI*Y6omv!z0b%gSf#Ix13M`)v*Cf&63MHDC=9c%MQu@s@q~9qNQ%=Jf#A zpv-d$gA4SW91jR5bFN!s%NF~7yNZTP#UqNZqlaKaB9eU`#!97YeBDPV`%Hc0FGmQT z4e!mJ1=f_EXvTJTi>km#vqob_DBfdt%wxXTd2tq3TU(CwJ=wRN0kj^T~Yar2kU3#puGEo(|AdY}75_3X>xP41jw*QJm@+D6yRVgt+ zlvBa2&i_N1>%u;zkxd&7j9NuPYGD*$z13N9@m4(VR|A&X?NBuq2r~R)Yp41Rm|;%k zy21I-ksJ@?=3PN+eo0;OYBGRsx7F^|H@AO`N#@H@BVWI=;EkSPJQM(N2pZAhR{25gaSIfLw-#C{) ze_(zFkjCC-IKGAuxr~?2<~PP0oY=1sT+h|nn!Z3O%7Y?nRa4nK^|K-qeFOLImeu#;1eIBlSeK|#%OEv$**fJn z98E`2JkR@Mz!PtMQj`aE<*L?w^E<}i1r6Af9z2evWYR-in3WCpPy<5?HQ~N_5TP*E zF2vMtB1C$*Co0?zyL7j)W;P>RdKog9X9AUt-$Dh^Qc5874-hd#ZLg|VX1RiDrG?(! zBaSh3GT@rIO4Vo#i5D98yRS)I1osr>vC>brE2s>B%_%{YAjCf#$Ldo|1U4NC>%E+N zpWZ5 z8o8nt`ZjC50=weP&FQ2r0UP9ZURkU(SX~ZgTl2LL1KN%c7jypw7k|KGPm*ZVYZ#_*qZxf`z@~R zdDUZJkA??(1WUda@%Lgpl|Pr2P!pC;iD?noV!mNNr-x~+{3Nr8UebVC^>e@FmYu#i zCym#^Iex;gOt+Re#?ItV39SMUdi1w>%WDAEwl1nELAn$eLMUB|;*sM(O`XrbzA~x> zF3-u_gO?T6B+yv=c8U+qQw{x;m?$XRA@vbnW_9wH@JXF?Frtn3TU4sF3E;KG%FKp=|I?7&KUv=wA-FKT?ZoxxHuZ!8`6NHlE{V6BquWzk`^w2v({+TGf zTlFgm#gAO;-?EE|)W-LWctF%4%K_~e<5F0NYbzIraf#dIxt($Jze0$Z^-n4b6j5={ zqBWhU^yh-v1}Rt_*O33 zt);c^V0WZrz06%2!XaO`fT^s87=QT=mZxIY=-Ka1{Ix*&{cxgF?;n+cPQul%<)Hqa zRRvYFpRLWsE>PTMIL#lYVai3HE%GQ)-|q>&g8DrCN=nTvxWvw0reZglq81W}TXx;| zQXWkOAe_}lYP@Nbroq=-S0EQG|Gm1yeP6yj+Te6rG7>sdV0UrMy}xDoA1lqoqVf)Q zw{<#KG#zEYc4rm1CAb~C;Sbsa8j<+y1L3BD@-V3(4I>M7H&^!kRgVnN&D2ip{r%l_ zB7ty7o$a^NK^LVv(tGZ>&|{^`&lcU{_Jw;JbTk6m>LFdlV0TkAl4UJ)dYZCRQ}+A2 zL;Hcsb~Yta<>CJ!s#k0Ty3hK{^eEaJt1Z`42oyU*bs1Ri)Ta;Ln5wCLdzW2>~JElP~c zNmdC@cpl^T_3vQ?G#*&bOA%Cy75KW<9}6zkXMpi#n0Tq}e_cxh7^hdEK{kM|N_TB- zZ(Rlr>%+f?EHtfwaovd0m=XtFnm8@I*bHd*t+r@6-@fOi^8?S6Hx%wc0qr9sBofX7 z*1%FD3^48L^r+zjIHijb*k*iIi;9=rvf_0L4c zSp%>+{6xp*J7Bu+ei&!#fghW7sW}~(_AFg5vv#Xa<0_CrkLmpo0cBvi|4fn`7Y3V~ zUYhZ#0iIFwQ$$w?{1`Kvggx-gN~*=knC)qZSg;9f2?%p?{OK$FCeHKH-^Tw0=7vD%izRYzW3DuORL-?j2gI= z`g_p~-9|jw@>Z2*=l@y}e~J>P*{Iri*l&P1{rVdF(!(@kgyuq4M+S^1U*f?6|r8jm=>U zePn$^z66fK<~2*BD3RmgsUp%Z8|TXMM^|jqtky-GmnzEp<<>_ZgpFakotlVsjwfH9meyuS`>ZEida&bxF?hs1-|2iBVx(2`^4FT@nC zLf=1S>SiIgJMNm~>H4R$0#ccYOS)FhiyVj?-Czuo+TO$#4#`zunspmLyE2CqUE%Va z|J06|V&Fal(xNa4-Z&D~WzBvx&UaF*Ezb(sB01(mQTlDApW|wms!1C6Gg6bDrWGyd z`VPp!Qxc&ebYW11r^Ak?6I*PzH^z(TbK*Dm;5}93jeU*sO(AFqxQ}xZrcC0vf*4SEdpU){Lht#d)lr|PJ~~r* zz0B_Eztu0j=LIgKT8)p`q1)RICw+gtkj&O^RLw&*k?zSCHlo&8se%7ztYKUcZGnf9 zr`;41j2-cQh{1QgQ{#(b?u8l{ry?)xw~CIqBQ-K5@2e{WkYnBaRDVITPpE;_0wUH? zf-*Df*_)yAzz3pnw~l~FrC3Y7bSj_!{+nLn%HraJs`%YFQyGe9OIIhRIN*DB$ z7fPnZ{fmJsPtt(?94ys;yuY6FuBi{9!vogDkJ-3TZdPz^OPLs7y#>`(8@}uGs&L0e zttL8ZL_h-jH()XAsXBn7WNtQHbhi>jABR*xn8~gEIR(F@VIp6uYUE*$(tEa>%>Vdo z)(v33Z!HsW)CM4SH#1Pl9Pf|GQn*UN06Z2Z$Th6YI2NgqWycxTfxMF9_G`XlKjn2^ z6A`X&Zggk2qsxI)R=@txQ?)XKQefgMu3TqL;TWFfEubdcP(K+5st+)&S8$@AcNZ#? zy{X&5Srewj07->smbrO?C_?k)cnGi=#jdAApcisCG&rJm6966-Yw-Lqbb0lwK(jih z7%oItzx0W%HWx7uvUY+Y){NBXk)*U;tFWc+^ZQrt#x?`_$_IN=!G13z_yHYPWBOc@ z0(#u@H=rdzxIQsinRM@*7&}Vn7q2K(Qc@6w4xFt6R@=my(nCE70J7%e09gc9(!`Yy zF?ffXFLR4^AD`uv&q}TZpwRycfc)_{01{12_#D|+4U&Q8BYy)L0<#HiLb6mJu>7h;BN%7P_YQIrON;uG^qgX`(NeG4I%l-K!-QcGbhIKXx+P&%FQDJ5K`XVdfz}f2xYx~8?6GeX2?(DLKaFA z$va9&VkUCJNj7=Y3L|A%R72~%s+iT`b;)hg_Bw*s%T2U~LFWoX|D8JZKVeH=yVbg* z^CO``tQY^rT#~VWP!r5{LT31Yd!(PoU$c(#4sk(YhpqvtRJ)wm)~961yH>yQ@ed}< z93A|Yh6xP>^@Y$zGt=-=rMXl7$3YQr{8w!E-hMcJLt#sG?1@0yR4p2zzD?oITTiSy|SK&~iDN4k7p({)c z_Ze$gbuMKk#6*6{sYmA|2(#x5ZxiXRgK%X@ffGTvxVIK8J5hm8Bdo5lEz7 zYS~qkY7a$e99Zb-RKWAizSS(lzzdZ2@D3hIT+$s)ebO2}`(92B;+YIPZDIqihRfE6 z$<{`&&5^q|P3=OoN3B2s)AO!G#<7?HRVqCec7q#)l=t5hyOq3mD~w0~G~c>4!h}_0 z_1UfR7~f2e`I=Sc*24nR6kABUhW+>yBYM~Kigl=BGbq$Qx0OCSeV`82lirtF%6B5p z{Hp8d32{O=U@p8@=~sey4)(nNf(rqg$i2S%qjsJfDYxY|_^cx?0CwK;r8+2$d5rxt z17UU}1a+wF?pRoj6#L+!_v$+aU1H?Ib8%Z?P(!HPbY`W}rZkl5^Hj=Ab!JLw7p)OQ zber?o5HZr)sbr%Ov)Er<^gtK9QORR7LTa?h)b!yJpgvfbuWIYYZgMW@i%Q)TTry3l z0G%M(oN{YEu40wgGCN>lZ%a*}9xJ04Me?J(zKnnCyEIpA zye=nX&HS6F9tDJq*Y}sBA-oCWg+X>ZqOT{}Xq7s2$is$ams6georwT(`!?6sU9>Q` zh28;tbc$iA2ErPVAx_&7%A*aYS*FplI)c_n&h(d>xJ4+|6_O?Y7{BZDX7zIEbkX$a#~iP@zRj$2bht_6U5 zB(Cfh4s17$sm>4|FUC8Xk`ju<4m)`b_NZjQgU8lp`(`kfeH08^sCLYNIvw1*=|0jO zc*zVD_(|Tnl}c?miK}d+0kiaNS$QdE*j(Wgo30U=XbET22pzH~`8y90CEtqBY#m*+ zr6r_2N~!+(NtD}NZPdbx?4S}4Q?NsO|1uiF*Rj@$EqxAX+2&Y9 zi)=1D^V>aVu62rp=Py9sD^h@$SmxX7wv=#p4U3ky>#T97P~-n zHIu*e^|KNL!%F%cCT2D+;d+llsk9KGmJOf`e<7MBmi(|ql-pvJ$M2bB3Ewt<L7A;U4?-55Lq7utUf!|j@tB@P@#b+W zBLZ69mDjbucyVojD3NzMpI%Daje_HzqaT;BMqG7NnfJS~Tx%5P95WllUk9F1 ztqi~59}6O*jNt2qakYJo`u1>31y4lHvZw4UY+AO~#~WLaiK6UB2^BsEIGjl;i_I+ILyFLK}TuPf`eWEMHtyfODY0u19)({zqHV5fp}7 z(&tv$^~u$T>^FlrSORI8#!lN>oR^^xK;4Bvmg7fu7(Clusjw>Ocz~*TaR+te5^}C& zXB=u_7h2|b*T~(jL%0s&<=4lY{--}M$#lHK{WGZ)mIEV$xIrI&) zsTvpEHTg)BOn7FY8SYQHnhXJnZVgHn0g9IMH&_U6nER4=Y+MyIjT*u$fOg6h&cUP{ zwFk2u^8ZXhvR(`+(*wR7bN;iExDaqL$!?{4e!rVv5(P*UnQi8Y9|&bToi{XGz%6|} zAm<&hBfzG7AKdRX&PRjNK#4wOpby+6eshMM+ur~W8Fa*(IUl$t|9ky^!vBBW^zw}~ zzZIuv9H3~_OQKi(27@<=U%AetQV2!79#O)tz~?*Jy@C^X!25ELvdW7EnSgnUsAsL@ z(*iSQz#D%Ao(eoj;05^Y*VksAh5+kl`%!97nFBKGyd!#mHqC?3HQ#KEkp|y#woOWr zIQ6Up$%Zbyxc6!K;p4&jB4B+NeWtjEG;qw0Kc{t|VExV1K$8Or6#zC&x-Y{D`kw>jqB{=_@g1Dc zh{6;2CL|m22sH00FWa(w!1_yI=whGJL2V17gVr|Nw30KB%V_6a4LhF4N@<5n)DFPB z;nD`u_JC# z2Mi&X%OLtRew)@(rz9gL73>lq*3_$Vt_1AsC$$_z9|{Gz8t}$~9|_85`2#?Xc3R|M zE^GWDK%%28+R|b{KPw~r&T#^efj$D(Db2ouG`)d>D5U7OfU?J&qT^+71Sseq{nsUd z^+g&J9?5`8*42Pzs38bMM{ajK{Xu+P0}3k0@#i}GkNq%(|9>)oEq4|YKFoPaK2eQ< zSU%MvhDP9IM6P=_gcn&?b%{BTR(-$+|CRtyhI<$eYTpcQM&fFn%Q=1q#-h7aQAn9 z(XZjlN!;88-Z?D2xYaQ$PLH9XM`JCjDUmHPIq)c!ZyGsow|e{U5JJlBqC_y?cZ|*I zl}l=vnHJd8L70BI%F||^Ko3{FKCDv8ii*@F$;i2+Q8}9*s(QXE3xLc8_G9W!Y zFOGZzP)E0YZV&nqmDI45L`$))OSQw!?9X9L`@{QW!@h4{!bCrvU00CES{YkLF35}L z7p{8!o@pKZ8Vs<-4*i^)et7XhJzT(xftr_BIJb4XXP6YWRFHa4f2@&zJno)=%g%O0 zU!7Sd-woJG&D$!p^ZQj0Hs%DEB$?m*b}k(}EsCjE*#3V(7qa#`YPnAq!tRRI{+ld>zTqGF#1-^BW|duyh$)Yr ztdd%^B=q?32Y9{$s{*f|OT)$n@kR2F%#wLI=dD(6<({PxIT6EziQXO)n|M9*mt>kg z*3)+o&>atzGAWps9J$}V9#JT`v-W!!Ge7EpyNTi${(vS8W^|0@{>nRltLh|{z*Xu~ zF3rt~QhsWxwdUr=<9{muKGh!EtR2M_2M`5hD0C+U)A=#Dps#o>0Orlh4l1rZ9w^{C zP%bJ7ag*yH1g54bHs*dRbB!$vjP1@CM3eefUI)Iq|5|t0_IUo0E%!IUp#;YAc7(Y1 zD0AV+naoWVs!^iL{Ix|oPR3I@@>lNMp4 zp{k$TEtY)8=|g82gBddaH0&d@-{v#NZ79T1F&6p8Y6`s zDt%D_BorbdQoL1AG*2YQS0*_TJx3eogjjB#(BsoFe9}_;WP;75um!NI)`wkFSj3h- zNAKbwvlrnT(6R7JL*K8FXyb6!FDURAkuGc6^a^25g1xB5Zwt|y;sMg=?J&X%8ccH@=jvz9Spv5Qqg>=6uy1Ul*h0oMg!`=*fLhbbEv>f@La@ z7Mb&XAY3#3nYta^v~_&!R5w2Uv;ciCMv}LMWAR}u><7Jt3>R*s!TI+>qbk<1dRuo9 zAcIK6O56rzo^73dSNj^}y1nMafP;*#xKe3m+Bgpt_3S-#d#=97O+$bHKvybKq;QoR z`_PILnYClW1eY}i0#O}%a+Nmrx;(qj2yyMTlVkgu!XNoy><-z)&mD&%x#P3t$L!d{ z5syl)%cZxe=xit0t{BHqe*@QZc}(!~8x*|#q7!}rR&~>vL?C~vyyVGTYK8P14aD4M ze?E@(KT=ZL(c{Eg?ya+K?$ITn1E8nvk!>CO{2vC+y$^8j>K}cUQ)lWp(;PRz)YotT&w_HDnEyYT0N*k_kHqX2-Plx_P;u^9x<&rym; zmxMs?>9Uq2TKn@?tE73aZP?4vUQ`x`UDh>n6ADKf{#vy3N^0zdYkbV+2zK{L*hc&8 zk)?Y*wj%&`gb<3{?J=7w&b7vgV+|Qj0tL9ObitZkh3y|4J&gJEGV*Sp5BaMf*J6`w zET10?SQ`y2sX1?@@j7bQdbcj~1OLh!e+RiMnS*wb-bQ@p8Vj_$l|N9D-qiXs$c@hf zkpB9_%8#|5_@tC#R%eIAM_W@?vl_;l8r<(J7XkRmW=+?S+7@*4Jr73;T=$qHP3&Xl zaZXacXJrrfQ5tuG40}zP>!#iYV=IEg38!$mu+Qz+;6Oq54`4lOBZC(T`)u=~#mrSW z#K(KYVDq&}Y8-yQO(>&YlBHk4P{rkhG3sM(H_#TngWf@0i&^&v$bN1vdCe~I4)R#E zZ!<2rO88{U+D#{-Qm9&XlPSU&}6`?jbU4$`EyZgSjn9tpnaoLwI+5_8RrE z@w;H(LRi-cs8gv0e%Nx%(+Z07a?H6{X6khVb^A{{rkqe}!jx$YR}{(IMQ+!u!}v!S zG;$kxL^yD*U$B`m5oI&nohinTT)E5TAUSX*f<{$4`vD-!Xv=0jpppQtYDZ1{R(%Sv zqCO5Da;VNC_swtjNSWj>HbH`WmNVMHG+m8VWo!BMc<{Q&L;K+jF>7$aPrYxA`^g@baK5x94i zAI{!SJU0_6Ydq5%CYFiWkrNx|FSmrwmBi{&Vv=szKHPl2^$hASxS0mWZy>R*JW&LB zrT77q8W*(HOvRZg#Ivn53}%9BJ-jA=_Bd&DR}lAclO?a>v4Ij~X1xnhe%Y~A=?G^krd&hh)Z0~{~;pnt>R9s3X+{KW-KX42F zW`uLd%JRMarqL{Avv=?&t}i{!TAfy3pNkY4bC~bDGGKs@UzN_A5x=m;B?}!UrOrSG z>Uk?ass^3g)CLm&V7wCdeUO^kVL3pNovO=7lfnx&!&Y*O82chQqu!2il&TE%@HV66 z!92M1Xta2Y{K8x~_K)4Qw)XHp|T?JVfo zBm6>9f;rsI$rA!onEmjvQmIswn?ifLQRJ2!2EgpE+<$}F#s>c@m@QuIB667OC1a{G z9=iR0*tLvTZZURLDranX@#^jkty7M?@{K zRi3bQ*7Ud32Sz|+hS#RD0Jxfkm`v&en)G7y;P!M7rWtx)=~<94bBG$E*ktHY3YdMW z^<`k)8t@>JPO8BIk$nnWo+~p&zmg#|gc8&P+S|{+&r@}sh!GxXgKlign>UKO$0Q!> zNKu`49^JSdFDyT&O+c#ade1x15Q33&jKL>jmxmU|6UP*wHa_AgKnY-F&xWSxpSE-X zyHaMsLC;LT2At>9!nKmI6k$b~Y+vstwGj9^A|hwlPm(N_OQh5x*8Gn}aZ4((n{#S+ zVS+jN_L<<~P8?S$KR01%?XFPp$NNM6uRkICWv9}U;U61)?RASiT)jirn3>|YRljii z?&eAF?o4vWft%^!w*JM5wJ!x@>GEsc0Wg=uya!gR4h7rH$j=--!)+_a^2djWY8vy5 zLz6S}uk#depSKg{Rma{^r-Nx+-5%XJnmreK(r$&Riz2t(n{H8XWU|Y-hWOFdzu+eU zR;*qYDU$=!4KLfPr3Rjs7tO^d6Tj2T?_a| zq(j!CvbW)HoPtAWs|%*=^>SjxYqhh`@_$i03mEg~ybM@54pYf6^gAK0@~+9q#30qD zz@L0bD&F)@TZ|Emf!e&6b8s1_^ELDLix_&BrNdYO@`yo5qdT1zxJJuyo5qE=RBJV>z$v5^xs)Wz?;X5b{CS7>a9JHQRL0-6|)Q6L!=trn`*pZmC>{;cCgC4)4csH3B6Ux(B^HbF0 zn1Z-nRqlQ6T*>|+#I00nEv}59JC%A1-Tx%-BU=8+!>VV5S zdt#c4evQZ_TDCRAfn#@`m0cXlVrmW1F6K9tV`1f)&qGo4Tg^|{vdO} zXVpL6Z*gDv=xH9!Xa2T9&7inhVLhz?b@nM!$oATMI~W?_eiw7P6oub`%pIK{TEH? zwj_E(Y^2gQWu}G<=t(TC+uS~9Yf;i=E6bdP1J@|?7#1Pht5URdhUoAnbTQWoQ@k4DoCV;q%++m;7hQzwaefb{Ch z(SPYZ81{~P`OWUE4jSBFxm1Qvnd~~1?Y6wwcs3snrk2$*^P7AyOV@l8bz7;RZh5&~ zJupbgF(!KQvmUMSz^be4FFHui4_PV0K6_W9SqGMJF5r)xkJkB)ql_8Qy6Tu>C=n{ zfEhgi%nVXXE&qG{f5QKN-Sp5C!1kcC2ezk(X4)gp1~-;m^1lHB!b^cL_3pbMn?#h& z9RSXr;QD*n69M$ejC`` zTOBb{)<1`*;alfxS2{QyFIfH^+Bli=$5u)N5|y+l^iyGd!h!6R0rU2XLG=nY5=cRK z)flo4E*t*;;PB_@!JnZCc5d}W)<|JVwnBincMkh#h0&B_* z-tr*9ys$U%HdP<6l|HXhgCEpOMQ9GU*)Xxu&&g;~)kxuMi%7s9kSypYEPTBaHdcwO zQEuguPe712&Eh>LZPq!ChKoJ}Z>R-taGazATw3H4oZPh%_cCF%K5$j9JT~sEblCvUrQmnN==$hvw5-Eylc%`pNX25FFKhN<`~B^M<4e* zQDqb~i(J|8*QBs4{9sZzqAP{$Ckt)CO}}l&G>YUs^|1=diE?*z!7qzeoaq_*onu)` zwnrJ8S5!>I>`dfHRcGYj`er3c-Db`lp>5(07Wt+rR8sf-(?TGv$SE*gOg?$~QHpwS zW$2d0#mV|P?~x%%Npb_NL+CQ4l2{+!z6#}lI9guSu#Mj_OT#FMdb zZq0{h?bvHguL-eSMJF(8DxJy;c>9*_+-WV%suve7T)EvMGnE^_BM|*PR)j@U^Bv38 z1eP}{TDNFuBJ;n?6Ft0>Q{XpR=R2?Ft>(BcY(nAQ>7{;MjZNa(#_o5sKDszmPS--t zk@7sT@8Sxy3kk3S2a_C$*Z*}ly#eD9OW%%2&%{vuMzOJP^ zJKG|Cr_&{$4VuVY;OEkQm|dKjua&`pbEr2~_A-rlg9>gJ{N8u!x2Ph1&8hkW)A6UH z>~{-k2!sLn?UV)HKNsT9ACaZKkv5X>Yxzye6wOJ6f|f-W*9^hL3LgRy(eU#Z{3Xex zvh6D!=~m!p)F{{Diffr`lhRR69$jN+42NOqtDGpC_lRFfQcrgUgO9(MyM4|YB3p=4 zO6S(+Gb61x`P_gSZr%S4f1{UUO2)2mhO_%PBs_YP((G|B(hnmvU$XN;Z=Jqmg@aG_ zGwSwbld_`NN4V_kHg1khqUU2}O??USp0I_0?}$iYLzPRRGn~#f&)1s&>=}vDWvbxa z;=A=V;R}w?EKJprJr-d?sy&*LUJL2o^cBKsb)}fTTAi1IdXNk3{;&4FE3Ap`-B%G* zL_kD9I*L+6z(SEOB1J$@s?wqqX;P#G2qXdu_@NYO(t9sK2rZBVRHRAogaoA5gdRvB zoN<48_W$hXIhW_=Jl@PjGPBlt%X;f?)sw{|exlqeIl_a{-z}+u z+xI%NPO-;w9v;Gqb~~ndZ|%S9o%F{H+s*x8oi4D0ze}f(HS*@<`9XIVKilw)UyD#? zxH`?@A$CQ2vvK`vKoa$bN#7K)V6fE8f?O>jd}?)tsMMyP2ATe(dtiYO=D8zG1EoDZ z4vo9>-7H8qK&`zdvrM)px2S3sYgZCN>YIDWrIizEPeH>yi2hm$@I49N1KwJYWGk$a*QlbHlz`Eud*W2Iyx8PVyS`S?NBz-J3qAY z3E_@V#v|Iu`Wkf`xdLhtUF2kq3nbHRg5*-F?S0=u?Nw=i){1+359zF5OH7}n3s>rsEVd!kh^TH<)H4>DIy z-{ikkUFPH(No7y>h0-lyU*;?4(NdorGTr})w9;$mJ-3x)2afib^xe@@5hcWVF8I3j zDkFzu47Lg%X-(F9nhKOI9htyLu`j!^22*^PpUBR+AO63LdbOpRCSH7nx>wRf)R)il z5m;TtOrnD(CC#a6*FhVB?!{GG!LI}%9e9Z8X~<#vnemJOa^8=C^`&qZUfJS;Rg~$T zw+7`@GcTeVF6rz69nDISb&Fwy9kG7;UN%sVQZFcq;vG}lu8!#-sg%atWPL#kllHp@ z6EzeH_@tllA>+o<@jezPxUbJGEffR&s=}g)!`7g+_2l+P3y+3z_*d>M;7 z?9c(9J?w+Vn8^AAvjhOoeS5?6@r2&OG1}eeW2zA5X3z1}b8X*b<6fQ}_cO22uC>bf zDz5~#0JV#99I5qjfW#9Uh<;LgX1wjgENc#PBa_4Jy)lL%m~yi`j~mfT)}~zjhr0Zv zlWR|cGz%`S6mB0fE3vZINpCy0z4ua1I|DbI#;Jd84BgTatdu7oPOTnweC)w6HO|g+ z!{ZEB_&~3p>(i}?4)Djo(N-*Ve216k3Nl~}R_0q`5(y01?>qdtrx!P0Fs* zeSpZkQBKb^oRiL!S1;I!;_FkI4lEn^S?!`HH@~>-@qJ0S`uUwJRkK=BxYby4&n{G=`qjdW`P@#_ z7yC*ckGnUM`rrWuhQq9DIY#^$fPXN+X)LP=7}Efs8hT)$A9LZig#108m~=d3+mL^AgA9 z{k&F*1>ybpb2m=&BsOQ@GYGa4^6a$IYHx_`-Hcr{^@G+G2L-lns8@O80#Y+u$-KPk zw7fU-LpM|6z;gPdDda?t`^t}CrZuyZgsX0S(BU!GZuaM73OC%1>*n1R5x=8m@X3<8 zN=LQ&ie^rD*4D{%1hqxo@TY^2HmYo4o3)|LlA)7X(>F4R(hd>G?>d8rd5!l;LMrg5+=@am zMcW(H$ld$B)WsRe`=);2j>6}-`y~5eI(+J_7x$URz!|7%OX#z~k*8UwNqUnb zO)D4D9^8O>!D$xEK5w2%y0afN)nkLxAvbOkSEy$d!MrY9NR!;#X9*}t#AWLKLb`-_ z`Aegz2^H#g$$Kua{`vy)QwBbwJ;7+CU}S@W#Mt&$v}Y-E<1M|aA=)p4lz0)c^Y0M6 zpC4==$*XI6dp68oSL^`kWE}w2m?}1FpGS!y|_U-nKHP#$q?uQPtffhjztg^rCtg( zD;b8ePo>Hpl}+v1#EY4JR1GAGNY#@*hdVI53#@t>ubVEf;EOKjbvpx@SLtJT;2qe# z@BJdUYVB!?Nmrh0+G3UFdDMKi|3UiMaRu-@ugnWf-0*y}nn5tjEAhqU|F*o)mV^tMMePx@;EBhec zt7+q%M8CIEFJTfzrey1p|kd%qCOVQfGXO;aJ6t8uT zTuiWh7ngOrwk-_w_6vDTIR3(6wm^zDQklapmVV@)yHdx4Wk@G!ZqoK|gjU+E=+zf? zHEizJ{uJX`u`_NHy_B+f&#fayLOLaQH`sJCMy?0L^-=@jSkrx++*l>yIv+=$1JQYV zrZ3FVf0vhIg7}0(bp^Xs)1-4mh2(7W-MI85s{Cx3*!|XP?I&F<>mG8rd;S9!yG2B7 z_=5PZkWVEOGEsY9duFr3)WkZ#M31V$JC#mTmEIdQ%*tfN(Kmfxk?#l!yd_sy5hzN& zsk}RkQwBJJWuUJ1YyYt#)yj$%h?}~3X%A)bK4Db(W9$q}>IWpPsJy2LWN))rdRDxT zhr!uo&5*=R>q2sm$EyhAGlnKwI5P5H8mNSDqH z_@-16OFtfgX-oV`3X{z}9s^f1ks145$ALQRoahwaRgjL`vGaUxVJ<3X3CTuJK*nRc4y9yov9j zF17yxAH8U=?Np;6H2tZQ6rNhbS{cdcc?8(@DaW0Gx803)_)fPDhVn5^^4a|b9ZdWr z)SP2fqBLONqY~5-sBW4*BKdAQ-e_bYl{jz})c*cd`k8d){tE}bBQJo~4`AB2v1zx~ z)7OXK($AcG_3YcX}QY0X`8!4wnV1G zQ5=6(&B^FUz)z7h7#=a&xJ#9HR9H9Mw+VFk$3lkA#bvQ6EB5Pd62Y-~9G6W3odpm7EeEr2aW|!MxgMach-gnoo&0y)jA6x_F%n__0 zu(j@tBf)673g-HTMIRf%Ry}6wBH=-ZHKB!2%j`vTB(Z~HOp->BjU@Y0@{SxS#Y`r4 zT+=kl9|+Ps^=5JUkp4YrHYLn3o543^_qNU9hezb6v||0cRxT+C@z~avOyj)mSXzAxvU=l8g4AkH=ISM0SK+9@M{Hl8w7$h@m$h zEgjF2+Z-0O*J(lJ5FyEBScqKO4E~-L%x8#=Lnq`kKv==d6?#G$C(P&3j&-#T(eArAs`Icy2PWI6l# zP)q}Lofr-)*p;P?8nXW^>(U*oax@{}3_Y|=2-x)=rE&1jj64lS&wQuZfi=9W)=icd zTi-GYZ2oB(txLl4$>lnKt63^uMan}it8?@Xv}|AgFI~48$X8tIla-3Ko$W2JJc3e$ zJjRB3SD413+(a1|+ZbvlE8Q;Y%@Vs#tDc!MAd_ zj3*fd-oW9f7gBLrlSdUA-*rE+9Q3tt3?%|N_oJr1!?U%aWeq}1(H|d&#y1L%zr*Ju zdlM8st*oGW&bOX<@h-hbPB~2#i%M=thiMb;issROF>dT}2aWFqIIfz##bNc_diB2j z%nV_Qwz9-(?Qha$%pA=QNZQSZ=$|ScU@_w@64&ihpCU7MFhc8dysMqYbeGe7tiL&- zu;``2ozKjc182!}HFjlhWOPub0|xdTIXxzACLMD&D!-*2vrAWKvI z?s@cl0bfiMo;*Bnb``qKJ2$(>HCDA**WRNJCAdYZ3Zwum9UC;aa2}`AMQ0r#T}uWV z?;vh`k|89jC(^RtjWDiMa&X2@KrB~a&Qs!+^4qEoW1Ga;Zc%1BPU{b=OR7;S()xI_ z?dR)z$AK!v^Dy=R>Ml^#dM9ytE)I*e5+p0S<$iqGJ1ohRER7PW6Zq6XfKkUTI5Ze$ zuaPW1apSlV-e@F(7|yHW6MDa7IW-CxakMMR#8Ey+VEBR$#!7v^&NjHlRdr|k)1KiE zK^OYD8XoND)E|DHVT;z5dcgbr)3>rbxpsHY$LO9N#~jw1kDp~$I#tFHsdP(GDi69^ zTDH0SF?xido^6^SOTe9I!0y=Psp4jXcgqB2JCnV$Sk~H=JaWm;m-el%u))HFR5GBgY($6W#rZcHdJ@Z9df8Ew&x+)449$ihcPi)OTB`=<@zo|Tw}P|W zgHNyVUNjSsSfvu=w719H3LL_H5)Te~PuU*U>lwRYk?Mm<^xe)NtMwY-Yzyb0qwR*F zCkSZ30!sf2K~PD;B<1{mSeL?#8VH+Z+1a!RzI8Q;JW*0ri>iOSXu}$}NQ2K*LaH4M z%`#8a)-59DeXpAI5tvj{<8gtTd9-5+?>XoXIX9Klo*( z!yL5ynu9b9I2kP{Of0Hl9Xk@{yGv3G9ep3d!u0PUI1~ z9hz}rq)3F;g;$zaiHd(_uCKB~TfY=47JP&QKPoQ;9T9!(zvz7DPFc=)UT8ZZKJvSo*Myzd45*hS?vr;Y~ePJ8WJMDWKfbBGDj%w z&N2j1dPF%uPe935ChLz+V|L#SFYxv4y6P{GQe}7(yNz3UN5s0tuDVDtD@7oG1%ZMsV9h8%&UT{)TH7B85 z>RGSR zvR8H{SZ{hhuDR%*c6yIZz=0A!eMjtX#f=x@MV- z2=*^f*c)l!ZbuLAEuCyUOuo1{r=&f>LC|L-xF%iSRBogXT;T95;|9|7hjB6vba`>b zK*{=3Wab*qU;Hryr(@1h8(}m}=W=MRhM97Y@|UfjZEW&deWFg<8V*ENUuigvb8|k5 zex5^MN@<@u{3!A`LaP;4IV+a5G;Uqunl_XBuw?#$X_{6ba>}AXPc3+1c?eauC`bz^ z>=M(sw{v3jrP|P_WVgvn9*0d2KXQyOKQ)uNCO#r_0FJp~IM-p7bz=n_B)eeN2x8J* zP7stX{+4lXP1s>Yu2FD)CsIuG#CRMd?F-T(A_MU03;Va0o6iyccX4|PvA;s}(e7!_ zY8fBZ#15uC0FFHg1+wVdQa+KATU05g>e%JF3-t_te*LW?r5D1<80 zK^^ku3fnDjvS84p@NGMg>8FwCHKsj(%r4OzqFqDp3919@?>Y2fC_DPO%ESa0wNpMH zL$0k6Nk%4oiQSo~BjuJ^YS5fuazRy^k&T-a!HF7phPrNaD^xmJ=u|n|aTOX`7Zq(Do3hvKvT=;uV6Ax1 zg;Os2=t*-PD7-6{tij536T4OMvWw&J-kJh(ze7kE#^Et7QsI zFwzXSVdG_48w|8{H!@I5)SL8?{GJad0fnGDI2B5{BXd~Vt>N2qVy1^8NV8gnE6am> zXV?s?d>_jP?-sryy;-YWvu7v-0LBlk%+8s`3XFR>06T6i^aI))x<5zC%uy~W>mh53 z;p3NxN$1U;D&YCkB&=lvwhY#9JKdJT+i|yErUS|gQs;dz5vp9g*Rb!pRpHh<=AU1(pH&Z-e2 zr`G6kyUB?JIK#hOFMd(1KQrVE?E6N~EeLJpucDia()XQwV<2(So+C@P=QsAsTmkho z++|X@vwMn^eIDU0g|w+K|^Xta~xYk!TvRbm72D>f3LVE+C}0o%XyF=`B5G7oC*Dl2})BDCt-sPm72*`?ywf z5)H=hiNkSO%d@(gh{HG_c^Z~oMT>7XCuWhxH0uUo#>n>v5X z^jF%bE{hS2PyzANF8UjKbB^EK^fC00h6+NxN0@D!6|!O)dor8_!uS*Hh=WIN8z-vL z55sfpuki?)RV9Epa{qJ>Qt|LYvCgVtK(QXf#D5;_O=C*E{?!jo>PanmUn32U>oq% z#8xR9d~G1{vDOd~TXnA~PcW+HpxZN4;kkhxG!xo_WX=y%J-$6#wA{e;R8`UE9{Ym@ z*g#5;ExscC15Cf@xyMzRQ@v&MS*prcR(v>7J%s&UaZUnY}P# zH4fBA0=o#1fp5E>NfdbCrfI?hRde&7IAJqW*^DtvK<PBL`I!` z2i04r%d*#SiSqp&Kl>yk`Z9SPjeWp4s3t;C=@bl__OTyjcfff9b5w2a%3J-^r%vYK zx`c!2Vz-tdT|N-)6>+AX3_|>>k$m~_pz_yt=!kGT5E|Lp6M4U|^K>V#`!k*9xQyGF z=vwIYn0f{nqXM;Rfvb(>DHj6Q)8&*SbzQ;y#nO?=PInMs(CfLWYnwwsj`Mo&E+pjO z!1CHfSv{6gxrw5zW_LtlGRt;+O?@J(xoT=&wS^aLQjjWN%d>Vqn6^23>xYvUHuwA8 z=J1q^vs_Ds^^xff5lfj$9;;saOAC|11w5m*C?2zY0T683Du;nP^^&QK%f;RC`@y@R z7+GzMYW?$wSWB=ss~n{i$pW|k_Q`Q`E4eyoa>>WGE9Gql_V99`iQixyDMyzSDD8?na5 zO1X9KS3U{$rHA?v%6Mm0BMWL8 z6mKlsI(qFk8=x)d`(C5=sxY=qv+%hRwk-A9)R`(d2jWEi?Hhp;4gA$L4>d!)<7CbJ z7JnXfOf#!6Q<1-0T!E9$_=Wf0Qit1yYH)oihm}QpICSP~4Z$g3L(ao-rVWw$^2F1V}x7rcSEfQXSjsbQY>ad8>fX$qCB zkL5p$R_+gXysT<2wy8|vb)Ey0sH;O!rI(eEh`)bJ$VoVcm7!;NZx)XX(s(4;pQmZdRwXs>7@VFXw{yVC`*w z36lF^-3!`m`g4eS*>mBSq9bMFM(`lvF8S+`zHCEGT`|OwH!5xmN;gtMYHIArKU&o_ zolsYYjhqf-Px+K9Dv;u*98qEl!d!^z%S6PoZ^?5>&_)_i zPEnZVVBDbI*x_7&D!H**#&ufio?J5pLG;tp8U%cip3526Mrs^*hz21Tk{)RUwCK5i zB)2*>b@ScHHC~0y6Fu)6Oi#dp0(}#Hn2u_a0A)RmHj`Ta)jNN64g7rfG`KrSp+^5% zmQ-MZg{i`1o#?h=vFCee-=lJir+sW)I8x;n1SPz)@y@#CUWrBlQn~iA6`p-*K6#17 z(FsHBu32mXvR8Ta{ZQ4EFB*@zGmN#zWtrDdX&n;%WpFQs()&7kPh-Z^4pkOPcZ7i; z#@h}0QF4Z#>FC~FSh`m4@C<;3+5W_XKAqZtL)s-Klw}d+zC4i!8EQz#<9@6L-#?6% zQ|8Tx_*gGt6>?YT3~;dKXVbd;_bgf?+#Q_}!`dm(j5p%%+38hHg^0diWBQS94v@l^ z%;R_^Xqu0HJMYCEKWC!$q;ZK+0$?|E7SS8!<)xCtL#^KWZsI@*R|^~1V$NuuQ9s-= znELp>%7?hD>@G5Tbu}#Sl~){MdVpwgT@}?3>aalf4W1X`PzA)hWUkA z#fqN@o%Mrh?s z9RaE`1y(p8z1oa{^D7ajF)kHzbpRusFpE_OO=F>yyyDww5@$YXdX@P<+JVRdUsR!2W2cA@pD)MYGU|?rV#Em8GfP)(ZNpH^6Rfem2$hd^t6&b6O12MUs z<1)6`?@%{zgx$`$u(bFKYeZ|p1x_@Rj*6DxHB(nQyzR-}1|WDCs8%7#Cu{EOOsdvb zLIWMf(aI{2mup->PK~Nq;-DANMB8j+@h2`X+kSQ|u#Br0Xd~(*0Sz&lfp}c&5@J(_ zD_zjrg2BcQyUI9j6AG5RvCP}m&V4_s(C5iBeot|EkBQIN^(mcLMr$4ABQpYu*#1oE z6tCCov%I}G_a+I^DQ(skYMOfSAecEvspbcu?qwX5zdY=OY)NJhG`h>rxt?Hj%B2A6 zLOC#Hr_-pyx6) zm&xTZsBUA{W@@aCHk|vgXJW(kfj2?)YTg1P6+~R%!nH0g%dkKcm(K8T()FpGi(j1VuwRwXnJT8MXW5YnM{}$9~4xsn!d`& zW`0)pHbY`x`-S4V(bV;J=+j4|I)nB&nAw*3v(6j5X~U9c2)7cWqU%Tx|Lm)5JANFe zxAm6vx0CPSU4wwMrt_Z+pLTw3AG(4^E84U2$pmm;)ywmPEQgY&YjHuOm-Gx1jLQiZ zaAFN2@j%bEP-MT49RT5u`|QY;J$&?9HjcLW4o}coj&1IpquCv<3DlGs(N z5+|IV&T%Iu^bqL1q^OA6-^~oCS3KHfswZK7mV8|C+SppQC3(F9%L3zu;}BA#_%B)Dl~L-QjeS}2D8mwcUHU`hIGkuYCY(gU`VPkMI>}6T#D~FOP_JO z8*jZ_#j})#RDWH1$5+oe<&b83TO0n3dP3kb@TZN)0Ev!0iD{bKT7aWgO>54xO$R1O z8WFZ&p?S;JD~b&~sdv_7AkRjuj}7f2PS`o^HA&dWfjn61A8WW)S$3$^a9izeK^Hjb zlkkenn=luYyk$&dKeR>N)O@neueS7QtvP@g6SGf`RuaSmlf9?BFKJ@}B#H`Vww}s<{3{JXsoFb64%gA~JsUCxCf=5*QyL%Yl8o8vmg~|uGyeW=2d#_?%hK(u z`e@2ka<+SSJ6GCcZFxjnI^Dy4i?~Ycn}4pK6L2u^ZI`;~cO3udW9>}*Y1_)z1WsHI zv2KcQ9w%R$kW*~hIjbY%;X*_o6)7H!dIllA<4Ko80J=J4DUl>TdoA;1m$*^MV1}UpxUO5ODBh7I>ruXzQipetv!I!09k+)I9Is!%u+# z!hjW@|J4LP1~kEa)qd{&%P-(zDjPr+nCAaV77N{;#kUVZ0PlipU}BL7z+hZpP)HLJ z{4Fxo6v(lldq51pK;PCGQ3G_;97vL7YX8a$kRu>&03r({MD?eDuxu(&?Ks09j^CXE z1$A*Js0AIPdHhQxT>swnduc&$07lctZqP&k|FL_^JbY*|6*s^I^ma|IQtw#-5B*Eu zh37$l4~)}S_N_l%8=ZgY(H(#fKM#DpSvWr32BXh%$*Tf*LmL)1(XKzMqCKD=EQHpb z|40p~PX8>mV4^8{C#v8)GH?8b-y8ejj_pIyy!Q%fR{NH~+(*qi~-3iIR z)$unIXs=%Y_WS6P6z88&|0S_070}{Tap^y-{7ujkk-NP$|DkxlH^*x^Kmu~+PQSOp zpP?!q0aN~mF8mR!C$NJ&YX<*l=br^;0aJd_D`@{8^vnZ1o_|^NKNolpnDRfi*B^R* z08w_=n8EGe3;wgfx4@MDsT#lk{=^D=qN^(J#cyT(v%tR$|I6_Ip+J8%{I5y*KMd3B zzb56c4gcfm{yNQLf1{MYQOciuSGVo_3oG7dlvk^0MC*$NdN!< diff --git a/test.svg b/test.svg deleted file mode 100644 index 30dc7f3e8..000000000 --- a/test.svg +++ /dev/null @@ -1,95 +0,0 @@ -testaINTbINTFKcINTFK PKdVARCHAR(255)FK UNQ - - - From 14f88e2db9d1fc8b72859b518728b2f336129603 Mon Sep 17 00:00:00 2001 From: satoqz Date: Wed, 3 May 2023 13:42:31 +0200 Subject: [PATCH 06/62] address code review --- d2compiler/compile.go | 32 +- d2graph/d2graph.go | 4 +- e2etests/stable_test.go | 24 ++ .../dagre/board.exp.json | 348 ++++++++++++++++++ .../dagre/sketch.exp.svg | 95 +++++ .../elk/board.exp.json | 348 ++++++++++++++++++ .../elk/sketch.exp.svg | 95 +++++ 7 files changed, 928 insertions(+), 18 deletions(-) create mode 100644 e2etests/testdata/stable/sql_table_constraints_width/dagre/board.exp.json create mode 100644 e2etests/testdata/stable/sql_table_constraints_width/dagre/sketch.exp.svg create mode 100644 e2etests/testdata/stable/sql_table_constraints_width/elk/board.exp.json create mode 100644 e2etests/testdata/stable/sql_table_constraints_width/elk/sketch.exp.svg diff --git a/d2compiler/compile.go b/d2compiler/compile.go index c01544066..46d854cb7 100644 --- a/d2compiler/compile.go +++ b/d2compiler/compile.go @@ -307,26 +307,26 @@ func (c *compiler) compileLabel(attrs *d2graph.Attributes, f d2ir.Node) { func (c *compiler) compileReserved(attrs *d2graph.Attributes, f *d2ir.Field) { if f.Primary() == nil { - compositeAccepted := strings.EqualFold(f.Name, "class") || strings.EqualFold(f.Name, "constraint") - if f.Composite != nil && !compositeAccepted { - c.errorf(f.LastPrimaryKey(), "reserved field %v does not accept composite", f.Name) - } - switch f.Name { - case "class": - if arr, ok := f.Composite.(*d2ir.Array); ok { - for _, class := range arr.Values { - if scalar, ok := class.(*d2ir.Scalar); ok { - attrs.Classes = append(attrs.Classes, scalar.Value.ScalarString()) + if f.Composite != nil { + switch f.Name { + case "class": + if arr, ok := f.Composite.(*d2ir.Array); ok { + for _, class := range arr.Values { + if scalar, ok := class.(*d2ir.Scalar); ok { + attrs.Classes = append(attrs.Classes, scalar.Value.ScalarString()) + } } } - } - case "constraint": - if arr, ok := f.Composite.(*d2ir.Array); ok { - for _, constraint := range arr.Values { - if scalar, ok := constraint.(*d2ir.Scalar); ok { - attrs.Constraint = append(attrs.Constraint, scalar.Value.ScalarString()) + case "constraint": + if arr, ok := f.Composite.(*d2ir.Array); ok { + for _, constraint := range arr.Values { + if scalar, ok := constraint.(*d2ir.Scalar); ok { + attrs.Constraint = append(attrs.Constraint, scalar.Value.ScalarString()) + } } } + default: + c.errorf(f.LastPrimaryKey(), "reserved field %v does not accept composite", f.Name) } } return diff --git a/d2graph/d2graph.go b/d2graph/d2graph.go index 56647269f..56a87b5dc 100644 --- a/d2graph/d2graph.go +++ b/d2graph/d2graph.go @@ -1036,8 +1036,8 @@ func (obj *Object) GetDefaultSize(mtexts []*d2target.MText, ruler *textmeasure.R } maxTypeWidth = go2.Max(maxTypeWidth, typeDims.Width) - // 60 covers UNQ constraint with padding, 50 for further constraints covers UNQ + space - if newWidth := 60 + 50*(len(c.Constraint)-1); newWidth > constraintWidth { + // 60 covers UNQ constraint with padding, 40 for further constraints covers UNQ + space + if newWidth := 60 + 40*(len(c.Constraint)-1); newWidth > constraintWidth { constraintWidth = newWidth } } diff --git a/e2etests/stable_test.go b/e2etests/stable_test.go index 79a385e9b..e65916494 100644 --- a/e2etests/stable_test.go +++ b/e2etests/stable_test.go @@ -2385,6 +2385,30 @@ manager2: BatchManager { +getJobs(): "Job[]" +setTimeout(seconds int) } +`, + }, + { + name: "sql_table_constraints_width", + script: ` +a: { + shape: sql_table + x: INT {constraint: unique} +} + +b: { + shape: sql_table + x: INT {constraint: [primary_key; foreign_key]} +} + +c: { + shape: sql_table + x: INT {constraint: [foreign_key; unique]} +} + +d: { + shape: sql_table + x: INT {constraint: [primary_key; foreign_key; unique]} +} `, }, { diff --git a/e2etests/testdata/stable/sql_table_constraints_width/dagre/board.exp.json b/e2etests/testdata/stable/sql_table_constraints_width/dagre/board.exp.json new file mode 100644 index 000000000..07f1bd9f4 --- /dev/null +++ b/e2etests/testdata/stable/sql_table_constraints_width/dagre/board.exp.json @@ -0,0 +1,348 @@ +{ + "name": "", + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "a", + "type": "sql_table", + "pos": { + "x": 0, + "y": 0 + }, + "width": 148, + "height": 72, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N1", + "stroke": "N7", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": [ + { + "name": { + "label": "x", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 9, + "labelHeight": 26 + }, + "type": { + "label": "INT", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 29, + "labelHeight": 26 + }, + "constraint": [ + "unique" + ], + "reference": "" + } + ], + "label": "a", + "fontSize": 20, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 11, + "labelHeight": 31, + "zIndex": 0, + "level": 1, + "primaryAccentColor": "B2", + "secondaryAccentColor": "AA2", + "neutralAccentColor": "N2" + }, + { + "id": "b", + "type": "sql_table", + "pos": { + "x": 208, + "y": 0 + }, + "width": 188, + "height": 72, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N1", + "stroke": "N7", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": [ + { + "name": { + "label": "x", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 9, + "labelHeight": 26 + }, + "type": { + "label": "INT", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 29, + "labelHeight": 26 + }, + "constraint": [ + "primary_key", + "foreign_key" + ], + "reference": "" + } + ], + "label": "b", + "fontSize": 20, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 12, + "labelHeight": 31, + "zIndex": 0, + "level": 1, + "primaryAccentColor": "B2", + "secondaryAccentColor": "AA2", + "neutralAccentColor": "N2" + }, + { + "id": "c", + "type": "sql_table", + "pos": { + "x": 456, + "y": 0 + }, + "width": 188, + "height": 72, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N1", + "stroke": "N7", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": [ + { + "name": { + "label": "x", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 9, + "labelHeight": 26 + }, + "type": { + "label": "INT", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 29, + "labelHeight": 26 + }, + "constraint": [ + "foreign_key", + "unique" + ], + "reference": "" + } + ], + "label": "c", + "fontSize": 20, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 11, + "labelHeight": 31, + "zIndex": 0, + "level": 1, + "primaryAccentColor": "B2", + "secondaryAccentColor": "AA2", + "neutralAccentColor": "N2" + }, + { + "id": "d", + "type": "sql_table", + "pos": { + "x": 704, + "y": 0 + }, + "width": 228, + "height": 72, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N1", + "stroke": "N7", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": [ + { + "name": { + "label": "x", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 9, + "labelHeight": 26 + }, + "type": { + "label": "INT", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 29, + "labelHeight": 26 + }, + "constraint": [ + "primary_key", + "foreign_key", + "unique" + ], + "reference": "" + } + ], + "label": "d", + "fontSize": 20, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 13, + "labelHeight": 31, + "zIndex": 0, + "level": 1, + "primaryAccentColor": "B2", + "secondaryAccentColor": "AA2", + "neutralAccentColor": "N2" + } + ], + "connections": [], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/stable/sql_table_constraints_width/dagre/sketch.exp.svg b/e2etests/testdata/stable/sql_table_constraints_width/dagre/sketch.exp.svg new file mode 100644 index 000000000..d294404e2 --- /dev/null +++ b/e2etests/testdata/stable/sql_table_constraints_width/dagre/sketch.exp.svg @@ -0,0 +1,95 @@ +axINTUNQbxINTPK FKcxINTFK UNQdxINTPK FK UNQ + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/sql_table_constraints_width/elk/board.exp.json b/e2etests/testdata/stable/sql_table_constraints_width/elk/board.exp.json new file mode 100644 index 000000000..e30fede94 --- /dev/null +++ b/e2etests/testdata/stable/sql_table_constraints_width/elk/board.exp.json @@ -0,0 +1,348 @@ +{ + "name": "", + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "a", + "type": "sql_table", + "pos": { + "x": 12, + "y": 12 + }, + "width": 148, + "height": 72, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N1", + "stroke": "N7", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": [ + { + "name": { + "label": "x", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 9, + "labelHeight": 26 + }, + "type": { + "label": "INT", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 29, + "labelHeight": 26 + }, + "constraint": [ + "unique" + ], + "reference": "" + } + ], + "label": "a", + "fontSize": 20, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 11, + "labelHeight": 31, + "zIndex": 0, + "level": 1, + "primaryAccentColor": "B2", + "secondaryAccentColor": "AA2", + "neutralAccentColor": "N2" + }, + { + "id": "b", + "type": "sql_table", + "pos": { + "x": 180, + "y": 12 + }, + "width": 188, + "height": 72, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N1", + "stroke": "N7", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": [ + { + "name": { + "label": "x", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 9, + "labelHeight": 26 + }, + "type": { + "label": "INT", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 29, + "labelHeight": 26 + }, + "constraint": [ + "primary_key", + "foreign_key" + ], + "reference": "" + } + ], + "label": "b", + "fontSize": 20, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 12, + "labelHeight": 31, + "zIndex": 0, + "level": 1, + "primaryAccentColor": "B2", + "secondaryAccentColor": "AA2", + "neutralAccentColor": "N2" + }, + { + "id": "c", + "type": "sql_table", + "pos": { + "x": 388, + "y": 12 + }, + "width": 188, + "height": 72, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N1", + "stroke": "N7", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": [ + { + "name": { + "label": "x", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 9, + "labelHeight": 26 + }, + "type": { + "label": "INT", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 29, + "labelHeight": 26 + }, + "constraint": [ + "foreign_key", + "unique" + ], + "reference": "" + } + ], + "label": "c", + "fontSize": 20, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 11, + "labelHeight": 31, + "zIndex": 0, + "level": 1, + "primaryAccentColor": "B2", + "secondaryAccentColor": "AA2", + "neutralAccentColor": "N2" + }, + { + "id": "d", + "type": "sql_table", + "pos": { + "x": 596, + "y": 12 + }, + "width": 228, + "height": 72, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N1", + "stroke": "N7", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": [ + { + "name": { + "label": "x", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 9, + "labelHeight": 26 + }, + "type": { + "label": "INT", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 29, + "labelHeight": 26 + }, + "constraint": [ + "primary_key", + "foreign_key", + "unique" + ], + "reference": "" + } + ], + "label": "d", + "fontSize": 20, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 13, + "labelHeight": 31, + "zIndex": 0, + "level": 1, + "primaryAccentColor": "B2", + "secondaryAccentColor": "AA2", + "neutralAccentColor": "N2" + } + ], + "connections": [], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/stable/sql_table_constraints_width/elk/sketch.exp.svg b/e2etests/testdata/stable/sql_table_constraints_width/elk/sketch.exp.svg new file mode 100644 index 000000000..f15db75c8 --- /dev/null +++ b/e2etests/testdata/stable/sql_table_constraints_width/elk/sketch.exp.svg @@ -0,0 +1,95 @@ +axINTUNQbxINTPK FKcxINTFK UNQdxINTPK FK UNQ + + + \ No newline at end of file From 870ede1e1ea08d000d15f7a3e98b89534c7b8341 Mon Sep 17 00:00:00 2001 From: satoqz Date: Mon, 8 May 2023 22:57:27 +0200 Subject: [PATCH 07/62] fix bug --- d2graph/d2graph.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/d2graph/d2graph.go b/d2graph/d2graph.go index 56a87b5dc..e916c9b37 100644 --- a/d2graph/d2graph.go +++ b/d2graph/d2graph.go @@ -1036,9 +1036,11 @@ func (obj *Object) GetDefaultSize(mtexts []*d2target.MText, ruler *textmeasure.R } maxTypeWidth = go2.Max(maxTypeWidth, typeDims.Width) - // 60 covers UNQ constraint with padding, 40 for further constraints covers UNQ + space - if newWidth := 60 + 40*(len(c.Constraint)-1); newWidth > constraintWidth { - constraintWidth = newWidth + if l := len(c.Constraint); l > 0 { + // 60 covers UNQ constraint with padding, 40 for further constraints covers UNQ + space + if newWidth := 60 + 40*(l-1); newWidth > constraintWidth { + constraintWidth = newWidth + } } } From 297819dc3512d9f0ae8b48ddacc342f7dd36d028 Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Fri, 26 May 2023 16:38:20 -0700 Subject: [PATCH 08/62] grid: don't overwrite nested graph label positions --- d2layouts/d2grid/layout.go | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/d2layouts/d2grid/layout.go b/d2layouts/d2grid/layout.go index 5ddc75839..26bfb26b7 100644 --- a/d2layouts/d2grid/layout.go +++ b/d2layouts/d2grid/layout.go @@ -139,7 +139,9 @@ func withoutGridDiagrams(ctx context.Context, g *d2graph.Graph, layout d2graph.L } } - obj.LabelPosition = go2.Pointer(string(label.InsideTopCenter)) + if obj.LabelPosition == nil { + obj.LabelPosition = go2.Pointer(string(label.InsideTopCenter)) + } gridDiagrams[obj.AbsID()] = gd for _, o := range gd.objects { @@ -191,10 +193,17 @@ func layoutGrid(g *d2graph.Graph, obj *d2graph.Object) (*gridDiagram, error) { // position labels and icons for _, o := range gd.objects { if o.Icon != nil { - o.LabelPosition = go2.Pointer(string(label.InsideTopCenter)) - o.IconPosition = go2.Pointer(string(label.InsideMiddleCenter)) + // don't overwrite position if nested graph layout positioned label/icon + if o.LabelPosition == nil { + o.LabelPosition = go2.Pointer(string(label.InsideTopCenter)) + } + if o.IconPosition == nil { + o.IconPosition = go2.Pointer(string(label.InsideMiddleCenter)) + } } else { - o.LabelPosition = go2.Pointer(string(label.InsideMiddleCenter)) + if o.LabelPosition == nil { + o.LabelPosition = go2.Pointer(string(label.InsideMiddleCenter)) + } } } From 6d8dde153e409abbacd365742d6cd836a758a8f7 Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Fri, 26 May 2023 17:47:31 -0700 Subject: [PATCH 09/62] adjust grid for outside top labels --- d2graph/d2graph.go | 34 +++++++++++++++++++++++++++ d2layouts/d2dagrelayout/layout.go | 8 +++---- d2layouts/d2elklayout/layout.go | 4 ++-- d2layouts/d2grid/layout.go | 38 +++++++++++++++++++++++++------ 4 files changed, 70 insertions(+), 14 deletions(-) diff --git a/d2graph/d2graph.go b/d2graph/d2graph.go index 006bfae85..f43837ef8 100644 --- a/d2graph/d2graph.go +++ b/d2graph/d2graph.go @@ -26,6 +26,7 @@ import ( "oss.terrastruct.com/d2/d2themes/d2themescatalog" "oss.terrastruct.com/d2/lib/color" "oss.terrastruct.com/d2/lib/geo" + "oss.terrastruct.com/d2/lib/label" "oss.terrastruct.com/d2/lib/shape" "oss.terrastruct.com/d2/lib/textmeasure" ) @@ -1989,3 +1990,36 @@ func (obj *Object) GetModifierElementAdjustments() (dx, dy float64) { } return dx, dy } + +func (obj *Object) ToShape() shape.Shape { + tl := obj.TopLeft + if tl == nil { + tl = geo.NewPoint(0, 0) + } + dslShape := strings.ToLower(obj.Shape.Value) + shapeType := d2target.DSL_SHAPE_TO_SHAPE_TYPE[dslShape] + contentBox := geo.NewBox(tl, obj.Width, obj.Height) + return shape.NewShape(shapeType, contentBox) +} + +func (obj *Object) GetLabelTopLeft() *geo.Point { + if obj.LabelPosition == nil { + return nil + } + + s := obj.ToShape() + labelPosition := label.Position(*obj.LabelPosition) + + var box *geo.Box + if labelPosition.IsOutside() { + box = s.GetBox() + } else { + box = s.GetInnerBox() + } + + labelTL := labelPosition.GetPointOnBox(box, label.PADDING, + float64(obj.LabelDimensions.Width), + float64(obj.LabelDimensions.Height), + ) + return labelTL +} diff --git a/d2layouts/d2dagrelayout/layout.go b/d2layouts/d2dagrelayout/layout.go index db9c4f4b3..39cd1f9fe 100644 --- a/d2layouts/d2dagrelayout/layout.go +++ b/d2layouts/d2dagrelayout/layout.go @@ -119,9 +119,7 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err } if obj.Icon != nil && obj.Shape.Value != d2target.ShapeImage { - contentBox := geo.NewBox(geo.NewPoint(0, 0), float64(obj.Width), float64(obj.Height)) - shapeType := d2target.DSL_SHAPE_TO_SHAPE_TYPE[obj.Shape.Value] - s := shape.NewShape(shapeType, contentBox) + s := obj.ToShape() iconSize := d2target.GetIconSize(s.GetInnerBox(), string(label.InsideTopLeft)) // Since dagre container labels are pushed up, we don't want a child container to collide maxContainerLabelHeight = go2.Max(maxContainerLabelHeight, (iconSize+label.PADDING*2)*2) @@ -491,8 +489,8 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err } } - srcShape := shape.NewShape(d2target.DSL_SHAPE_TO_SHAPE_TYPE[strings.ToLower(edge.Src.Shape.Value)], edge.Src.Box) - dstShape := shape.NewShape(d2target.DSL_SHAPE_TO_SHAPE_TYPE[strings.ToLower(edge.Dst.Shape.Value)], edge.Dst.Box) + srcShape := edge.Src.ToShape() + dstShape := edge.Dst.ToShape() // trace the edge to the specific shape's border points[startIndex] = shape.TraceToShapeBorder(srcShape, start, points[startIndex+1]) diff --git a/d2layouts/d2elklayout/layout.go b/d2layouts/d2elklayout/layout.go index 5c29020a2..be6687f7e 100644 --- a/d2layouts/d2elklayout/layout.go +++ b/d2layouts/d2elklayout/layout.go @@ -501,8 +501,8 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err } } - srcShape := shape.NewShape(d2target.DSL_SHAPE_TO_SHAPE_TYPE[strings.ToLower(edge.Src.Shape.Value)], edge.Src.Box) - dstShape := shape.NewShape(d2target.DSL_SHAPE_TO_SHAPE_TYPE[strings.ToLower(edge.Dst.Shape.Value)], edge.Dst.Box) + srcShape := edge.Src.ToShape() + dstShape := edge.Dst.ToShape() // trace the edge to the specific shape's border points[startIndex] = shape.TraceToShapeBorder(srcShape, points[startIndex], points[startIndex+1]) diff --git a/d2layouts/d2grid/layout.go b/d2layouts/d2grid/layout.go index 26bfb26b7..6b747f7b3 100644 --- a/d2layouts/d2grid/layout.go +++ b/d2layouts/d2grid/layout.go @@ -6,13 +6,10 @@ import ( "fmt" "math" "sort" - "strings" "oss.terrastruct.com/d2/d2graph" - "oss.terrastruct.com/d2/d2target" "oss.terrastruct.com/d2/lib/geo" "oss.terrastruct.com/d2/lib/label" - "oss.terrastruct.com/d2/lib/shape" "oss.terrastruct.com/util-go/go2" ) @@ -104,13 +101,12 @@ func withoutGridDiagrams(ctx context.Context, g *d2graph.Graph, layout d2graph.L if obj.GridGap != nil || obj.VerticalGap != nil { verticalPadding = gd.verticalGap } + // size shape according to grid - obj.SizeToContent(float64(gd.width), float64(gd.height), float64(2*horizontalPadding), float64(2*verticalPadding)) + obj.SizeToContent(gd.width, gd.height, float64(2*horizontalPadding), float64(2*verticalPadding)) // compute where the grid should be placed inside shape - dslShape := strings.ToLower(obj.Shape.Value) - shapeType := d2target.DSL_SHAPE_TO_SHAPE_TYPE[dslShape] - s := shape.NewShape(shapeType, geo.NewBox(geo.NewPoint(0, 0), obj.Width, obj.Height)) + s := obj.ToShape() innerBox := s.GetInnerBox() if innerBox.TopLeft.X != 0 || innerBox.TopLeft.Y != 0 { gd.shift(innerBox.TopLeft.X, innerBox.TopLeft.Y) @@ -126,6 +122,34 @@ func withoutGridDiagrams(ctx context.Context, g *d2graph.Graph, layout d2graph.L } if obj.LabelDimensions.Height != 0 { labelHeight := float64(obj.LabelDimensions.Height) + 2*label.PADDING + + { + // also check for grid cells with outside top labels + topY := gd.objects[0].TopLeft.Y + highestLabel := topY + for _, o := range gd.objects { + if o.TopLeft.Y > topY { + if gd.rowDirected { + break + } else { + continue + } + } + if o.LabelPosition != nil { + labelPosition := label.Position(*o.LabelPosition) + if labelPosition.IsOutside() { + labelTL := o.GetLabelTopLeft() + if labelTL.Y < highestLabel { + highestLabel = labelTL.Y + } + } + } + } + if highestLabel < topY { + labelHeight += topY - highestLabel + 2*label.PADDING + } + } + if labelHeight > float64(verticalPadding) { // if the label doesn't fit within the padding, we need to add more grow := labelHeight - float64(verticalPadding) From 6ee5204b4dce226fc4e01e3e0dfc0924744a2373 Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Fri, 26 May 2023 17:48:37 -0700 Subject: [PATCH 10/62] update tests --- .../stable/grid_nested/dagre/board.exp.json | 100 +++++------ .../stable/grid_nested/dagre/sketch.exp.svg | 160 +++++++++--------- .../stable/grid_nested/elk/board.exp.json | 4 +- .../stable/grid_nested/elk/sketch.exp.svg | 158 ++++++++--------- 4 files changed, 211 insertions(+), 211 deletions(-) diff --git a/e2etests/testdata/stable/grid_nested/dagre/board.exp.json b/e2etests/testdata/stable/grid_nested/dagre/board.exp.json index 7a47434c9..539206801 100644 --- a/e2etests/testdata/stable/grid_nested/dagre/board.exp.json +++ b/e2etests/testdata/stable/grid_nested/dagre/board.exp.json @@ -14,7 +14,7 @@ "y": 150 }, "width": 384, - "height": 356, + "height": 388, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -52,7 +52,7 @@ "type": "rectangle", "pos": { "x": 60, - "y": 210 + "y": 242 }, "width": 53, "height": 130, @@ -93,7 +93,7 @@ "type": "rectangle", "pos": { "x": 153, - "y": 210 + "y": 242 }, "width": 171, "height": 130, @@ -125,7 +125,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 31, - "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPosition": "OUTSIDE_TOP_CENTER", "zIndex": 0, "level": 2 }, @@ -134,7 +134,7 @@ "type": "rectangle", "pos": { "x": 193, - "y": 242 + "y": 274 }, "width": 91, "height": 66, @@ -175,7 +175,7 @@ "type": "rectangle", "pos": { "x": 60, - "y": 380 + "y": 412 }, "width": 53, "height": 66, @@ -216,7 +216,7 @@ "type": "rectangle", "pos": { "x": 153, - "y": 380 + "y": 412 }, "width": 171, "height": 66, @@ -263,7 +263,7 @@ "y": 0 }, "width": 692, - "height": 656, + "height": 688, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -301,7 +301,7 @@ "type": "rectangle", "pos": { "x": 504, - "y": 60 + "y": 92 }, "width": 53, "height": 430, @@ -342,7 +342,7 @@ "type": "rectangle", "pos": { "x": 597, - "y": 60 + "y": 92 }, "width": 479, "height": 430, @@ -374,7 +374,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 31, - "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPosition": "OUTSIDE_TOP_CENTER", "zIndex": 0, "level": 2 }, @@ -383,7 +383,7 @@ "type": "rectangle", "pos": { "x": 617, - "y": 123 + "y": 155 }, "width": 439, "height": 335, @@ -424,7 +424,7 @@ "type": "rectangle", "pos": { "x": 637, - "y": 183 + "y": 215 }, "width": 186, "height": 240, @@ -465,7 +465,7 @@ "type": "rectangle", "pos": { "x": 657, - "y": 246 + "y": 278 }, "width": 146, "height": 140, @@ -506,7 +506,7 @@ "type": "rectangle", "pos": { "x": 697, - "y": 283 + "y": 315 }, "width": 66, "height": 66, @@ -547,7 +547,7 @@ "type": "rectangle", "pos": { "x": 843, - "y": 183 + "y": 215 }, "width": 193, "height": 240, @@ -588,7 +588,7 @@ "type": "rectangle", "pos": { "x": 863, - "y": 246 + "y": 278 }, "width": 153, "height": 140, @@ -629,7 +629,7 @@ "type": "rectangle", "pos": { "x": 903, - "y": 283 + "y": 315 }, "width": 73, "height": 66, @@ -670,7 +670,7 @@ "type": "rectangle", "pos": { "x": 504, - "y": 530 + "y": 562 }, "width": 53, "height": 66, @@ -711,7 +711,7 @@ "type": "rectangle", "pos": { "x": 597, - "y": 530 + "y": 562 }, "width": 479, "height": 66, @@ -755,7 +755,7 @@ ], "pos": { "x": 1196, - "y": 69 + "y": 85 }, "width": 480, "height": 518, @@ -796,7 +796,7 @@ "type": "rectangle", "pos": { "x": 1256, - "y": 129 + "y": 145 }, "width": 53, "height": 292, @@ -840,7 +840,7 @@ ], "pos": { "x": 1349, - "y": 129 + "y": 145 }, "width": 267, "height": 292, @@ -881,7 +881,7 @@ "type": "rectangle", "pos": { "x": 1409, - "y": 189 + "y": 205 }, "width": 53, "height": 66, @@ -922,7 +922,7 @@ "type": "rectangle", "pos": { "x": 1502, - "y": 189 + "y": 205 }, "width": 54, "height": 66, @@ -963,7 +963,7 @@ "type": "rectangle", "pos": { "x": 1409, - "y": 295 + "y": 311 }, "width": 53, "height": 66, @@ -1004,7 +1004,7 @@ "type": "rectangle", "pos": { "x": 1502, - "y": 295 + "y": 311 }, "width": 54, "height": 66, @@ -1045,7 +1045,7 @@ "type": "rectangle", "pos": { "x": 1256, - "y": 461 + "y": 477 }, "width": 53, "height": 66, @@ -1086,7 +1086,7 @@ "type": "rectangle", "pos": { "x": 1349, - "y": 461 + "y": 477 }, "width": 267, "height": 66, @@ -1127,7 +1127,7 @@ "type": "rectangle", "pos": { "x": 1736, - "y": 38 + "y": 54 }, "width": 321, "height": 581, @@ -1168,7 +1168,7 @@ "type": "rectangle", "pos": { "x": 1736, - "y": 84 + "y": 100 }, "width": 53, "height": 469, @@ -1209,7 +1209,7 @@ "type": "rectangle", "pos": { "x": 1789, - "y": 84 + "y": 100 }, "width": 268, "height": 469, @@ -1250,7 +1250,7 @@ "type": "rectangle", "pos": { "x": 1789, - "y": 125 + "y": 141 }, "width": 214, "height": 66, @@ -1291,7 +1291,7 @@ "type": "rectangle", "pos": { "x": 2003, - "y": 125 + "y": 141 }, "width": 54, "height": 66, @@ -1332,7 +1332,7 @@ "type": "rectangle", "pos": { "x": 1789, - "y": 191 + "y": 207 }, "width": 214, "height": 362, @@ -1373,7 +1373,7 @@ "type": "rectangle", "pos": { "x": 1789, - "y": 227 + "y": 243 }, "width": 53, "height": 66, @@ -1414,7 +1414,7 @@ "type": "rectangle", "pos": { "x": 1842, - "y": 227 + "y": 243 }, "width": 161, "height": 66, @@ -1455,7 +1455,7 @@ "type": "rectangle", "pos": { "x": 1789, - "y": 293 + "y": 309 }, "width": 53, "height": 260, @@ -1496,7 +1496,7 @@ "type": "rectangle", "pos": { "x": 1842, - "y": 293 + "y": 309 }, "width": 161, "height": 260, @@ -1537,7 +1537,7 @@ "type": "rectangle", "pos": { "x": 1842, - "y": 324 + "y": 340 }, "width": 107, "height": 163, @@ -1578,7 +1578,7 @@ "type": "rectangle", "pos": { "x": 1842, - "y": 355 + "y": 371 }, "width": 53, "height": 66, @@ -1619,7 +1619,7 @@ "type": "rectangle", "pos": { "x": 1895, - "y": 355 + "y": 371 }, "width": 54, "height": 66, @@ -1660,7 +1660,7 @@ "type": "rectangle", "pos": { "x": 1842, - "y": 421 + "y": 437 }, "width": 53, "height": 66, @@ -1701,7 +1701,7 @@ "type": "rectangle", "pos": { "x": 1895, - "y": 421 + "y": 437 }, "width": 54, "height": 66, @@ -1742,7 +1742,7 @@ "type": "rectangle", "pos": { "x": 1949, - "y": 324 + "y": 340 }, "width": 54, "height": 163, @@ -1783,7 +1783,7 @@ "type": "rectangle", "pos": { "x": 1842, - "y": 487 + "y": 503 }, "width": 107, "height": 66, @@ -1824,7 +1824,7 @@ "type": "rectangle", "pos": { "x": 1949, - "y": 487 + "y": 503 }, "width": 54, "height": 66, @@ -1865,7 +1865,7 @@ "type": "rectangle", "pos": { "x": 2003, - "y": 191 + "y": 207 }, "width": 54, "height": 362, @@ -1906,7 +1906,7 @@ "type": "rectangle", "pos": { "x": 1736, - "y": 553 + "y": 569 }, "width": 53, "height": 66, @@ -1947,7 +1947,7 @@ "type": "rectangle", "pos": { "x": 1789, - "y": 553 + "y": 569 }, "width": 268, "height": 66, diff --git a/e2etests/testdata/stable/grid_nested/dagre/sketch.exp.svg b/e2etests/testdata/stable/grid_nested/dagre/sketch.exp.svg index 136a16b78..7812cc589 100644 --- a/e2etests/testdata/stable/grid_nested/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/grid_nested/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -grid w/ containergrid w/ nested containersgrid in gridgrid w/ grid w/ gridabcdabcdabcdabcdb childb 1abcdabcdb 2b 2aabcdb 3b 3aabcdb 4b 3aabcd - + .d2-2603497423 .fill-N1{fill:#0A0F25;} + .d2-2603497423 .fill-N2{fill:#676C7E;} + .d2-2603497423 .fill-N3{fill:#9499AB;} + .d2-2603497423 .fill-N4{fill:#CFD2DD;} + .d2-2603497423 .fill-N5{fill:#DEE1EB;} + .d2-2603497423 .fill-N6{fill:#EEF1F8;} + .d2-2603497423 .fill-N7{fill:#FFFFFF;} + .d2-2603497423 .fill-B1{fill:#0D32B2;} + .d2-2603497423 .fill-B2{fill:#0D32B2;} + .d2-2603497423 .fill-B3{fill:#E3E9FD;} + .d2-2603497423 .fill-B4{fill:#E3E9FD;} + .d2-2603497423 .fill-B5{fill:#EDF0FD;} + .d2-2603497423 .fill-B6{fill:#F7F8FE;} + .d2-2603497423 .fill-AA2{fill:#4A6FF3;} + .d2-2603497423 .fill-AA4{fill:#EDF0FD;} + .d2-2603497423 .fill-AA5{fill:#F7F8FE;} + .d2-2603497423 .fill-AB4{fill:#EDF0FD;} + .d2-2603497423 .fill-AB5{fill:#F7F8FE;} + .d2-2603497423 .stroke-N1{stroke:#0A0F25;} + .d2-2603497423 .stroke-N2{stroke:#676C7E;} + .d2-2603497423 .stroke-N3{stroke:#9499AB;} + .d2-2603497423 .stroke-N4{stroke:#CFD2DD;} + .d2-2603497423 .stroke-N5{stroke:#DEE1EB;} + .d2-2603497423 .stroke-N6{stroke:#EEF1F8;} + .d2-2603497423 .stroke-N7{stroke:#FFFFFF;} + .d2-2603497423 .stroke-B1{stroke:#0D32B2;} + .d2-2603497423 .stroke-B2{stroke:#0D32B2;} + .d2-2603497423 .stroke-B3{stroke:#E3E9FD;} + .d2-2603497423 .stroke-B4{stroke:#E3E9FD;} + .d2-2603497423 .stroke-B5{stroke:#EDF0FD;} + .d2-2603497423 .stroke-B6{stroke:#F7F8FE;} + .d2-2603497423 .stroke-AA2{stroke:#4A6FF3;} + .d2-2603497423 .stroke-AA4{stroke:#EDF0FD;} + .d2-2603497423 .stroke-AA5{stroke:#F7F8FE;} + .d2-2603497423 .stroke-AB4{stroke:#EDF0FD;} + .d2-2603497423 .stroke-AB5{stroke:#F7F8FE;} + .d2-2603497423 .background-color-N1{background-color:#0A0F25;} + .d2-2603497423 .background-color-N2{background-color:#676C7E;} + .d2-2603497423 .background-color-N3{background-color:#9499AB;} + .d2-2603497423 .background-color-N4{background-color:#CFD2DD;} + .d2-2603497423 .background-color-N5{background-color:#DEE1EB;} + .d2-2603497423 .background-color-N6{background-color:#EEF1F8;} + .d2-2603497423 .background-color-N7{background-color:#FFFFFF;} + .d2-2603497423 .background-color-B1{background-color:#0D32B2;} + .d2-2603497423 .background-color-B2{background-color:#0D32B2;} + .d2-2603497423 .background-color-B3{background-color:#E3E9FD;} + .d2-2603497423 .background-color-B4{background-color:#E3E9FD;} + .d2-2603497423 .background-color-B5{background-color:#EDF0FD;} + .d2-2603497423 .background-color-B6{background-color:#F7F8FE;} + .d2-2603497423 .background-color-AA2{background-color:#4A6FF3;} + .d2-2603497423 .background-color-AA4{background-color:#EDF0FD;} + .d2-2603497423 .background-color-AA5{background-color:#F7F8FE;} + .d2-2603497423 .background-color-AB4{background-color:#EDF0FD;} + .d2-2603497423 .background-color-AB5{background-color:#F7F8FE;} + .d2-2603497423 .color-N1{color:#0A0F25;} + .d2-2603497423 .color-N2{color:#676C7E;} + .d2-2603497423 .color-N3{color:#9499AB;} + .d2-2603497423 .color-N4{color:#CFD2DD;} + .d2-2603497423 .color-N5{color:#DEE1EB;} + .d2-2603497423 .color-N6{color:#EEF1F8;} + .d2-2603497423 .color-N7{color:#FFFFFF;} + .d2-2603497423 .color-B1{color:#0D32B2;} + .d2-2603497423 .color-B2{color:#0D32B2;} + .d2-2603497423 .color-B3{color:#E3E9FD;} + .d2-2603497423 .color-B4{color:#E3E9FD;} + .d2-2603497423 .color-B5{color:#EDF0FD;} + .d2-2603497423 .color-B6{color:#F7F8FE;} + .d2-2603497423 .color-AA2{color:#4A6FF3;} + .d2-2603497423 .color-AA4{color:#EDF0FD;} + .d2-2603497423 .color-AA5{color:#F7F8FE;} + .d2-2603497423 .color-AB4{color:#EDF0FD;} + .d2-2603497423 .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}]]>grid w/ containergrid w/ nested containersgrid in gridgrid w/ grid w/ gridabcdabcdabcdabcdb childb 1abcdabcdb 2b 2aabcdb 3b 3aabcdb 4b 3aabcd + \ No newline at end of file diff --git a/e2etests/testdata/stable/grid_nested/elk/board.exp.json b/e2etests/testdata/stable/grid_nested/elk/board.exp.json index 09aabada3..08a18ac92 100644 --- a/e2etests/testdata/stable/grid_nested/elk/board.exp.json +++ b/e2etests/testdata/stable/grid_nested/elk/board.exp.json @@ -125,7 +125,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 31, - "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPosition": "INSIDE_TOP_CENTER", "zIndex": 0, "level": 2 }, @@ -374,7 +374,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 31, - "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPosition": "INSIDE_TOP_CENTER", "zIndex": 0, "level": 2 }, diff --git a/e2etests/testdata/stable/grid_nested/elk/sketch.exp.svg b/e2etests/testdata/stable/grid_nested/elk/sketch.exp.svg index cb2d63c26..9a8649b41 100644 --- a/e2etests/testdata/stable/grid_nested/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/grid_nested/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -grid w/ containergrid w/ nested containersgrid in gridgrid w/ grid w/ gridabcdabcdabcdabcdb childb 1abcdabcdb 2b 2aabcdb 3b 3aabcdb 4b 3aabcd + .d2-511948305 .fill-N1{fill:#0A0F25;} + .d2-511948305 .fill-N2{fill:#676C7E;} + .d2-511948305 .fill-N3{fill:#9499AB;} + .d2-511948305 .fill-N4{fill:#CFD2DD;} + .d2-511948305 .fill-N5{fill:#DEE1EB;} + .d2-511948305 .fill-N6{fill:#EEF1F8;} + .d2-511948305 .fill-N7{fill:#FFFFFF;} + .d2-511948305 .fill-B1{fill:#0D32B2;} + .d2-511948305 .fill-B2{fill:#0D32B2;} + .d2-511948305 .fill-B3{fill:#E3E9FD;} + .d2-511948305 .fill-B4{fill:#E3E9FD;} + .d2-511948305 .fill-B5{fill:#EDF0FD;} + .d2-511948305 .fill-B6{fill:#F7F8FE;} + .d2-511948305 .fill-AA2{fill:#4A6FF3;} + .d2-511948305 .fill-AA4{fill:#EDF0FD;} + .d2-511948305 .fill-AA5{fill:#F7F8FE;} + .d2-511948305 .fill-AB4{fill:#EDF0FD;} + .d2-511948305 .fill-AB5{fill:#F7F8FE;} + .d2-511948305 .stroke-N1{stroke:#0A0F25;} + .d2-511948305 .stroke-N2{stroke:#676C7E;} + .d2-511948305 .stroke-N3{stroke:#9499AB;} + .d2-511948305 .stroke-N4{stroke:#CFD2DD;} + .d2-511948305 .stroke-N5{stroke:#DEE1EB;} + .d2-511948305 .stroke-N6{stroke:#EEF1F8;} + .d2-511948305 .stroke-N7{stroke:#FFFFFF;} + .d2-511948305 .stroke-B1{stroke:#0D32B2;} + .d2-511948305 .stroke-B2{stroke:#0D32B2;} + .d2-511948305 .stroke-B3{stroke:#E3E9FD;} + .d2-511948305 .stroke-B4{stroke:#E3E9FD;} + .d2-511948305 .stroke-B5{stroke:#EDF0FD;} + .d2-511948305 .stroke-B6{stroke:#F7F8FE;} + .d2-511948305 .stroke-AA2{stroke:#4A6FF3;} + .d2-511948305 .stroke-AA4{stroke:#EDF0FD;} + .d2-511948305 .stroke-AA5{stroke:#F7F8FE;} + .d2-511948305 .stroke-AB4{stroke:#EDF0FD;} + .d2-511948305 .stroke-AB5{stroke:#F7F8FE;} + .d2-511948305 .background-color-N1{background-color:#0A0F25;} + .d2-511948305 .background-color-N2{background-color:#676C7E;} + .d2-511948305 .background-color-N3{background-color:#9499AB;} + .d2-511948305 .background-color-N4{background-color:#CFD2DD;} + .d2-511948305 .background-color-N5{background-color:#DEE1EB;} + .d2-511948305 .background-color-N6{background-color:#EEF1F8;} + .d2-511948305 .background-color-N7{background-color:#FFFFFF;} + .d2-511948305 .background-color-B1{background-color:#0D32B2;} + .d2-511948305 .background-color-B2{background-color:#0D32B2;} + .d2-511948305 .background-color-B3{background-color:#E3E9FD;} + .d2-511948305 .background-color-B4{background-color:#E3E9FD;} + .d2-511948305 .background-color-B5{background-color:#EDF0FD;} + .d2-511948305 .background-color-B6{background-color:#F7F8FE;} + .d2-511948305 .background-color-AA2{background-color:#4A6FF3;} + .d2-511948305 .background-color-AA4{background-color:#EDF0FD;} + .d2-511948305 .background-color-AA5{background-color:#F7F8FE;} + .d2-511948305 .background-color-AB4{background-color:#EDF0FD;} + .d2-511948305 .background-color-AB5{background-color:#F7F8FE;} + .d2-511948305 .color-N1{color:#0A0F25;} + .d2-511948305 .color-N2{color:#676C7E;} + .d2-511948305 .color-N3{color:#9499AB;} + .d2-511948305 .color-N4{color:#CFD2DD;} + .d2-511948305 .color-N5{color:#DEE1EB;} + .d2-511948305 .color-N6{color:#EEF1F8;} + .d2-511948305 .color-N7{color:#FFFFFF;} + .d2-511948305 .color-B1{color:#0D32B2;} + .d2-511948305 .color-B2{color:#0D32B2;} + .d2-511948305 .color-B3{color:#E3E9FD;} + .d2-511948305 .color-B4{color:#E3E9FD;} + .d2-511948305 .color-B5{color:#EDF0FD;} + .d2-511948305 .color-B6{color:#F7F8FE;} + .d2-511948305 .color-AA2{color:#4A6FF3;} + .d2-511948305 .color-AA4{color:#EDF0FD;} + .d2-511948305 .color-AA5{color:#F7F8FE;} + .d2-511948305 .color-AB4{color:#EDF0FD;} + .d2-511948305 .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}]]>grid w/ containergrid w/ nested containersgrid in gridgrid w/ grid w/ gridabcdabcdabcdabcdb childb 1abcdabcdb 2b 2aabcdb 3b 3aabcdb 4b 3aabcd \ No newline at end of file From 6a837fa03842e61f9c2d635b0a79078e02c301ef Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Fri, 26 May 2023 17:51:39 -0700 Subject: [PATCH 11/62] changelog --- ci/release/changelogs/next.md | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/release/changelogs/next.md b/ci/release/changelogs/next.md index 5c37f0360..398449902 100644 --- a/ci/release/changelogs/next.md +++ b/ci/release/changelogs/next.md @@ -12,3 +12,4 @@ #### Bugfixes ⛑️ - Shadow is cut off when `--pad` is 0. Thank you @LeonardsonCC ! [#1326](https://github.com/terrastruct/d2/pull/1326) +- Fixes grid layout overwriting label placements for nested objects. [#1345](https://github.com/terrastruct/d2/pull/1345) From ad44eff47a46586ad743ec91d27e3557609516d2 Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Tue, 30 May 2023 11:18:32 -0700 Subject: [PATCH 12/62] cleanup --- d2layouts/d2grid/layout.go | 44 ++++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/d2layouts/d2grid/layout.go b/d2layouts/d2grid/layout.go index 6b747f7b3..a84209808 100644 --- a/d2layouts/d2grid/layout.go +++ b/d2layouts/d2grid/layout.go @@ -123,31 +123,33 @@ func withoutGridDiagrams(ctx context.Context, g *d2graph.Graph, layout d2graph.L if obj.LabelDimensions.Height != 0 { labelHeight := float64(obj.LabelDimensions.Height) + 2*label.PADDING - { - // also check for grid cells with outside top labels - topY := gd.objects[0].TopLeft.Y - highestLabel := topY - for _, o := range gd.objects { - if o.TopLeft.Y > topY { - if gd.rowDirected { - break - } else { - continue - } + // also check for grid cells with outside top labels + // the first grid object is at the top (and always exists) + topY := gd.objects[0].TopLeft.Y + highestLabel := topY + for _, o := range gd.objects { + // we only want to compute label positions for objects at the top of the grid + if o.TopLeft.Y > topY { + if gd.rowDirected { + // if the grid is rowDirected (row1, row2, etc) we can stop after finishing the first row + break + } else { + // otherwise we continue until the next column + continue } - if o.LabelPosition != nil { - labelPosition := label.Position(*o.LabelPosition) - if labelPosition.IsOutside() { - labelTL := o.GetLabelTopLeft() - if labelTL.Y < highestLabel { - highestLabel = labelTL.Y - } + } + if o.LabelPosition != nil { + labelPosition := label.Position(*o.LabelPosition) + if labelPosition.IsOutside() { + labelTL := o.GetLabelTopLeft() + if labelTL.Y < highestLabel { + highestLabel = labelTL.Y } } } - if highestLabel < topY { - labelHeight += topY - highestLabel + 2*label.PADDING - } + } + if highestLabel < topY { + labelHeight += topY - highestLabel + 2*label.PADDING } if labelHeight > float64(verticalPadding) { From f64c0f1c774bd9aec36aaa901df5800aad26a193 Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Tue, 30 May 2023 11:32:40 -0700 Subject: [PATCH 13/62] add grid_icon test --- e2etests/stable_test.go | 1 + e2etests/testdata/files/grid_icon.d2 | 67 + .../stable/grid_icon/dagre/board.exp.json | 1271 +++++++++++++++++ .../stable/grid_icon/dagre/sketch.exp.svg | 102 ++ .../stable/grid_icon/elk/board.exp.json | 1271 +++++++++++++++++ .../stable/grid_icon/elk/sketch.exp.svg | 102 ++ 6 files changed, 2814 insertions(+) create mode 100644 e2etests/testdata/files/grid_icon.d2 create mode 100644 e2etests/testdata/stable/grid_icon/dagre/board.exp.json create mode 100644 e2etests/testdata/stable/grid_icon/dagre/sketch.exp.svg create mode 100644 e2etests/testdata/stable/grid_icon/elk/board.exp.json create mode 100644 e2etests/testdata/stable/grid_icon/elk/sketch.exp.svg diff --git a/e2etests/stable_test.go b/e2etests/stable_test.go index f88f82fb5..ff25dfd6d 100644 --- a/e2etests/stable_test.go +++ b/e2etests/stable_test.go @@ -2723,6 +2723,7 @@ scenarios: { loadFromFile(t, "grid_large_checkered"), loadFromFile(t, "grid_nested"), loadFromFile(t, "grid_nested_gap0"), + loadFromFile(t, "grid_icon"), loadFromFile(t, "multiple_offset"), loadFromFile(t, "multiple_offset_left"), } diff --git a/e2etests/testdata/files/grid_icon.d2 b/e2etests/testdata/files/grid_icon.d2 new file mode 100644 index 000000000..40fdce41e --- /dev/null +++ b/e2etests/testdata/files/grid_icon.d2 @@ -0,0 +1,67 @@ +classes: { + 2x2: { + grid-rows: 2 + grid-columns: 2 + } +} + +grid w/ container + icon: { + class: 2x2 + + a + b: { + b child + + icon: https://icons.terrastruct.com/dev%2Fgithub.svg + } + c + d +} + +grid + icon: { + class: 2x2 + + icon: https://icons.terrastruct.com/dev%2Fgithub.svg + + a + b + c + d +} + +grid + icon w/ container: { + class: 2x2 + + icon: https://icons.terrastruct.com/dev%2Fgithub.svg + + a + b: { + b child + } + c + d +} + +no label grid w/ container + icon: "" { + class: 2x2 + + a + b: { + b child + + icon: https://icons.terrastruct.com/dev%2Fgithub.svg + } + c + d +} + +no label grid + icon: "" { + class: 2x2 + + icon: https://icons.terrastruct.com/dev%2Fgithub.svg + + a + b + c + d +} diff --git a/e2etests/testdata/stable/grid_icon/dagre/board.exp.json b/e2etests/testdata/stable/grid_icon/dagre/board.exp.json new file mode 100644 index 000000000..4f7aa96e8 --- /dev/null +++ b/e2etests/testdata/stable/grid_icon/dagre/board.exp.json @@ -0,0 +1,1271 @@ +{ + "name": "", + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "grid w/ container + icon", + "type": "rectangle", + "classes": [ + "2x2" + ], + "pos": { + "x": 0, + "y": 21 + }, + "width": 384, + "height": 356, + "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": "grid w/ container + icon", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 273, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "grid w/ container + icon.a", + "type": "rectangle", + "pos": { + "x": 60, + "y": 81 + }, + "width": 53, + "height": 130, + "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": "a", + "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": "grid w/ container + icon.b", + "type": "rectangle", + "pos": { + "x": 153, + "y": 81 + }, + "width": 171, + "height": 130, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/dev/github.svg", + "RawPath": "/dev%2Fgithub.svg", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "INSIDE_MIDDLE_CENTER", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "b", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 12, + "labelHeight": 31, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "grid w/ container + icon.b.b child", + "type": "rectangle", + "pos": { + "x": 193, + "y": 113 + }, + "width": 91, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "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 child", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 46, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "grid w/ container + icon.c", + "type": "rectangle", + "pos": { + "x": 60, + "y": 251 + }, + "width": 53, + "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": "c", + "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": "grid w/ container + icon.d", + "type": "rectangle", + "pos": { + "x": 153, + "y": 251 + }, + "width": 171, + "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": "d", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 9, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "grid + icon", + "type": "rectangle", + "classes": [ + "2x2" + ], + "pos": { + "x": 444, + "y": 32 + }, + "width": 267, + "height": 333, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B4", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/dev/github.svg", + "RawPath": "/dev%2Fgithub.svg", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "INSIDE_MIDDLE_CENTER", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "grid + icon", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 120, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "grid + icon.a", + "type": "rectangle", + "pos": { + "x": 504, + "y": 92 + }, + "width": 53, + "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": "a", + "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": "grid + icon.b", + "type": "rectangle", + "pos": { + "x": 597, + "y": 92 + }, + "width": 54, + "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": "b", + "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": "grid + icon.c", + "type": "rectangle", + "pos": { + "x": 504, + "y": 198 + }, + "width": 53, + "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": "c", + "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": "grid + icon.d", + "type": "rectangle", + "pos": { + "x": 597, + "y": 198 + }, + "width": 54, + "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": "d", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 9, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "grid + icon w/ container", + "type": "rectangle", + "classes": [ + "2x2" + ], + "pos": { + "x": 771, + "y": 0 + }, + "width": 384, + "height": 397, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B4", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/dev/github.svg", + "RawPath": "/dev%2Fgithub.svg", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "INSIDE_MIDDLE_CENTER", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "grid + icon w/ container", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 275, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "grid + icon w/ container.a", + "type": "rectangle", + "pos": { + "x": 831, + "y": 60 + }, + "width": 53, + "height": 130, + "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": "a", + "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": "grid + icon w/ container.b", + "type": "rectangle", + "pos": { + "x": 924, + "y": 60 + }, + "width": 171, + "height": 130, + "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": "b", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 12, + "labelHeight": 31, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "grid + icon w/ container.b.b child", + "type": "rectangle", + "pos": { + "x": 964, + "y": 92 + }, + "width": 91, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "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 child", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 46, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "grid + icon w/ container.c", + "type": "rectangle", + "pos": { + "x": 831, + "y": 230 + }, + "width": 53, + "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": "c", + "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": "grid + icon w/ container.d", + "type": "rectangle", + "pos": { + "x": 924, + "y": 230 + }, + "width": 171, + "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": "d", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 9, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "no label grid w/ container + icon", + "type": "rectangle", + "classes": [ + "2x2" + ], + "pos": { + "x": 1215, + "y": 21 + }, + "width": 384, + "height": 356, + "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": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "no label grid w/ container + icon.a", + "type": "rectangle", + "pos": { + "x": 1275, + "y": 81 + }, + "width": 53, + "height": 130, + "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": "a", + "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": "no label grid w/ container + icon.b", + "type": "rectangle", + "pos": { + "x": 1368, + "y": 81 + }, + "width": 171, + "height": 130, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/dev/github.svg", + "RawPath": "/dev%2Fgithub.svg", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "INSIDE_MIDDLE_CENTER", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "b", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 12, + "labelHeight": 31, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "no label grid w/ container + icon.b.b child", + "type": "rectangle", + "pos": { + "x": 1408, + "y": 113 + }, + "width": 91, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "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 child", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 46, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "no label grid w/ container + icon.c", + "type": "rectangle", + "pos": { + "x": 1275, + "y": 251 + }, + "width": 53, + "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": "c", + "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": "no label grid w/ container + icon.d", + "type": "rectangle", + "pos": { + "x": 1368, + "y": 251 + }, + "width": 171, + "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": "d", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 9, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "no label grid + icon", + "type": "rectangle", + "classes": [ + "2x2" + ], + "pos": { + "x": 1659, + "y": 53 + }, + "width": 267, + "height": 292, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B4", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/dev/github.svg", + "RawPath": "/dev%2Fgithub.svg", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "INSIDE_MIDDLE_CENTER", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "no label grid + icon.a", + "type": "rectangle", + "pos": { + "x": 1719, + "y": 113 + }, + "width": 53, + "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": "a", + "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": "no label grid + icon.b", + "type": "rectangle", + "pos": { + "x": 1812, + "y": 113 + }, + "width": 54, + "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": "b", + "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": "no label grid + icon.c", + "type": "rectangle", + "pos": { + "x": 1719, + "y": 219 + }, + "width": 53, + "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": "c", + "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": "no label grid + icon.d", + "type": "rectangle", + "pos": { + "x": 1812, + "y": 219 + }, + "width": 54, + "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": "d", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 9, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + } + ], + "connections": [], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/stable/grid_icon/dagre/sketch.exp.svg b/e2etests/testdata/stable/grid_icon/dagre/sketch.exp.svg new file mode 100644 index 000000000..808c46fca --- /dev/null +++ b/e2etests/testdata/stable/grid_icon/dagre/sketch.exp.svg @@ -0,0 +1,102 @@ +grid w/ container + icongrid + icongrid + icon w/ containerabcdabcdabcdabcdabcdb childb childb child + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/grid_icon/elk/board.exp.json b/e2etests/testdata/stable/grid_icon/elk/board.exp.json new file mode 100644 index 000000000..4cbb1ccf2 --- /dev/null +++ b/e2etests/testdata/stable/grid_icon/elk/board.exp.json @@ -0,0 +1,1271 @@ +{ + "name": "", + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "grid w/ container + icon", + "type": "rectangle", + "classes": [ + "2x2" + ], + "pos": { + "x": 12, + "y": 20 + }, + "width": 404, + "height": 416, + "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": "grid w/ container + icon", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 273, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "grid w/ container + icon.a", + "type": "rectangle", + "pos": { + "x": 72, + "y": 80 + }, + "width": 53, + "height": 190, + "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": "a", + "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": "grid w/ container + icon.b", + "type": "rectangle", + "pos": { + "x": 165, + "y": 80 + }, + "width": 191, + "height": 190, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/dev/github.svg", + "RawPath": "/dev%2Fgithub.svg", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "INSIDE_MIDDLE_CENTER", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "b", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 12, + "labelHeight": 31, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "grid w/ container + icon.b.b child", + "type": "rectangle", + "pos": { + "x": 215, + "y": 154 + }, + "width": 91, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "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 child", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 46, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "grid w/ container + icon.c", + "type": "rectangle", + "pos": { + "x": 72, + "y": 310 + }, + "width": 53, + "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": "c", + "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": "grid w/ container + icon.d", + "type": "rectangle", + "pos": { + "x": 165, + "y": 310 + }, + "width": 191, + "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": "d", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 9, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "grid + icon", + "type": "rectangle", + "classes": [ + "2x2" + ], + "pos": { + "x": 436, + "y": 62 + }, + "width": 267, + "height": 333, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B4", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/dev/github.svg", + "RawPath": "/dev%2Fgithub.svg", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "INSIDE_MIDDLE_CENTER", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "grid + icon", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 120, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "grid + icon.a", + "type": "rectangle", + "pos": { + "x": 496, + "y": 122 + }, + "width": 53, + "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": "a", + "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": "grid + icon.b", + "type": "rectangle", + "pos": { + "x": 589, + "y": 122 + }, + "width": 54, + "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": "b", + "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": "grid + icon.c", + "type": "rectangle", + "pos": { + "x": 496, + "y": 228 + }, + "width": 53, + "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": "c", + "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": "grid + icon.d", + "type": "rectangle", + "pos": { + "x": 589, + "y": 228 + }, + "width": 54, + "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": "d", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 9, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "grid + icon w/ container", + "type": "rectangle", + "classes": [ + "2x2" + ], + "pos": { + "x": 723, + "y": 12 + }, + "width": 404, + "height": 433, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B4", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/dev/github.svg", + "RawPath": "/dev%2Fgithub.svg", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "INSIDE_MIDDLE_CENTER", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "grid + icon w/ container", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 275, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "grid + icon w/ container.a", + "type": "rectangle", + "pos": { + "x": 783, + "y": 72 + }, + "width": 53, + "height": 166, + "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": "a", + "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": "grid + icon w/ container.b", + "type": "rectangle", + "pos": { + "x": 876, + "y": 72 + }, + "width": 191, + "height": 166, + "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": "b", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 12, + "labelHeight": 31, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "grid + icon w/ container.b.b child", + "type": "rectangle", + "pos": { + "x": 926, + "y": 122 + }, + "width": 91, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "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 child", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 46, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "grid + icon w/ container.c", + "type": "rectangle", + "pos": { + "x": 783, + "y": 278 + }, + "width": 53, + "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": "c", + "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": "grid + icon w/ container.d", + "type": "rectangle", + "pos": { + "x": 876, + "y": 278 + }, + "width": 191, + "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": "d", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 9, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "no label grid w/ container + icon", + "type": "rectangle", + "classes": [ + "2x2" + ], + "pos": { + "x": 1147, + "y": 20 + }, + "width": 404, + "height": 416, + "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": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "no label grid w/ container + icon.a", + "type": "rectangle", + "pos": { + "x": 1207, + "y": 80 + }, + "width": 53, + "height": 190, + "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": "a", + "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": "no label grid w/ container + icon.b", + "type": "rectangle", + "pos": { + "x": 1300, + "y": 80 + }, + "width": 191, + "height": 190, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/dev/github.svg", + "RawPath": "/dev%2Fgithub.svg", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "INSIDE_MIDDLE_CENTER", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "b", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 12, + "labelHeight": 31, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "no label grid w/ container + icon.b.b child", + "type": "rectangle", + "pos": { + "x": 1350, + "y": 154 + }, + "width": 91, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "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 child", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 46, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "no label grid w/ container + icon.c", + "type": "rectangle", + "pos": { + "x": 1207, + "y": 310 + }, + "width": 53, + "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": "c", + "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": "no label grid w/ container + icon.d", + "type": "rectangle", + "pos": { + "x": 1300, + "y": 310 + }, + "width": 191, + "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": "d", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 9, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "no label grid + icon", + "type": "rectangle", + "classes": [ + "2x2" + ], + "pos": { + "x": 1571, + "y": 82 + }, + "width": 267, + "height": 292, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B4", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/dev/github.svg", + "RawPath": "/dev%2Fgithub.svg", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "INSIDE_MIDDLE_CENTER", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "no label grid + icon.a", + "type": "rectangle", + "pos": { + "x": 1631, + "y": 142 + }, + "width": 53, + "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": "a", + "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": "no label grid + icon.b", + "type": "rectangle", + "pos": { + "x": 1724, + "y": 142 + }, + "width": 54, + "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": "b", + "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": "no label grid + icon.c", + "type": "rectangle", + "pos": { + "x": 1631, + "y": 248 + }, + "width": 53, + "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": "c", + "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": "no label grid + icon.d", + "type": "rectangle", + "pos": { + "x": 1724, + "y": 248 + }, + "width": 54, + "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": "d", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 9, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + } + ], + "connections": [], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/stable/grid_icon/elk/sketch.exp.svg b/e2etests/testdata/stable/grid_icon/elk/sketch.exp.svg new file mode 100644 index 000000000..f10778ef9 --- /dev/null +++ b/e2etests/testdata/stable/grid_icon/elk/sketch.exp.svg @@ -0,0 +1,102 @@ +grid w/ container + icongrid + icongrid + icon w/ containerabcdabcdabcdabcdabcdb childb childb child + + + \ No newline at end of file From 176df52cec88aeca09020dec188a5054d1543995 Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Tue, 30 May 2023 11:59:39 -0700 Subject: [PATCH 14/62] fix grid icon positioning --- d2layouts/d2dagrelayout/layout.go | 4 +- d2layouts/d2elklayout/layout.go | 4 +- d2layouts/d2grid/layout.go | 115 ++++++++++++++++++------------ 3 files changed, 75 insertions(+), 48 deletions(-) diff --git a/d2layouts/d2dagrelayout/layout.go b/d2layouts/d2dagrelayout/layout.go index 39cd1f9fe..e033c61e7 100644 --- a/d2layouts/d2dagrelayout/layout.go +++ b/d2layouts/d2dagrelayout/layout.go @@ -238,7 +238,7 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err obj.Width = math.Ceil(dn.Width) obj.Height = math.Ceil(dn.Height) - if obj.HasLabel() { + if obj.HasLabel() && obj.LabelPosition == nil { if len(obj.ChildrenArray) > 0 { obj.LabelPosition = go2.Pointer(string(label.OutsideTopCenter)) } else if obj.HasOutsideBottomLabel() { @@ -251,7 +251,7 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err obj.LabelPosition = go2.Pointer(string(label.InsideMiddleCenter)) } } - if obj.Icon != nil { + if obj.Icon != nil && obj.IconPosition == nil { if len(obj.ChildrenArray) > 0 { obj.IconPosition = go2.Pointer(string(label.OutsideTopLeft)) obj.LabelPosition = go2.Pointer(string(label.OutsideTopRight)) diff --git a/d2layouts/d2elklayout/layout.go b/d2layouts/d2elklayout/layout.go index be6687f7e..2fb5e160d 100644 --- a/d2layouts/d2elklayout/layout.go +++ b/d2layouts/d2elklayout/layout.go @@ -407,7 +407,7 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err obj.Width = math.Ceil(n.Width) obj.Height = math.Ceil(n.Height) - if obj.HasLabel() { + if obj.HasLabel() && obj.LabelPosition == nil { if len(obj.ChildrenArray) > 0 { obj.LabelPosition = go2.Pointer(string(label.InsideTopCenter)) } else if obj.HasOutsideBottomLabel() { @@ -419,7 +419,7 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err obj.LabelPosition = go2.Pointer(string(label.InsideMiddleCenter)) } } - if obj.Icon != nil { + if obj.Icon != nil && obj.IconPosition == nil { if len(obj.ChildrenArray) > 0 { obj.IconPosition = go2.Pointer(string(label.InsideTopLeft)) obj.LabelPosition = go2.Pointer(string(label.InsideTopRight)) diff --git a/d2layouts/d2grid/layout.go b/d2layouts/d2grid/layout.go index a84209808..390470583 100644 --- a/d2layouts/d2grid/layout.go +++ b/d2layouts/d2grid/layout.go @@ -8,6 +8,7 @@ import ( "sort" "oss.terrastruct.com/d2/d2graph" + "oss.terrastruct.com/d2/d2target" "oss.terrastruct.com/d2/lib/geo" "oss.terrastruct.com/d2/lib/label" "oss.terrastruct.com/util-go/go2" @@ -112,62 +113,88 @@ func withoutGridDiagrams(ctx context.Context, g *d2graph.Graph, layout d2graph.L gd.shift(innerBox.TopLeft.X, innerBox.TopLeft.Y) } + // compute how much space the label and icon occupy + var occupiedWidth, occupiedHeight float64 + if obj.Icon != nil { + iconSpace := float64(d2target.MAX_ICON_SIZE + 2*label.PADDING) + occupiedWidth = iconSpace + occupiedHeight = iconSpace + } + var dx, dy float64 - if obj.LabelDimensions.Width != 0 { - labelWidth := float64(obj.LabelDimensions.Width) + 2*label.PADDING - if labelWidth > obj.Width { - dx = (labelWidth - obj.Width) / 2 - obj.Width = labelWidth - } - } if obj.LabelDimensions.Height != 0 { - labelHeight := float64(obj.LabelDimensions.Height) + 2*label.PADDING - - // also check for grid cells with outside top labels - // the first grid object is at the top (and always exists) - topY := gd.objects[0].TopLeft.Y - highestLabel := topY - for _, o := range gd.objects { - // we only want to compute label positions for objects at the top of the grid - if o.TopLeft.Y > topY { - if gd.rowDirected { - // if the grid is rowDirected (row1, row2, etc) we can stop after finishing the first row - break - } else { - // otherwise we continue until the next column - continue - } - } - if o.LabelPosition != nil { - labelPosition := label.Position(*o.LabelPosition) - if labelPosition.IsOutside() { - labelTL := o.GetLabelTopLeft() - if labelTL.Y < highestLabel { - highestLabel = labelTL.Y - } - } - } - } - if highestLabel < topY { - labelHeight += topY - highestLabel + 2*label.PADDING - } - - if labelHeight > float64(verticalPadding) { - // if the label doesn't fit within the padding, we need to add more - grow := labelHeight - float64(verticalPadding) - dy = grow - obj.Height += grow + occupiedHeight = math.Max( + occupiedHeight, + float64(obj.LabelDimensions.Height)+2*label.PADDING, + ) + } + if obj.LabelDimensions.Width != 0 { + // . ├────┤───────├────┤ + // . icon label icon + // with an icon in top left we need 2x the space to fit the label in the center + occupiedWidth *= 2 + occupiedWidth += float64(obj.LabelDimensions.Width) + 2*label.PADDING + if occupiedWidth > obj.Width { + dx = (occupiedWidth - obj.Width) / 2 + obj.Width = occupiedWidth } } + + // also check for grid cells with outside top labels or icons + // the first grid object is at the top (and always exists) + topY := gd.objects[0].TopLeft.Y + highestOutside := topY + for _, o := range gd.objects { + // we only want to compute label positions for objects at the top of the grid + if o.TopLeft.Y > topY { + if gd.rowDirected { + // if the grid is rowDirected (row1, row2, etc) we can stop after finishing the first row + break + } else { + // otherwise we continue until the next column + continue + } + } + if o.LabelPosition != nil { + labelPosition := label.Position(*o.LabelPosition) + if labelPosition.IsOutside() { + labelTL := o.GetLabelTopLeft() + if labelTL.Y < highestOutside { + highestOutside = labelTL.Y + } + } + } + if o.IconPosition != nil { + switch label.Position(*o.IconPosition) { + case label.OutsideTopLeft, label.OutsideTopCenter, label.OutsideTopRight: + iconSpace := float64(d2target.MAX_ICON_SIZE + label.PADDING) + if topY-iconSpace < highestOutside { + highestOutside = topY - iconSpace + } + } + } + } + if highestOutside < topY { + occupiedHeight += topY - highestOutside + 2*label.PADDING + } + if occupiedHeight > float64(verticalPadding) { + // if the label doesn't fit within the padding, we need to add more + dy = occupiedHeight - float64(verticalPadding) + obj.Height += dy + } + // we need to center children if we have to expand to fit the container label if dx != 0 || dy != 0 { gd.shift(dx, dy) } } - if obj.LabelPosition == nil { + if obj.HasLabel() { obj.LabelPosition = go2.Pointer(string(label.InsideTopCenter)) } + if obj.Icon != nil { + obj.IconPosition = go2.Pointer(string(label.InsideTopLeft)) + } gridDiagrams[obj.AbsID()] = gd for _, o := range gd.objects { From db2b3f2d14bc23fd8fefd417247704373931ecd6 Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Tue, 30 May 2023 13:33:07 -0700 Subject: [PATCH 15/62] update tests --- .../stable/grid_icon/dagre/board.exp.json | 126 +++++++------- .../stable/grid_icon/dagre/sketch.exp.svg | 160 +++++++++--------- .../stable/grid_icon/elk/board.exp.json | 118 ++++++------- .../stable/grid_icon/elk/sketch.exp.svg | 160 +++++++++--------- 4 files changed, 282 insertions(+), 282 deletions(-) diff --git a/e2etests/testdata/stable/grid_icon/dagre/board.exp.json b/e2etests/testdata/stable/grid_icon/dagre/board.exp.json index 4f7aa96e8..4ad3f73ef 100644 --- a/e2etests/testdata/stable/grid_icon/dagre/board.exp.json +++ b/e2etests/testdata/stable/grid_icon/dagre/board.exp.json @@ -11,10 +11,10 @@ ], "pos": { "x": 0, - "y": 21 + "y": 18 }, "width": 384, - "height": 356, + "height": 421, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -52,7 +52,7 @@ "type": "rectangle", "pos": { "x": 60, - "y": 81 + "y": 143 }, "width": 53, "height": 130, @@ -93,7 +93,7 @@ "type": "rectangle", "pos": { "x": 153, - "y": 81 + "y": 143 }, "width": 171, "height": 130, @@ -122,7 +122,7 @@ "Fragment": "", "RawFragment": "" }, - "iconPosition": "INSIDE_MIDDLE_CENTER", + "iconPosition": "OUTSIDE_TOP_LEFT", "blend": false, "fields": null, "methods": null, @@ -137,7 +137,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 31, - "labelPosition": "INSIDE_TOP_CENTER", + "labelPosition": "OUTSIDE_TOP_RIGHT", "zIndex": 0, "level": 2 }, @@ -146,7 +146,7 @@ "type": "rectangle", "pos": { "x": 193, - "y": 113 + "y": 175 }, "width": 91, "height": 66, @@ -187,7 +187,7 @@ "type": "rectangle", "pos": { "x": 60, - "y": 251 + "y": 313 }, "width": 53, "height": 66, @@ -228,7 +228,7 @@ "type": "rectangle", "pos": { "x": 153, - "y": 251 + "y": 313 }, "width": 171, "height": 66, @@ -272,10 +272,10 @@ ], "pos": { "x": 444, - "y": 32 + "y": 55 }, - "width": 267, - "height": 333, + "width": 278, + "height": 347, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -301,7 +301,7 @@ "Fragment": "", "RawFragment": "" }, - "iconPosition": "INSIDE_MIDDLE_CENTER", + "iconPosition": "INSIDE_TOP_LEFT", "blend": false, "fields": null, "methods": null, @@ -324,8 +324,8 @@ "id": "grid + icon.a", "type": "rectangle", "pos": { - "x": 504, - "y": 92 + "x": 509, + "y": 129 }, "width": 53, "height": 66, @@ -365,8 +365,8 @@ "id": "grid + icon.b", "type": "rectangle", "pos": { - "x": 597, - "y": 92 + "x": 602, + "y": 129 }, "width": 54, "height": 66, @@ -406,8 +406,8 @@ "id": "grid + icon.c", "type": "rectangle", "pos": { - "x": 504, - "y": 198 + "x": 509, + "y": 235 }, "width": 53, "height": 66, @@ -447,8 +447,8 @@ "id": "grid + icon.d", "type": "rectangle", "pos": { - "x": 597, - "y": 198 + "x": 602, + "y": 235 }, "width": 54, "height": 66, @@ -491,11 +491,11 @@ "2x2" ], "pos": { - "x": 771, + "x": 782, "y": 0 }, - "width": 384, - "height": 397, + "width": 433, + "height": 457, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -521,7 +521,7 @@ "Fragment": "", "RawFragment": "" }, - "iconPosition": "INSIDE_MIDDLE_CENTER", + "iconPosition": "INSIDE_TOP_LEFT", "blend": false, "fields": null, "methods": null, @@ -544,8 +544,8 @@ "id": "grid + icon w/ container.a", "type": "rectangle", "pos": { - "x": 831, - "y": 60 + "x": 866, + "y": 120 }, "width": 53, "height": 130, @@ -585,8 +585,8 @@ "id": "grid + icon w/ container.b", "type": "rectangle", "pos": { - "x": 924, - "y": 60 + "x": 959, + "y": 120 }, "width": 171, "height": 130, @@ -618,7 +618,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 31, - "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPosition": "OUTSIDE_TOP_CENTER", "zIndex": 0, "level": 2 }, @@ -626,8 +626,8 @@ "id": "grid + icon w/ container.b.b child", "type": "rectangle", "pos": { - "x": 964, - "y": 92 + "x": 999, + "y": 152 }, "width": 91, "height": 66, @@ -667,8 +667,8 @@ "id": "grid + icon w/ container.c", "type": "rectangle", "pos": { - "x": 831, - "y": 230 + "x": 866, + "y": 290 }, "width": 53, "height": 66, @@ -708,8 +708,8 @@ "id": "grid + icon w/ container.d", "type": "rectangle", "pos": { - "x": 924, - "y": 230 + "x": 959, + "y": 290 }, "width": 171, "height": 66, @@ -752,11 +752,11 @@ "2x2" ], "pos": { - "x": 1215, - "y": 21 + "x": 1275, + "y": 41 }, "width": 384, - "height": 356, + "height": 375, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -793,8 +793,8 @@ "id": "no label grid w/ container + icon.a", "type": "rectangle", "pos": { - "x": 1275, - "y": 81 + "x": 1335, + "y": 120 }, "width": 53, "height": 130, @@ -834,8 +834,8 @@ "id": "no label grid w/ container + icon.b", "type": "rectangle", "pos": { - "x": 1368, - "y": 81 + "x": 1428, + "y": 120 }, "width": 171, "height": 130, @@ -864,7 +864,7 @@ "Fragment": "", "RawFragment": "" }, - "iconPosition": "INSIDE_MIDDLE_CENTER", + "iconPosition": "OUTSIDE_TOP_LEFT", "blend": false, "fields": null, "methods": null, @@ -879,7 +879,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 31, - "labelPosition": "INSIDE_TOP_CENTER", + "labelPosition": "OUTSIDE_TOP_RIGHT", "zIndex": 0, "level": 2 }, @@ -887,8 +887,8 @@ "id": "no label grid w/ container + icon.b.b child", "type": "rectangle", "pos": { - "x": 1408, - "y": 113 + "x": 1468, + "y": 152 }, "width": 91, "height": 66, @@ -928,8 +928,8 @@ "id": "no label grid w/ container + icon.c", "type": "rectangle", "pos": { - "x": 1275, - "y": 251 + "x": 1335, + "y": 290 }, "width": 53, "height": 66, @@ -969,8 +969,8 @@ "id": "no label grid w/ container + icon.d", "type": "rectangle", "pos": { - "x": 1368, - "y": 251 + "x": 1428, + "y": 290 }, "width": 171, "height": 66, @@ -1013,11 +1013,11 @@ "2x2" ], "pos": { - "x": 1659, - "y": 53 + "x": 1719, + "y": 76 }, "width": 267, - "height": 292, + "height": 306, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1043,7 +1043,7 @@ "Fragment": "", "RawFragment": "" }, - "iconPosition": "INSIDE_MIDDLE_CENTER", + "iconPosition": "INSIDE_TOP_LEFT", "blend": false, "fields": null, "methods": null, @@ -1066,8 +1066,8 @@ "id": "no label grid + icon.a", "type": "rectangle", "pos": { - "x": 1719, - "y": 113 + "x": 1779, + "y": 150 }, "width": 53, "height": 66, @@ -1107,8 +1107,8 @@ "id": "no label grid + icon.b", "type": "rectangle", "pos": { - "x": 1812, - "y": 113 + "x": 1872, + "y": 150 }, "width": 54, "height": 66, @@ -1148,8 +1148,8 @@ "id": "no label grid + icon.c", "type": "rectangle", "pos": { - "x": 1719, - "y": 219 + "x": 1779, + "y": 256 }, "width": 53, "height": 66, @@ -1189,8 +1189,8 @@ "id": "no label grid + icon.d", "type": "rectangle", "pos": { - "x": 1812, - "y": 219 + "x": 1872, + "y": 256 }, "width": 54, "height": 66, diff --git a/e2etests/testdata/stable/grid_icon/dagre/sketch.exp.svg b/e2etests/testdata/stable/grid_icon/dagre/sketch.exp.svg index 808c46fca..92e20b3c2 100644 --- a/e2etests/testdata/stable/grid_icon/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/grid_icon/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -grid w/ container + icongrid + icongrid + icon w/ containerabcdabcdabcdabcdabcdb childb childb child - + .d2-3381334095 .fill-N1{fill:#0A0F25;} + .d2-3381334095 .fill-N2{fill:#676C7E;} + .d2-3381334095 .fill-N3{fill:#9499AB;} + .d2-3381334095 .fill-N4{fill:#CFD2DD;} + .d2-3381334095 .fill-N5{fill:#DEE1EB;} + .d2-3381334095 .fill-N6{fill:#EEF1F8;} + .d2-3381334095 .fill-N7{fill:#FFFFFF;} + .d2-3381334095 .fill-B1{fill:#0D32B2;} + .d2-3381334095 .fill-B2{fill:#0D32B2;} + .d2-3381334095 .fill-B3{fill:#E3E9FD;} + .d2-3381334095 .fill-B4{fill:#E3E9FD;} + .d2-3381334095 .fill-B5{fill:#EDF0FD;} + .d2-3381334095 .fill-B6{fill:#F7F8FE;} + .d2-3381334095 .fill-AA2{fill:#4A6FF3;} + .d2-3381334095 .fill-AA4{fill:#EDF0FD;} + .d2-3381334095 .fill-AA5{fill:#F7F8FE;} + .d2-3381334095 .fill-AB4{fill:#EDF0FD;} + .d2-3381334095 .fill-AB5{fill:#F7F8FE;} + .d2-3381334095 .stroke-N1{stroke:#0A0F25;} + .d2-3381334095 .stroke-N2{stroke:#676C7E;} + .d2-3381334095 .stroke-N3{stroke:#9499AB;} + .d2-3381334095 .stroke-N4{stroke:#CFD2DD;} + .d2-3381334095 .stroke-N5{stroke:#DEE1EB;} + .d2-3381334095 .stroke-N6{stroke:#EEF1F8;} + .d2-3381334095 .stroke-N7{stroke:#FFFFFF;} + .d2-3381334095 .stroke-B1{stroke:#0D32B2;} + .d2-3381334095 .stroke-B2{stroke:#0D32B2;} + .d2-3381334095 .stroke-B3{stroke:#E3E9FD;} + .d2-3381334095 .stroke-B4{stroke:#E3E9FD;} + .d2-3381334095 .stroke-B5{stroke:#EDF0FD;} + .d2-3381334095 .stroke-B6{stroke:#F7F8FE;} + .d2-3381334095 .stroke-AA2{stroke:#4A6FF3;} + .d2-3381334095 .stroke-AA4{stroke:#EDF0FD;} + .d2-3381334095 .stroke-AA5{stroke:#F7F8FE;} + .d2-3381334095 .stroke-AB4{stroke:#EDF0FD;} + .d2-3381334095 .stroke-AB5{stroke:#F7F8FE;} + .d2-3381334095 .background-color-N1{background-color:#0A0F25;} + .d2-3381334095 .background-color-N2{background-color:#676C7E;} + .d2-3381334095 .background-color-N3{background-color:#9499AB;} + .d2-3381334095 .background-color-N4{background-color:#CFD2DD;} + .d2-3381334095 .background-color-N5{background-color:#DEE1EB;} + .d2-3381334095 .background-color-N6{background-color:#EEF1F8;} + .d2-3381334095 .background-color-N7{background-color:#FFFFFF;} + .d2-3381334095 .background-color-B1{background-color:#0D32B2;} + .d2-3381334095 .background-color-B2{background-color:#0D32B2;} + .d2-3381334095 .background-color-B3{background-color:#E3E9FD;} + .d2-3381334095 .background-color-B4{background-color:#E3E9FD;} + .d2-3381334095 .background-color-B5{background-color:#EDF0FD;} + .d2-3381334095 .background-color-B6{background-color:#F7F8FE;} + .d2-3381334095 .background-color-AA2{background-color:#4A6FF3;} + .d2-3381334095 .background-color-AA4{background-color:#EDF0FD;} + .d2-3381334095 .background-color-AA5{background-color:#F7F8FE;} + .d2-3381334095 .background-color-AB4{background-color:#EDF0FD;} + .d2-3381334095 .background-color-AB5{background-color:#F7F8FE;} + .d2-3381334095 .color-N1{color:#0A0F25;} + .d2-3381334095 .color-N2{color:#676C7E;} + .d2-3381334095 .color-N3{color:#9499AB;} + .d2-3381334095 .color-N4{color:#CFD2DD;} + .d2-3381334095 .color-N5{color:#DEE1EB;} + .d2-3381334095 .color-N6{color:#EEF1F8;} + .d2-3381334095 .color-N7{color:#FFFFFF;} + .d2-3381334095 .color-B1{color:#0D32B2;} + .d2-3381334095 .color-B2{color:#0D32B2;} + .d2-3381334095 .color-B3{color:#E3E9FD;} + .d2-3381334095 .color-B4{color:#E3E9FD;} + .d2-3381334095 .color-B5{color:#EDF0FD;} + .d2-3381334095 .color-B6{color:#F7F8FE;} + .d2-3381334095 .color-AA2{color:#4A6FF3;} + .d2-3381334095 .color-AA4{color:#EDF0FD;} + .d2-3381334095 .color-AA5{color:#F7F8FE;} + .d2-3381334095 .color-AB4{color:#EDF0FD;} + .d2-3381334095 .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}]]>grid w/ container + icongrid + icongrid + icon w/ containerabcdabcdabcdabcdabcdb childb childb child + \ No newline at end of file diff --git a/e2etests/testdata/stable/grid_icon/elk/board.exp.json b/e2etests/testdata/stable/grid_icon/elk/board.exp.json index 4cbb1ccf2..be644853a 100644 --- a/e2etests/testdata/stable/grid_icon/elk/board.exp.json +++ b/e2etests/testdata/stable/grid_icon/elk/board.exp.json @@ -11,7 +11,7 @@ ], "pos": { "x": 12, - "y": 20 + "y": 27 }, "width": 404, "height": 416, @@ -52,7 +52,7 @@ "type": "rectangle", "pos": { "x": 72, - "y": 80 + "y": 87 }, "width": 53, "height": 190, @@ -93,7 +93,7 @@ "type": "rectangle", "pos": { "x": 165, - "y": 80 + "y": 87 }, "width": 191, "height": 190, @@ -122,7 +122,7 @@ "Fragment": "", "RawFragment": "" }, - "iconPosition": "INSIDE_MIDDLE_CENTER", + "iconPosition": "INSIDE_TOP_LEFT", "blend": false, "fields": null, "methods": null, @@ -137,7 +137,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 31, - "labelPosition": "INSIDE_TOP_CENTER", + "labelPosition": "INSIDE_TOP_RIGHT", "zIndex": 0, "level": 2 }, @@ -146,7 +146,7 @@ "type": "rectangle", "pos": { "x": 215, - "y": 154 + "y": 161 }, "width": 91, "height": 66, @@ -187,7 +187,7 @@ "type": "rectangle", "pos": { "x": 72, - "y": 310 + "y": 317 }, "width": 53, "height": 66, @@ -228,7 +228,7 @@ "type": "rectangle", "pos": { "x": 165, - "y": 310 + "y": 317 }, "width": 191, "height": 66, @@ -274,8 +274,8 @@ "x": 436, "y": 62 }, - "width": 267, - "height": 333, + "width": 278, + "height": 347, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -301,7 +301,7 @@ "Fragment": "", "RawFragment": "" }, - "iconPosition": "INSIDE_MIDDLE_CENTER", + "iconPosition": "INSIDE_TOP_LEFT", "blend": false, "fields": null, "methods": null, @@ -324,8 +324,8 @@ "id": "grid + icon.a", "type": "rectangle", "pos": { - "x": 496, - "y": 122 + "x": 501, + "y": 136 }, "width": 53, "height": 66, @@ -365,8 +365,8 @@ "id": "grid + icon.b", "type": "rectangle", "pos": { - "x": 589, - "y": 122 + "x": 594, + "y": 136 }, "width": 54, "height": 66, @@ -406,8 +406,8 @@ "id": "grid + icon.c", "type": "rectangle", "pos": { - "x": 496, - "y": 228 + "x": 501, + "y": 242 }, "width": 53, "height": 66, @@ -447,8 +447,8 @@ "id": "grid + icon.d", "type": "rectangle", "pos": { - "x": 589, - "y": 228 + "x": 594, + "y": 242 }, "width": 54, "height": 66, @@ -491,11 +491,11 @@ "2x2" ], "pos": { - "x": 723, + "x": 734, "y": 12 }, - "width": 404, - "height": 433, + "width": 433, + "height": 447, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -521,7 +521,7 @@ "Fragment": "", "RawFragment": "" }, - "iconPosition": "INSIDE_MIDDLE_CENTER", + "iconPosition": "INSIDE_TOP_LEFT", "blend": false, "fields": null, "methods": null, @@ -544,8 +544,8 @@ "id": "grid + icon w/ container.a", "type": "rectangle", "pos": { - "x": 783, - "y": 72 + "x": 808, + "y": 86 }, "width": 53, "height": 166, @@ -585,8 +585,8 @@ "id": "grid + icon w/ container.b", "type": "rectangle", "pos": { - "x": 876, - "y": 72 + "x": 901, + "y": 86 }, "width": 191, "height": 166, @@ -618,7 +618,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 31, - "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPosition": "INSIDE_TOP_CENTER", "zIndex": 0, "level": 2 }, @@ -626,8 +626,8 @@ "id": "grid + icon w/ container.b.b child", "type": "rectangle", "pos": { - "x": 926, - "y": 122 + "x": 951, + "y": 136 }, "width": 91, "height": 66, @@ -667,8 +667,8 @@ "id": "grid + icon w/ container.c", "type": "rectangle", "pos": { - "x": 783, - "y": 278 + "x": 808, + "y": 292 }, "width": 53, "height": 66, @@ -708,8 +708,8 @@ "id": "grid + icon w/ container.d", "type": "rectangle", "pos": { - "x": 876, - "y": 278 + "x": 901, + "y": 292 }, "width": 191, "height": 66, @@ -752,8 +752,8 @@ "2x2" ], "pos": { - "x": 1147, - "y": 20 + "x": 1187, + "y": 27 }, "width": 404, "height": 416, @@ -793,8 +793,8 @@ "id": "no label grid w/ container + icon.a", "type": "rectangle", "pos": { - "x": 1207, - "y": 80 + "x": 1247, + "y": 87 }, "width": 53, "height": 190, @@ -834,8 +834,8 @@ "id": "no label grid w/ container + icon.b", "type": "rectangle", "pos": { - "x": 1300, - "y": 80 + "x": 1340, + "y": 87 }, "width": 191, "height": 190, @@ -864,7 +864,7 @@ "Fragment": "", "RawFragment": "" }, - "iconPosition": "INSIDE_MIDDLE_CENTER", + "iconPosition": "INSIDE_TOP_LEFT", "blend": false, "fields": null, "methods": null, @@ -879,7 +879,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 31, - "labelPosition": "INSIDE_TOP_CENTER", + "labelPosition": "INSIDE_TOP_RIGHT", "zIndex": 0, "level": 2 }, @@ -887,8 +887,8 @@ "id": "no label grid w/ container + icon.b.b child", "type": "rectangle", "pos": { - "x": 1350, - "y": 154 + "x": 1390, + "y": 161 }, "width": 91, "height": 66, @@ -928,8 +928,8 @@ "id": "no label grid w/ container + icon.c", "type": "rectangle", "pos": { - "x": 1207, - "y": 310 + "x": 1247, + "y": 317 }, "width": 53, "height": 66, @@ -969,8 +969,8 @@ "id": "no label grid w/ container + icon.d", "type": "rectangle", "pos": { - "x": 1300, - "y": 310 + "x": 1340, + "y": 317 }, "width": 191, "height": 66, @@ -1013,11 +1013,11 @@ "2x2" ], "pos": { - "x": 1571, + "x": 1611, "y": 82 }, "width": 267, - "height": 292, + "height": 306, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1043,7 +1043,7 @@ "Fragment": "", "RawFragment": "" }, - "iconPosition": "INSIDE_MIDDLE_CENTER", + "iconPosition": "INSIDE_TOP_LEFT", "blend": false, "fields": null, "methods": null, @@ -1066,8 +1066,8 @@ "id": "no label grid + icon.a", "type": "rectangle", "pos": { - "x": 1631, - "y": 142 + "x": 1671, + "y": 156 }, "width": 53, "height": 66, @@ -1107,8 +1107,8 @@ "id": "no label grid + icon.b", "type": "rectangle", "pos": { - "x": 1724, - "y": 142 + "x": 1764, + "y": 156 }, "width": 54, "height": 66, @@ -1148,8 +1148,8 @@ "id": "no label grid + icon.c", "type": "rectangle", "pos": { - "x": 1631, - "y": 248 + "x": 1671, + "y": 262 }, "width": 53, "height": 66, @@ -1189,8 +1189,8 @@ "id": "no label grid + icon.d", "type": "rectangle", "pos": { - "x": 1724, - "y": 248 + "x": 1764, + "y": 262 }, "width": 54, "height": 66, diff --git a/e2etests/testdata/stable/grid_icon/elk/sketch.exp.svg b/e2etests/testdata/stable/grid_icon/elk/sketch.exp.svg index f10778ef9..ab9421789 100644 --- a/e2etests/testdata/stable/grid_icon/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/grid_icon/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -grid w/ container + icongrid + icongrid + icon w/ containerabcdabcdabcdabcdabcdb childb childb child - + .d2-433253505 .fill-N1{fill:#0A0F25;} + .d2-433253505 .fill-N2{fill:#676C7E;} + .d2-433253505 .fill-N3{fill:#9499AB;} + .d2-433253505 .fill-N4{fill:#CFD2DD;} + .d2-433253505 .fill-N5{fill:#DEE1EB;} + .d2-433253505 .fill-N6{fill:#EEF1F8;} + .d2-433253505 .fill-N7{fill:#FFFFFF;} + .d2-433253505 .fill-B1{fill:#0D32B2;} + .d2-433253505 .fill-B2{fill:#0D32B2;} + .d2-433253505 .fill-B3{fill:#E3E9FD;} + .d2-433253505 .fill-B4{fill:#E3E9FD;} + .d2-433253505 .fill-B5{fill:#EDF0FD;} + .d2-433253505 .fill-B6{fill:#F7F8FE;} + .d2-433253505 .fill-AA2{fill:#4A6FF3;} + .d2-433253505 .fill-AA4{fill:#EDF0FD;} + .d2-433253505 .fill-AA5{fill:#F7F8FE;} + .d2-433253505 .fill-AB4{fill:#EDF0FD;} + .d2-433253505 .fill-AB5{fill:#F7F8FE;} + .d2-433253505 .stroke-N1{stroke:#0A0F25;} + .d2-433253505 .stroke-N2{stroke:#676C7E;} + .d2-433253505 .stroke-N3{stroke:#9499AB;} + .d2-433253505 .stroke-N4{stroke:#CFD2DD;} + .d2-433253505 .stroke-N5{stroke:#DEE1EB;} + .d2-433253505 .stroke-N6{stroke:#EEF1F8;} + .d2-433253505 .stroke-N7{stroke:#FFFFFF;} + .d2-433253505 .stroke-B1{stroke:#0D32B2;} + .d2-433253505 .stroke-B2{stroke:#0D32B2;} + .d2-433253505 .stroke-B3{stroke:#E3E9FD;} + .d2-433253505 .stroke-B4{stroke:#E3E9FD;} + .d2-433253505 .stroke-B5{stroke:#EDF0FD;} + .d2-433253505 .stroke-B6{stroke:#F7F8FE;} + .d2-433253505 .stroke-AA2{stroke:#4A6FF3;} + .d2-433253505 .stroke-AA4{stroke:#EDF0FD;} + .d2-433253505 .stroke-AA5{stroke:#F7F8FE;} + .d2-433253505 .stroke-AB4{stroke:#EDF0FD;} + .d2-433253505 .stroke-AB5{stroke:#F7F8FE;} + .d2-433253505 .background-color-N1{background-color:#0A0F25;} + .d2-433253505 .background-color-N2{background-color:#676C7E;} + .d2-433253505 .background-color-N3{background-color:#9499AB;} + .d2-433253505 .background-color-N4{background-color:#CFD2DD;} + .d2-433253505 .background-color-N5{background-color:#DEE1EB;} + .d2-433253505 .background-color-N6{background-color:#EEF1F8;} + .d2-433253505 .background-color-N7{background-color:#FFFFFF;} + .d2-433253505 .background-color-B1{background-color:#0D32B2;} + .d2-433253505 .background-color-B2{background-color:#0D32B2;} + .d2-433253505 .background-color-B3{background-color:#E3E9FD;} + .d2-433253505 .background-color-B4{background-color:#E3E9FD;} + .d2-433253505 .background-color-B5{background-color:#EDF0FD;} + .d2-433253505 .background-color-B6{background-color:#F7F8FE;} + .d2-433253505 .background-color-AA2{background-color:#4A6FF3;} + .d2-433253505 .background-color-AA4{background-color:#EDF0FD;} + .d2-433253505 .background-color-AA5{background-color:#F7F8FE;} + .d2-433253505 .background-color-AB4{background-color:#EDF0FD;} + .d2-433253505 .background-color-AB5{background-color:#F7F8FE;} + .d2-433253505 .color-N1{color:#0A0F25;} + .d2-433253505 .color-N2{color:#676C7E;} + .d2-433253505 .color-N3{color:#9499AB;} + .d2-433253505 .color-N4{color:#CFD2DD;} + .d2-433253505 .color-N5{color:#DEE1EB;} + .d2-433253505 .color-N6{color:#EEF1F8;} + .d2-433253505 .color-N7{color:#FFFFFF;} + .d2-433253505 .color-B1{color:#0D32B2;} + .d2-433253505 .color-B2{color:#0D32B2;} + .d2-433253505 .color-B3{color:#E3E9FD;} + .d2-433253505 .color-B4{color:#E3E9FD;} + .d2-433253505 .color-B5{color:#EDF0FD;} + .d2-433253505 .color-B6{color:#F7F8FE;} + .d2-433253505 .color-AA2{color:#4A6FF3;} + .d2-433253505 .color-AA4{color:#EDF0FD;} + .d2-433253505 .color-AA5{color:#F7F8FE;} + .d2-433253505 .color-AB4{color:#EDF0FD;} + .d2-433253505 .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}]]>grid w/ container + icongrid + icongrid + icon w/ containerabcdabcdabcdabcdabcdb childb childb child + \ No newline at end of file From 0a78ee87eb06288bd56552c687b4c22289a30726 Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Wed, 31 May 2023 11:02:10 -0700 Subject: [PATCH 16/62] factor out d2graph/layout.go --- d2graph/d2graph.go | 182 ------------------------------------------ d2graph/layout.go | 191 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 191 insertions(+), 182 deletions(-) create mode 100644 d2graph/layout.go diff --git a/d2graph/d2graph.go b/d2graph/d2graph.go index f43837ef8..301cc5bd8 100644 --- a/d2graph/d2graph.go +++ b/d2graph/d2graph.go @@ -26,7 +26,6 @@ import ( "oss.terrastruct.com/d2/d2themes/d2themescatalog" "oss.terrastruct.com/d2/lib/color" "oss.terrastruct.com/d2/lib/geo" - "oss.terrastruct.com/d2/lib/label" "oss.terrastruct.com/d2/lib/shape" "oss.terrastruct.com/d2/lib/textmeasure" ) @@ -1818,90 +1817,6 @@ func (g *Graph) ApplyTheme(themeID int64) error { return nil } -func (obj *Object) MoveWithDescendants(dx, dy float64) { - obj.TopLeft.X += dx - obj.TopLeft.Y += dy - for _, child := range obj.ChildrenArray { - child.MoveWithDescendants(dx, dy) - } -} - -func (obj *Object) MoveWithDescendantsTo(x, y float64) { - dx := x - obj.TopLeft.X - dy := y - obj.TopLeft.Y - obj.MoveWithDescendants(dx, dy) -} - -func (parent *Object) removeChild(child *Object) { - delete(parent.Children, strings.ToLower(child.ID)) - for i := 0; i < len(parent.ChildrenArray); i++ { - if parent.ChildrenArray[i] == child { - parent.ChildrenArray = append(parent.ChildrenArray[:i], parent.ChildrenArray[i+1:]...) - break - } - } -} - -// remove obj and all descendants from graph, as a new Graph -func (g *Graph) ExtractAsNestedGraph(obj *Object) *Graph { - descendantObjects, edges := pluckObjAndEdges(g, obj) - - tempGraph := NewGraph() - tempGraph.Root.ChildrenArray = []*Object{obj} - tempGraph.Root.Children[strings.ToLower(obj.ID)] = obj - - for _, descendantObj := range descendantObjects { - descendantObj.Graph = tempGraph - } - tempGraph.Objects = descendantObjects - tempGraph.Edges = edges - - obj.Parent.removeChild(obj) - obj.Parent = tempGraph.Root - - return tempGraph -} - -func pluckObjAndEdges(g *Graph, obj *Object) (descendantsObjects []*Object, edges []*Edge) { - for i := 0; i < len(g.Edges); i++ { - edge := g.Edges[i] - if edge.Src == obj || edge.Dst == obj { - edges = append(edges, edge) - g.Edges = append(g.Edges[:i], g.Edges[i+1:]...) - i-- - } - } - - for i := 0; i < len(g.Objects); i++ { - temp := g.Objects[i] - if temp.AbsID() == obj.AbsID() { - descendantsObjects = append(descendantsObjects, obj) - g.Objects = append(g.Objects[:i], g.Objects[i+1:]...) - for _, child := range obj.ChildrenArray { - subObjects, subEdges := pluckObjAndEdges(g, child) - descendantsObjects = append(descendantsObjects, subObjects...) - edges = append(edges, subEdges...) - } - break - } - } - - return descendantsObjects, edges -} - -func (g *Graph) InjectNestedGraph(tempGraph *Graph, parent *Object) { - obj := tempGraph.Root.ChildrenArray[0] - obj.MoveWithDescendantsTo(0, 0) - obj.Parent = parent - for _, obj := range tempGraph.Objects { - obj.Graph = g - } - g.Objects = append(g.Objects, tempGraph.Objects...) - parent.Children[strings.ToLower(obj.ID)] = obj - parent.ChildrenArray = append(parent.ChildrenArray, obj) - g.Edges = append(g.Edges, tempGraph.Edges...) -} - func (g *Graph) PrintString() string { buf := &bytes.Buffer{} fmt.Fprint(buf, "Objects: [") @@ -1919,54 +1834,6 @@ func (obj *Object) IterDescendants(apply func(parent, child *Object)) { } } -// ShiftDescendants moves Object's descendants (not including itself) -// descendants' edges are also moved by the same dx and dy (the whole route is moved if both ends are a descendant) -func (obj *Object) ShiftDescendants(dx, dy float64) { - // also need to shift edges of descendants that are shifted - movedEdges := make(map[*Edge]struct{}) - for _, e := range obj.Graph.Edges { - isSrcDesc := e.Src.IsDescendantOf(obj) - isDstDesc := e.Dst.IsDescendantOf(obj) - - if isSrcDesc && isDstDesc { - movedEdges[e] = struct{}{} - for _, p := range e.Route { - p.X += dx - p.Y += dy - } - } - } - - obj.IterDescendants(func(_, curr *Object) { - curr.TopLeft.X += dx - curr.TopLeft.Y += dy - for _, e := range obj.Graph.Edges { - if _, ok := movedEdges[e]; ok { - continue - } - isSrc := e.Src == curr - isDst := e.Dst == curr - - if isSrc && isDst { - for _, p := range e.Route { - p.X += dx - p.Y += dy - } - } else if isSrc { - e.Route[0].X += dx - e.Route[0].Y += dy - } else if isDst { - e.Route[len(e.Route)-1].X += dx - e.Route[len(e.Route)-1].Y += dy - } - - if isSrc || isDst { - movedEdges[e] = struct{}{} - } - } - }) -} - func (obj *Object) IsMultiple() bool { return obj.Style.Multiple != nil && obj.Style.Multiple.Value == "true" } @@ -1974,52 +1841,3 @@ func (obj *Object) IsMultiple() bool { func (obj *Object) Is3D() bool { return obj.Style.ThreeDee != nil && obj.Style.ThreeDee.Value == "true" } - -// GetModifierElementAdjustments returns width/height adjustments to account for shapes with 3d or multiple -func (obj *Object) GetModifierElementAdjustments() (dx, dy float64) { - if obj.Is3D() { - if obj.Shape.Value == d2target.ShapeHexagon { - dy = d2target.THREE_DEE_OFFSET / 2 - } else { - dy = d2target.THREE_DEE_OFFSET - } - dx = d2target.THREE_DEE_OFFSET - } else if obj.IsMultiple() { - dy = d2target.MULTIPLE_OFFSET - dx = d2target.MULTIPLE_OFFSET - } - return dx, dy -} - -func (obj *Object) ToShape() shape.Shape { - tl := obj.TopLeft - if tl == nil { - tl = geo.NewPoint(0, 0) - } - dslShape := strings.ToLower(obj.Shape.Value) - shapeType := d2target.DSL_SHAPE_TO_SHAPE_TYPE[dslShape] - contentBox := geo.NewBox(tl, obj.Width, obj.Height) - return shape.NewShape(shapeType, contentBox) -} - -func (obj *Object) GetLabelTopLeft() *geo.Point { - if obj.LabelPosition == nil { - return nil - } - - s := obj.ToShape() - labelPosition := label.Position(*obj.LabelPosition) - - var box *geo.Box - if labelPosition.IsOutside() { - box = s.GetBox() - } else { - box = s.GetInnerBox() - } - - labelTL := labelPosition.GetPointOnBox(box, label.PADDING, - float64(obj.LabelDimensions.Width), - float64(obj.LabelDimensions.Height), - ) - return labelTL -} diff --git a/d2graph/layout.go b/d2graph/layout.go new file mode 100644 index 000000000..43342daa1 --- /dev/null +++ b/d2graph/layout.go @@ -0,0 +1,191 @@ +package d2graph + +import ( + "strings" + + "oss.terrastruct.com/d2/d2target" + "oss.terrastruct.com/d2/lib/geo" + "oss.terrastruct.com/d2/lib/label" + "oss.terrastruct.com/d2/lib/shape" +) + +func (obj *Object) MoveWithDescendants(dx, dy float64) { + obj.TopLeft.X += dx + obj.TopLeft.Y += dy + for _, child := range obj.ChildrenArray { + child.MoveWithDescendants(dx, dy) + } +} + +func (obj *Object) MoveWithDescendantsTo(x, y float64) { + dx := x - obj.TopLeft.X + dy := y - obj.TopLeft.Y + obj.MoveWithDescendants(dx, dy) +} + +func (parent *Object) removeChild(child *Object) { + delete(parent.Children, strings.ToLower(child.ID)) + for i := 0; i < len(parent.ChildrenArray); i++ { + if parent.ChildrenArray[i] == child { + parent.ChildrenArray = append(parent.ChildrenArray[:i], parent.ChildrenArray[i+1:]...) + break + } + } +} + +// remove obj and all descendants from graph, as a new Graph +func (g *Graph) ExtractAsNestedGraph(obj *Object) *Graph { + descendantObjects, edges := pluckObjAndEdges(g, obj) + + tempGraph := NewGraph() + tempGraph.Root.ChildrenArray = []*Object{obj} + tempGraph.Root.Children[strings.ToLower(obj.ID)] = obj + + for _, descendantObj := range descendantObjects { + descendantObj.Graph = tempGraph + } + tempGraph.Objects = descendantObjects + tempGraph.Edges = edges + + obj.Parent.removeChild(obj) + obj.Parent = tempGraph.Root + + return tempGraph +} + +func pluckObjAndEdges(g *Graph, obj *Object) (descendantsObjects []*Object, edges []*Edge) { + for i := 0; i < len(g.Edges); i++ { + edge := g.Edges[i] + if edge.Src == obj || edge.Dst == obj { + edges = append(edges, edge) + g.Edges = append(g.Edges[:i], g.Edges[i+1:]...) + i-- + } + } + + for i := 0; i < len(g.Objects); i++ { + temp := g.Objects[i] + if temp.AbsID() == obj.AbsID() { + descendantsObjects = append(descendantsObjects, obj) + g.Objects = append(g.Objects[:i], g.Objects[i+1:]...) + for _, child := range obj.ChildrenArray { + subObjects, subEdges := pluckObjAndEdges(g, child) + descendantsObjects = append(descendantsObjects, subObjects...) + edges = append(edges, subEdges...) + } + break + } + } + + return descendantsObjects, edges +} + +func (g *Graph) InjectNestedGraph(tempGraph *Graph, parent *Object) { + obj := tempGraph.Root.ChildrenArray[0] + obj.MoveWithDescendantsTo(0, 0) + obj.Parent = parent + for _, obj := range tempGraph.Objects { + obj.Graph = g + } + g.Objects = append(g.Objects, tempGraph.Objects...) + parent.Children[strings.ToLower(obj.ID)] = obj + parent.ChildrenArray = append(parent.ChildrenArray, obj) + g.Edges = append(g.Edges, tempGraph.Edges...) +} + +// ShiftDescendants moves Object's descendants (not including itself) +// descendants' edges are also moved by the same dx and dy (the whole route is moved if both ends are a descendant) +func (obj *Object) ShiftDescendants(dx, dy float64) { + // also need to shift edges of descendants that are shifted + movedEdges := make(map[*Edge]struct{}) + for _, e := range obj.Graph.Edges { + isSrcDesc := e.Src.IsDescendantOf(obj) + isDstDesc := e.Dst.IsDescendantOf(obj) + + if isSrcDesc && isDstDesc { + movedEdges[e] = struct{}{} + for _, p := range e.Route { + p.X += dx + p.Y += dy + } + } + } + + obj.IterDescendants(func(_, curr *Object) { + curr.TopLeft.X += dx + curr.TopLeft.Y += dy + for _, e := range obj.Graph.Edges { + if _, ok := movedEdges[e]; ok { + continue + } + isSrc := e.Src == curr + isDst := e.Dst == curr + + if isSrc && isDst { + for _, p := range e.Route { + p.X += dx + p.Y += dy + } + } else if isSrc { + e.Route[0].X += dx + e.Route[0].Y += dy + } else if isDst { + e.Route[len(e.Route)-1].X += dx + e.Route[len(e.Route)-1].Y += dy + } + + if isSrc || isDst { + movedEdges[e] = struct{}{} + } + } + }) +} + +// GetModifierElementAdjustments returns width/height adjustments to account for shapes with 3d or multiple +func (obj *Object) GetModifierElementAdjustments() (dx, dy float64) { + if obj.Is3D() { + if obj.Shape.Value == d2target.ShapeHexagon { + dy = d2target.THREE_DEE_OFFSET / 2 + } else { + dy = d2target.THREE_DEE_OFFSET + } + dx = d2target.THREE_DEE_OFFSET + } else if obj.IsMultiple() { + dy = d2target.MULTIPLE_OFFSET + dx = d2target.MULTIPLE_OFFSET + } + return dx, dy +} + +func (obj *Object) ToShape() shape.Shape { + tl := obj.TopLeft + if tl == nil { + tl = geo.NewPoint(0, 0) + } + dslShape := strings.ToLower(obj.Shape.Value) + shapeType := d2target.DSL_SHAPE_TO_SHAPE_TYPE[dslShape] + contentBox := geo.NewBox(tl, obj.Width, obj.Height) + return shape.NewShape(shapeType, contentBox) +} + +func (obj *Object) GetLabelTopLeft() *geo.Point { + if obj.LabelPosition == nil { + return nil + } + + s := obj.ToShape() + labelPosition := label.Position(*obj.LabelPosition) + + var box *geo.Box + if labelPosition.IsOutside() { + box = s.GetBox() + } else { + box = s.GetInnerBox() + } + + labelTL := labelPosition.GetPointOnBox(box, label.PADDING, + float64(obj.LabelDimensions.Width), + float64(obj.LabelDimensions.Height), + ) + return labelTL +} From 8de7711e68b8fdb6d24416dff71ddc1f32e8cacc Mon Sep 17 00:00:00 2001 From: Bernard Xie Date: Wed, 31 May 2023 16:30:11 -0700 Subject: [PATCH 17/62] fix --- d2renderers/d2fonts/d2fonts.go | 5 +- d2renderers/d2fonts/d2fonts_test.go | 5 +- .../d2fonts/testdata/d2fonts/cut.exp.txt | Bin 4184 -> 4184 bytes .../testdata/all_shapes/sketch.exp.svg | 2 +- .../testdata/all_shapes_dark/sketch.exp.svg | 2 +- .../d2sketch/testdata/animated/sketch.exp.svg | 4 +- .../testdata/animated_dark/sketch.exp.svg | 4 +- .../testdata/arrowheads/sketch.exp.svg | 4 +- .../testdata/arrowheads_dark/sketch.exp.svg | 4 +- .../d2sketch/testdata/basic/sketch.exp.svg | 2 +- .../testdata/basic_dark/sketch.exp.svg | 2 +- .../testdata/child_to_child/sketch.exp.svg | 4 +- .../child_to_child_dark/sketch.exp.svg | 4 +- .../d2sketch/testdata/class/sketch.exp.svg | 2 +- .../sketch.exp.svg | 4 +- .../testdata/class_dark/sketch.exp.svg | 2 +- .../testdata/crows_feet/sketch.exp.svg | 2 +- .../testdata/crows_feet_dark/sketch.exp.svg | 2 +- .../d2sketch/testdata/dots-3d/sketch.exp.svg | 2 +- .../d2sketch/testdata/dots-all/sketch.exp.svg | 2 +- .../testdata/dots-multiple/sketch.exp.svg | 2 +- .../testdata/dots-real/sketch.exp.svg | 4 +- .../testdata/double-border/sketch.exp.svg | 4 +- .../testdata/elk_corners/sketch.exp.svg | 2 +- .../long_arrowhead_label/sketch.exp.svg | 4 +- .../d2sketch/testdata/opacity/sketch.exp.svg | 8 +- .../testdata/opacity_dark/sketch.exp.svg | 8 +- .../d2sketch/testdata/overlay/sketch.exp.svg | 2 +- .../testdata/paper-real/sketch.exp.svg | 4 +- .../testdata/root-fill/sketch.exp.svg | 6 +- .../testdata/sql_tables/sketch.exp.svg | 2 +- .../testdata/sql_tables_dark/sketch.exp.svg | 2 +- .../d2sketch/testdata/terminal/sketch.exp.svg | 4 +- .../d2sketch/testdata/twitter/sketch.exp.svg | 8 +- .../testdata/twitter_dark/sketch.exp.svg | 8 +- .../diagram_wider_than_tooltip/sketch.exp.svg | 4 +- .../testdata/internal-links/sketch.exp.svg | 2 +- .../appendix/testdata/links/sketch.exp.svg | 2 +- .../testdata/links_dark/sketch.exp.svg | 2 +- .../testdata/tooltip_fill/sketch.exp.svg | 2 +- .../tooltip_wider_than_diagram/sketch.exp.svg | 2 +- .../testdata/all_shapes/dark_theme.exp.svg | 2 +- .../testdata/animated/dark_theme.exp.svg | 4 +- .../testdata/arrowheads/dark_theme.exp.svg | 4 +- .../testdata/basic/dark_theme.exp.svg | 2 +- .../child_to_child/dark_theme.exp.svg | 4 +- .../testdata/class/dark_theme.exp.svg | 2 +- .../testdata/code/dark_theme.exp.svg | 10 +- .../testdata/opacity/dark_theme.exp.svg | 8 +- .../testdata/overlay/dark_theme.exp.svg | 2 +- .../testdata/sql_tables/dark_theme.exp.svg | 2 +- .../testdata/twitter/dark_theme.exp.svg | 8 +- .../testdata/TestCLI_E2E/abspath.exp.svg | 2 +- .../testdata/TestCLI_E2E/animation.exp.svg | 4 +- .../testdata/TestCLI_E2E/center.exp.svg | 2 +- .../TestCLI_E2E/internal_linked_pdf.exp.pdf | Bin 79721 -> 79990 bytes .../TestCLI_E2E/multiboard/life/index.exp.svg | 2 +- .../multiboard/life/layers/broker.exp.svg | 2 +- .../multiboard/life/layers/stocks.exp.svg | 2 +- .../multiboard/life/scenarios/why.exp.svg | 2 +- .../multiboard/life_index_d2/index.exp.svg | 2 +- .../life_index_d2/layers/broker.exp.svg | 2 +- .../life_index_d2/layers/stocks.exp.svg | 2 +- .../life_index_d2/scenarios/why.exp.svg | 2 +- .../testdata/TestCLI_E2E/stdin.exp.svg | 2 +- .../testdata/TestCLI_E2E/with-font.exp.svg | 4 +- .../empty-markdown/dagre/sketch.exp.svg | 4 +- .../testdata/patterns/3d/dagre/sketch.exp.svg | 2 +- .../patterns/all_shapes/dagre/sketch.exp.svg | 2 +- .../patterns/multiple/dagre/sketch.exp.svg | 2 +- .../patterns/paper/dagre/sketch.exp.svg | 2 +- .../patterns/real-lines/dagre/sketch.exp.svg | 6 +- .../patterns/real/dagre/sketch.exp.svg | 4 +- .../root-dots-with-fill/dagre/sketch.exp.svg | 2 +- .../patterns/root-dots/dagre/sketch.exp.svg | 2 +- .../patterns/shape/dagre/sketch.exp.svg | 2 +- .../ampersand-escape/dagre/sketch.exp.svg | 2 +- .../ampersand-escape/elk/sketch.exp.svg | 2 +- .../dagre/sketch.exp.svg | 6 +- .../elk/sketch.exp.svg | 6 +- .../dagre/sketch.exp.svg | 2 +- .../elk/sketch.exp.svg | 2 +- .../dagre/sketch.exp.svg | 6 +- .../elk/sketch.exp.svg | 6 +- .../cylinder_grid_label/dagre/sketch.exp.svg | 4 +- .../cylinder_grid_label/elk/sketch.exp.svg | 4 +- .../dagre-disconnect/dagre/sketch.exp.svg | 6 +- .../dagre-disconnect/elk/sketch.exp.svg | 6 +- .../dagre/sketch.exp.svg | 6 +- .../dagre_broken_arrowhead/elk/sketch.exp.svg | 6 +- .../dagre/sketch.exp.svg | 6 +- .../elk/sketch.exp.svg | 6 +- .../dagre_special_ids/dagre/sketch.exp.svg | 2 +- .../dagre_special_ids/elk/sketch.exp.svg | 2 +- .../elk_alignment/dagre/sketch.exp.svg | 6 +- .../elk_alignment/elk/sketch.exp.svg | 6 +- .../elk_loop_panic/dagre/sketch.exp.svg | 4 +- .../elk_loop_panic/elk/sketch.exp.svg | 4 +- .../regression/elk_order/dagre/sketch.exp.svg | 6 +- .../regression/elk_order/elk/sketch.exp.svg | 6 +- .../empty_class_height/dagre/sketch.exp.svg | 2 +- .../empty_class_height/elk/sketch.exp.svg | 2 +- .../empty_md_measurement/dagre/sketch.exp.svg | 6 +- .../empty_md_measurement/elk/sketch.exp.svg | 6 +- .../empty_sequence/dagre/sketch.exp.svg | 2 +- .../empty_sequence/elk/sketch.exp.svg | 2 +- .../regression/grid_oom/dagre/sketch.exp.svg | 2 +- .../regression/grid_oom/elk/sketch.exp.svg | 2 +- .../grid_panic/dagre/sketch.exp.svg | 4 +- .../regression/grid_panic/elk/sketch.exp.svg | 4 +- .../regression/hex-fill/dagre/sketch.exp.svg | 2 +- .../regression/hex-fill/elk/sketch.exp.svg | 2 +- .../just-width/dagre/sketch.exp.svg | 2 +- .../regression/just-width/elk/sketch.exp.svg | 2 +- .../link_with_ampersand/dagre/sketch.exp.svg | 2 +- .../link_with_ampersand/elk/sketch.exp.svg | 2 +- .../long_arrowhead_label/dagre/sketch.exp.svg | 4 +- .../long_arrowhead_label/elk/sketch.exp.svg | 4 +- .../md_font_weight/dagre/sketch.exp.svg | 4 +- .../md_font_weight/elk/sketch.exp.svg | 4 +- .../md_h1_li_li/dagre/sketch.exp.svg | 6 +- .../regression/md_h1_li_li/elk/sketch.exp.svg | 6 +- .../nested_steps/dagre/sketch.exp.svg | 4 +- .../nested_steps/elk/sketch.exp.svg | 4 +- .../regression/no-lexer/dagre/sketch.exp.svg | 2 +- .../regression/no-lexer/elk/sketch.exp.svg | 2 +- .../dagre/sketch.exp.svg | 4 +- .../elk/sketch.exp.svg | 4 +- .../opacity-on-label/dagre/sketch.exp.svg | 8 +- .../opacity-on-label/elk/sketch.exp.svg | 8 +- .../dagre/sketch.exp.svg | 6 +- .../overlapping-edge-label/elk/sketch.exp.svg | 6 +- .../query_param_escape/dagre/sketch.exp.svg | 2 +- .../query_param_escape/elk/sketch.exp.svg | 2 +- .../root-container/dagre/sketch.exp.svg | 4 +- .../root-container/elk/sketch.exp.svg | 4 +- .../dagre/sketch.exp.svg | 2 +- .../elk/sketch.exp.svg | 2 +- .../dagre/sketch.exp.svg | 2 +- .../elk/sketch.exp.svg | 2 +- .../dagre/sketch.exp.svg | 2 +- .../elk/sketch.exp.svg | 2 +- .../dagre/sketch.exp.svg | 2 +- .../elk/sketch.exp.svg | 2 +- .../dagre/sketch.exp.svg | 2 +- .../elk/sketch.exp.svg | 2 +- .../regression/slow_grid/dagre/sketch.exp.svg | 2 +- .../regression/slow_grid/elk/sketch.exp.svg | 2 +- .../sql_table_overflow/dagre/sketch.exp.svg | 2 +- .../sql_table_overflow/elk/sketch.exp.svg | 2 +- .../dagre/sketch.exp.svg | 4 +- .../elk/sketch.exp.svg | 4 +- .../unconnected/dagre/sketch.exp.svg | 6 +- .../regression/unconnected/elk/sketch.exp.svg | 6 +- .../dagre/sketch.exp.svg | 6 +- .../elk/sketch.exp.svg | 6 +- .../root/border-radius/dagre/sketch.exp.svg | 2 +- .../root/border-radius/elk/sketch.exp.svg | 2 +- .../root/double-border/dagre/sketch.exp.svg | 2 +- .../root/double-border/elk/sketch.exp.svg | 2 +- .../even-stroke-width/dagre/sketch.exp.svg | 2 +- .../root/even-stroke-width/elk/sketch.exp.svg | 2 +- .../testdata/root/fill/dagre/sketch.exp.svg | 2 +- .../testdata/root/fill/elk/sketch.exp.svg | 2 +- .../root/stroke-dash/dagre/sketch.exp.svg | 2 +- .../root/stroke-dash/elk/sketch.exp.svg | 2 +- .../root/stroke-no-width/dagre/sketch.exp.svg | 2 +- .../root/stroke-no-width/elk/sketch.exp.svg | 2 +- .../root/stroke-width/dagre/sketch.exp.svg | 2 +- .../root/stroke-width/elk/sketch.exp.svg | 2 +- .../sanity/1_to_2/dagre/sketch.exp.svg | 2 +- .../testdata/sanity/1_to_2/elk/sketch.exp.svg | 2 +- .../sanity/basic/dagre/sketch.exp.svg | 2 +- .../testdata/sanity/basic/elk/sketch.exp.svg | 2 +- .../child_to_child/dagre/sketch.exp.svg | 4 +- .../sanity/child_to_child/elk/sketch.exp.svg | 4 +- .../3d_fill_and_stroke/dagre/sketch.exp.svg | 2 +- .../3d_fill_and_stroke/elk/sketch.exp.svg | 2 +- .../stable/all_shapes/dagre/sketch.exp.svg | 2 +- .../stable/all_shapes/elk/sketch.exp.svg | 2 +- .../all_shapes_multiple/dagre/sketch.exp.svg | 2 +- .../all_shapes_multiple/elk/sketch.exp.svg | 2 +- .../all_shapes_shadow/dagre/sketch.exp.svg | 2 +- .../all_shapes_shadow/elk/sketch.exp.svg | 2 +- .../stable/animated/dagre/sketch.exp.svg | 4 +- .../stable/animated/elk/sketch.exp.svg | 4 +- .../stable/array-classes/dagre/sketch.exp.svg | 2 +- .../stable/array-classes/elk/sketch.exp.svg | 2 +- .../arrowhead_adjustment/dagre/sketch.exp.svg | 4 +- .../arrowhead_adjustment/elk/sketch.exp.svg | 4 +- .../arrowhead_labels/dagre/sketch.exp.svg | 4 +- .../arrowhead_labels/elk/sketch.exp.svg | 4 +- .../arrowhead_scaling/dagre/sketch.exp.svg | 6 +- .../arrowhead_scaling/elk/sketch.exp.svg | 6 +- .../stable/binary_tree/dagre/sketch.exp.svg | 2 +- .../stable/binary_tree/elk/sketch.exp.svg | 2 +- .../dagre/sketch.exp.svg | 2 +- .../elk/sketch.exp.svg | 2 +- .../stable/border-radius/dagre/sketch.exp.svg | 2 +- .../stable/border-radius/elk/sketch.exp.svg | 2 +- .../testdata/stable/br/dagre/sketch.exp.svg | 4 +- .../testdata/stable/br/elk/sketch.exp.svg | 4 +- .../stable/chaos2/dagre/sketch.exp.svg | 6 +- .../testdata/stable/chaos2/elk/sketch.exp.svg | 6 +- .../circle_arrowhead/dagre/sketch.exp.svg | 4 +- .../circle_arrowhead/elk/sketch.exp.svg | 4 +- .../circular_dependency/dagre/sketch.exp.svg | 2 +- .../circular_dependency/elk/sketch.exp.svg | 2 +- .../stable/class/dagre/sketch.exp.svg | 2 +- .../testdata/stable/class/elk/sketch.exp.svg | 2 +- .../dagre/sketch.exp.svg | 4 +- .../elk/sketch.exp.svg | 4 +- .../stable/classes/dagre/sketch.exp.svg | 4 +- .../stable/classes/elk/sketch.exp.svg | 4 +- .../stable/code_snippet/dagre/sketch.exp.svg | 8 +- .../stable/code_snippet/elk/sketch.exp.svg | 8 +- .../complex-layers/dagre/sketch.exp.svg | 4 +- .../stable/complex-layers/elk/sketch.exp.svg | 4 +- .../connected_container/dagre/sketch.exp.svg | 4 +- .../connected_container/elk/sketch.exp.svg | 4 +- .../constant_near_stress/dagre/sketch.exp.svg | 6 +- .../constant_near_stress/elk/sketch.exp.svg | 6 +- .../constant_near_title/dagre/sketch.exp.svg | 6 +- .../constant_near_title/elk/sketch.exp.svg | 6 +- .../container_edges/dagre/sketch.exp.svg | 4 +- .../stable/container_edges/elk/sketch.exp.svg | 4 +- .../crow_foot_arrowhead/dagre/sketch.exp.svg | 2 +- .../crow_foot_arrowhead/elk/sketch.exp.svg | 2 +- .../stable/cycle-order/dagre/sketch.exp.svg | 4 +- .../stable/cycle-order/elk/sketch.exp.svg | 4 +- .../stable/dagger_grid/dagre/sketch.exp.svg | 2 +- .../stable/dagger_grid/elk/sketch.exp.svg | 2 +- .../stable/dense/dagre/sketch.exp.svg | 2 +- .../testdata/stable/dense/elk/sketch.exp.svg | 2 +- .../different_subgraphs/dagre/sketch.exp.svg | 4 +- .../different_subgraphs/elk/sketch.exp.svg | 4 +- .../stable/direction/dagre/sketch.exp.svg | 4 +- .../stable/direction/elk/sketch.exp.svg | 4 +- .../edge-label-overflow/dagre/sketch.exp.svg | 4 +- .../edge-label-overflow/elk/sketch.exp.svg | 4 +- .../elk_container_height/dagre/sketch.exp.svg | 4 +- .../elk_container_height/elk/sketch.exp.svg | 4 +- .../stable/elk_shim/dagre/sketch.exp.svg | 6 +- .../stable/elk_shim/elk/sketch.exp.svg | 6 +- .../stable/ent2d2_basic/dagre/sketch.exp.svg | 4 +- .../stable/ent2d2_basic/elk/sketch.exp.svg | 4 +- .../stable/ent2d2_right/dagre/sketch.exp.svg | 4 +- .../stable/ent2d2_right/elk/sketch.exp.svg | 4 +- .../executive_grid/dagre/sketch.exp.svg | 2 +- .../stable/executive_grid/elk/sketch.exp.svg | 2 +- .../stable/font_colors/dagre/sketch.exp.svg | 4 +- .../stable/font_colors/elk/sketch.exp.svg | 4 +- .../stable/font_sizes/dagre/sketch.exp.svg | 4 +- .../stable/font_sizes/elk/sketch.exp.svg | 4 +- .../dagre/sketch.exp.svg | 4 +- .../elk/sketch.exp.svg | 4 +- .../dagre/sketch.exp.svg | 4 +- .../elk/sketch.exp.svg | 4 +- .../giant_markdown_test/dagre/sketch.exp.svg | 10 +- .../giant_markdown_test/elk/sketch.exp.svg | 10 +- .../stable/grid_animated/dagre/sketch.exp.svg | 4 +- .../stable/grid_animated/elk/sketch.exp.svg | 4 +- .../stable/grid_even/dagre/sketch.exp.svg | 4 +- .../stable/grid_even/elk/sketch.exp.svg | 4 +- .../stable/grid_gap/dagre/sketch.exp.svg | 4 +- .../stable/grid_gap/elk/sketch.exp.svg | 4 +- .../stable/grid_icon/dagre/sketch.exp.svg | 4 +- .../stable/grid_icon/elk/sketch.exp.svg | 4 +- .../stable/grid_nested/dagre/sketch.exp.svg | 4 +- .../stable/grid_nested/elk/sketch.exp.svg | 4 +- .../grid_nested_gap0/dagre/sketch.exp.svg | 4 +- .../grid_nested_gap0/elk/sketch.exp.svg | 4 +- .../stable/grid_tests/dagre/sketch.exp.svg | 4 +- .../stable/grid_tests/elk/sketch.exp.svg | 4 +- .../stable/hexagon_3d/dagre/sketch.exp.svg | 2 +- .../stable/hexagon_3d/elk/sketch.exp.svg | 2 +- .../testdata/stable/hr/dagre/sketch.exp.svg | 6 +- .../testdata/stable/hr/elk/sketch.exp.svg | 6 +- .../icon-containers/dagre/sketch.exp.svg | 4 +- .../stable/icon-containers/elk/sketch.exp.svg | 4 +- .../stable/icon-label/dagre/sketch.exp.svg | 2 +- .../stable/icon-label/elk/sketch.exp.svg | 2 +- .../stable/images/dagre/sketch.exp.svg | 2 +- .../testdata/stable/images/elk/sketch.exp.svg | 2 +- .../stable/investigate/dagre/sketch.exp.svg | 6 +- .../stable/investigate/elk/sketch.exp.svg | 6 +- .../stable/large_arch/dagre/sketch.exp.svg | 4 +- .../stable/large_arch/elk/sketch.exp.svg | 4 +- .../stable/latex/dagre/sketch.exp.svg | 4 +- .../testdata/stable/latex/elk/sketch.exp.svg | 4 +- .../legend_with_near_key/dagre/sketch.exp.svg | 4 +- .../legend_with_near_key/elk/sketch.exp.svg | 4 +- .../testdata/stable/li1/dagre/sketch.exp.svg | 6 +- .../testdata/stable/li1/elk/sketch.exp.svg | 6 +- .../testdata/stable/li2/dagre/sketch.exp.svg | 8 +- .../testdata/stable/li2/elk/sketch.exp.svg | 8 +- .../testdata/stable/li3/dagre/sketch.exp.svg | 6 +- .../testdata/stable/li3/elk/sketch.exp.svg | 6 +- .../testdata/stable/li4/dagre/sketch.exp.svg | 8 +- .../testdata/stable/li4/elk/sketch.exp.svg | 8 +- .../stable/links/dagre/sketch.exp.svg | 2 +- .../testdata/stable/links/elk/sketch.exp.svg | 2 +- .../stable/lone_h1/dagre/sketch.exp.svg | 6 +- .../stable/lone_h1/elk/sketch.exp.svg | 6 +- .../stable/markdown/dagre/sketch.exp.svg | 8 +- .../stable/markdown/elk/sketch.exp.svg | 8 +- .../markdown_stroke_fill/dagre/sketch.exp.svg | 6 +- .../markdown_stroke_fill/elk/sketch.exp.svg | 6 +- .../md_2space_newline/dagre/sketch.exp.svg | 4 +- .../md_2space_newline/elk/sketch.exp.svg | 4 +- .../md_backslash_newline/dagre/sketch.exp.svg | 4 +- .../md_backslash_newline/elk/sketch.exp.svg | 4 +- .../md_code_block_fenced/dagre/sketch.exp.svg | 8 +- .../md_code_block_fenced/elk/sketch.exp.svg | 8 +- .../dagre/sketch.exp.svg | 8 +- .../md_code_block_indented/elk/sketch.exp.svg | 8 +- .../md_fontsize_10/dagre/sketch.exp.svg | 8 +- .../stable/md_fontsize_10/elk/sketch.exp.svg | 8 +- .../stable/mono-edge/dagre/sketch.exp.svg | 6 +- .../stable/mono-edge/elk/sketch.exp.svg | 6 +- .../stable/mono-font/dagre/sketch.exp.svg | 4 +- .../stable/mono-font/elk/sketch.exp.svg | 4 +- .../multiline_text/dagre/sketch.exp.svg | 2 +- .../stable/multiline_text/elk/sketch.exp.svg | 2 +- .../multiple_offset/dagre/sketch.exp.svg | 4 +- .../stable/multiple_offset/elk/sketch.exp.svg | 4 +- .../multiple_offset_left/dagre/sketch.exp.svg | 4 +- .../multiple_offset_left/elk/sketch.exp.svg | 4 +- .../multiple_trees/dagre/sketch.exp.svg | 2 +- .../stable/multiple_trees/elk/sketch.exp.svg | 2 +- .../stable/n22_e32/dagre/sketch.exp.svg | 2 +- .../stable/n22_e32/elk/sketch.exp.svg | 2 +- .../stable/near-alone/dagre/sketch.exp.svg | 2 +- .../stable/near-alone/elk/sketch.exp.svg | 2 +- .../dagre/sketch.exp.svg | 4 +- .../elk/sketch.exp.svg | 4 +- .../dagre/sketch.exp.svg | 4 +- .../elk/sketch.exp.svg | 4 +- .../number_connections/dagre/sketch.exp.svg | 2 +- .../number_connections/elk/sketch.exp.svg | 2 +- .../one_container_loop/dagre/sketch.exp.svg | 4 +- .../one_container_loop/elk/sketch.exp.svg | 4 +- .../dagre/sketch.exp.svg | 4 +- .../elk/sketch.exp.svg | 4 +- .../dagre/sketch.exp.svg | 6 +- .../elk/sketch.exp.svg | 6 +- .../testdata/stable/p/dagre/sketch.exp.svg | 6 +- e2etests/testdata/stable/p/elk/sketch.exp.svg | 6 +- .../testdata/stable/pre/dagre/sketch.exp.svg | 8 +- .../testdata/stable/pre/elk/sketch.exp.svg | 8 +- .../self-referencing/dagre/sketch.exp.svg | 4 +- .../self-referencing/elk/sketch.exp.svg | 4 +- .../dagre/sketch.exp.svg | 4 +- .../elk/sketch.exp.svg | 4 +- .../dagre/sketch.exp.svg | 4 +- .../elk/sketch.exp.svg | 4 +- .../dagre/sketch.exp.svg | 8 +- .../elk/sketch.exp.svg | 8 +- .../dagre/sketch.exp.svg | 4 +- .../elk/sketch.exp.svg | 4 +- .../dagre/sketch.exp.svg | 4 +- .../elk/sketch.exp.svg | 4 +- .../dagre/sketch.exp.svg | 2 +- .../elk/sketch.exp.svg | 2 +- .../dagre/sketch.exp.svg | 2 +- .../elk/sketch.exp.svg | 2 +- .../dagre/sketch.exp.svg | 2 +- .../elk/sketch.exp.svg | 2 +- .../dagre/sketch.exp.svg | 4 +- .../sequence_diagram_note/elk/sketch.exp.svg | 4 +- .../dagre/sketch.exp.svg | 4 +- .../sequence_diagram_real/elk/sketch.exp.svg | 4 +- .../dagre/sketch.exp.svg | 4 +- .../elk/sketch.exp.svg | 4 +- .../dagre/sketch.exp.svg | 4 +- .../elk/sketch.exp.svg | 4 +- .../dagre/sketch.exp.svg | 4 +- .../sequence_diagram_span/elk/sketch.exp.svg | 4 +- .../sequence_diagrams/dagre/sketch.exp.svg | 6 +- .../sequence_diagrams/elk/sketch.exp.svg | 6 +- .../dagre/sketch.exp.svg | 4 +- .../elk/sketch.exp.svg | 4 +- .../dagre/sketch.exp.svg | 2 +- .../elk/sketch.exp.svg | 2 +- .../stable/sql_tables/dagre/sketch.exp.svg | 2 +- .../stable/sql_tables/elk/sketch.exp.svg | 2 +- .../stable/square_3d/dagre/sketch.exp.svg | 2 +- .../stable/square_3d/elk/sketch.exp.svg | 2 +- .../dagre/sketch.exp.svg | 4 +- .../elk/sketch.exp.svg | 4 +- .../stable/stylish/dagre/sketch.exp.svg | 4 +- .../stable/stylish/elk/sketch.exp.svg | 4 +- .../stable/teleport_grid/dagre/sketch.exp.svg | 8 +- .../stable/teleport_grid/elk/sketch.exp.svg | 8 +- .../text_font_sizes/dagre/sketch.exp.svg | 6 +- .../stable/text_font_sizes/elk/sketch.exp.svg | 6 +- .../stable/tooltips/dagre/sketch.exp.svg | 2 +- .../stable/tooltips/elk/sketch.exp.svg | 2 +- .../transparent_3d/dagre/sketch.exp.svg | 2 +- .../stable/transparent_3d/elk/sketch.exp.svg | 2 +- .../unnamed_only_height/dagre/sketch.exp.svg | 6 +- .../unnamed_only_height/elk/sketch.exp.svg | 6 +- .../unnamed_only_width/dagre/sketch.exp.svg | 6 +- .../unnamed_only_width/elk/sketch.exp.svg | 6 +- .../stable/us_map/dagre/sketch.exp.svg | 2 +- .../testdata/stable/us_map/elk/sketch.exp.svg | 2 +- .../dagre/sketch.exp.svg | 12 +- .../elk/sketch.exp.svg | 12 +- .../themes/origami/dagre/sketch.exp.svg | 6 +- .../themes/origami/elk/sketch.exp.svg | 6 +- .../themes/terminal/dagre/sketch.exp.svg | 10 +- .../themes/terminal/elk/sketch.exp.svg | 10 +- .../terminal_grayscale/dagre/sketch.exp.svg | 4 +- .../terminal_grayscale/elk/sketch.exp.svg | 4 +- .../container_icon_label/dagre/sketch.exp.svg | 4 +- .../container_icon_label/elk/sketch.exp.svg | 4 +- .../dagre/sketch.exp.svg | 4 +- .../elk/sketch.exp.svg | 4 +- .../dagre/sketch.exp.svg | 6 +- .../elk/sketch.exp.svg | 6 +- .../dagre/sketch.exp.svg | 6 +- .../elk/sketch.exp.svg | 6 +- .../dagre/sketch.exp.svg | 2 +- .../elk/sketch.exp.svg | 2 +- .../dagre/sketch.exp.svg | 4 +- .../elk/sketch.exp.svg | 4 +- .../dagre/sketch.exp.svg | 10 +- .../shape_set_width_height/elk/sketch.exp.svg | 10 +- .../unicode/chinese/dagre/sketch.exp.svg | 6 +- .../unicode/chinese/elk/sketch.exp.svg | 6 +- .../unicode/emojis/dagre/sketch.exp.svg | 2 +- .../unicode/emojis/elk/sketch.exp.svg | 2 +- .../japanese-basic/dagre/sketch.exp.svg | 2 +- .../unicode/japanese-basic/elk/sketch.exp.svg | 2 +- .../japanese-full/dagre/sketch.exp.svg | 4 +- .../unicode/japanese-full/elk/sketch.exp.svg | 4 +- .../japanese-mixed/dagre/sketch.exp.svg | 2 +- .../unicode/japanese-mixed/elk/sketch.exp.svg | 2 +- .../unicode/korean/dagre/sketch.exp.svg | 2 +- .../unicode/korean/elk/sketch.exp.svg | 2 +- .../mixed-language-2/dagre/sketch.exp.svg | 2 +- .../mixed-language-2/elk/sketch.exp.svg | 2 +- .../mixed-language/dagre/sketch.exp.svg | 6 +- .../unicode/mixed-language/elk/sketch.exp.svg | 6 +- .../unicode/with-style/dagre/sketch.exp.svg | 2 +- .../unicode/with-style/elk/sketch.exp.svg | 2 +- lib/font/subsetFont.go | 898 ++++++++++++++++++ 447 files changed, 1768 insertions(+), 872 deletions(-) create mode 100644 lib/font/subsetFont.go diff --git a/d2renderers/d2fonts/d2fonts.go b/d2renderers/d2fonts/d2fonts.go index 058371017..2c692ab35 100644 --- a/d2renderers/d2fonts/d2fonts.go +++ b/d2renderers/d2fonts/d2fonts.go @@ -10,8 +10,7 @@ import ( "fmt" "strings" - "github.com/jung-kurt/gofpdf" - + "oss.terrastruct.com/d2/lib/font" fontlib "oss.terrastruct.com/d2/lib/font" ) @@ -44,7 +43,7 @@ func (f Font) GetEncodedSubset(corpus string) string { fontBuf := make([]byte, len(FontFaces[f])) copy(fontBuf, FontFaces[f]) - fontBuf = gofpdf.UTF8CutFont(fontBuf, uniqueChars) + fontBuf = font.UTF8CutFont(fontBuf, uniqueChars) fontBuf, err := fontlib.Sfnt2Woff(fontBuf) if err != nil { diff --git a/d2renderers/d2fonts/d2fonts_test.go b/d2renderers/d2fonts/d2fonts_test.go index 0d28aece8..fc95ff310 100644 --- a/d2renderers/d2fonts/d2fonts_test.go +++ b/d2renderers/d2fonts/d2fonts_test.go @@ -4,8 +4,7 @@ import ( "path/filepath" "testing" - "github.com/jung-kurt/gofpdf" - + "oss.terrastruct.com/d2/lib/font" "oss.terrastruct.com/util-go/assert" "oss.terrastruct.com/util-go/diff" ) @@ -17,7 +16,7 @@ func TestCutFont(t *testing.T) { } fontBuf := make([]byte, len(FontFaces[f])) copy(fontBuf, FontFaces[f]) - fontBuf = gofpdf.UTF8CutFont(fontBuf, " 1") + fontBuf = font.UTF8CutFont(fontBuf, " 1") err := diff.Testdata(filepath.Join("testdata", "d2fonts", "cut"), ".txt", fontBuf) assert.Success(t, err) } diff --git a/d2renderers/d2fonts/testdata/d2fonts/cut.exp.txt b/d2renderers/d2fonts/testdata/d2fonts/cut.exp.txt index 358066a59c49de994965d28b17e733ba662a0b9b..1a4140c5f257c75c1e05d3f37e6ee07fbcb5018e 100644 GIT binary patch delta 24 gcmcbia6@5&GNa!{6>&yJjmb8QhZ%QmVv67c0Awo%aR2}S delta 24 gcmcbia6@5&GGow26>&yJoyj(ghZ#3*Vv67c0AzCqaR2}S diff --git a/d2renderers/d2sketch/testdata/all_shapes/sketch.exp.svg b/d2renderers/d2sketch/testdata/all_shapes/sketch.exp.svg index 9d1f0775f..c71244a52 100644 --- a/d2renderers/d2sketch/testdata/all_shapes/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/all_shapes/sketch.exp.svg @@ -4,7 +4,7 @@ } @font-face { font-family: d2-2495420426-font-bold; - src: url("data:application/font-woff;base64,d09GRgABAAAAAB3oAA4AAAAAMawAAQKPAAAAAAAAAAAAAAAAAAAAAAAAAABPUy8yAAABRAAAAFwAAABgY8E/zmNtYXAAAAGgAAAAagAAAIoCDgLQY3Z0IAAAAgwAAAAyAAAASgVEEfRmcGdtAAACQAAABxAAAA4MYi79fGdhc3AAAAlQAAAACAAAAAgAAAAQZ2x5ZgAACVgAABERAAAbtIPlYgtoZWFkAAAabAAAADYAAAA2HceN7GhoZWEAABqkAAAAJAAAACQIDQG0aG10eAAAGsgAAABcAAAAXDOZBINsb2NhAAAbJAAAADAAAAAwUXBYnG1heHAAABtUAAAAIAAAACACPRPRbmFtZQAAG3QAAAG0AAAD5F+agdBwb3N0AAAdKAAAABwAAAAg/34AFHByZXAAAB1EAAAApAAAALJqvdaoeJxiYGEKZ9rDwMrAwNTFFMHAwOANoRnjGEQY7RiQwAIGhvoABgZvGN/d39+dYQED728m5pZ/ixgYWNYwZjEwME4GyTFxMK1gYGBQYGAGAAAA//8BAAD//1KODSd4nFTMSQ4BURgA4e95bW484/VERBBrHQ5jOIT7/UJsVFKbWhSSLKFWOaAoMtY2do7OGteIX9naO2lcIuIVz3jEPW4fv49/5pKWrNLW0dXTNzBUGxmbKKZmFpZWvAEAAP//AQAA//8enxbSAAB4nGLADbIgkGkDAxfTN8Zn/3//ewZhMwmB2AwSEMh0ndEYhAEAAAD//wEAAP//nS0QQgAAeJysVml328YVnQFBaoksydZiN0jTh4yhusSAVlrHYWzGUTCiGEdNS8tyCzhNC4iUuy9JN3ffN+bP3KHaU/dbflrPG5Cs7Fju6TnlB7478+6bt2IACE0Q97JuTrT/SCzf2Ufj7v0M1wJcyYsHNLqXwYvKf82LeTEYqKMgDCFyCKN2x0IKU6QJpAYVDxJ4WoUqTFDTNDyprW+I1GDNUFGk1ls3qY1qBp45fEhYUvCMKYfw+w/HnueZIkV4/ELIu+PlDZm+QPCMSsdrcs0UqYLoZ8f5eFN6zqGvUYuxYTL2h01jJoSAhoSP+vC37o+vyHOmO+ii0c1C1KL84N0sVGEwygj9fhZiJw8IbUbtPCdbscshrvSzcLIibLN+m5kf9TN6QKNRSVjsZ0VAINYtMrrO6HoRFHmeB/AiLJkBxEEGsc/kEEsm2MeLjF7cLx+tigEzHtXFUZ4PyxwyzvNJBjkNsWlUmieoa+oS/KgcEuZMP8OcSjGv0iAMc8giQcOVG7WYhnbuKCVWcrpBFT7/wyu6A9SbIWHe0IhGkLHdrkfwt+5kRT8oD/JM5WFO2LmbQcYB12USSoI5jQUTj4VXtXleY0GliiBUWsI7egA5gCww10ywoImjXTaDR744Ij4BO0XOlGLXRbuoxwvLwnTTZjgbnOf044O0VJ0iYwVh4EcFdUeq5Ka6YouAGwIKsDMrGGqRKncrF+fOMMflfsbGO08zWtYuoZNzS6LW7WdhoMK8GSZY0dbzuhiWuwlWNWRBhBXzNh9AWFFpjlVeHWSEVdev85qw6opCj3wxGKkS501Bo4JwXqUqwQW9f5hZf7ibX8a5Y/UwwZrev5Pt3602gzC/jDW3v66tuGDuZfbCBQNZpjgf8yMHL0rtCv+telEKuakItaifWS4f/CgdjYjdrjZDBVlOcVDp2cSL3E6OFdPDqukV8B5v1hkttEKsqV1IA3FrLKV03drQwgqve5jhgkqpi2WV4pyCV6RU/PPSJSnOizWRpilXYF2lkKVdn4/xYRy8lCfY1FZsxAkuaitZXtLWY/kJbWssn9fWZxloW2f5grYNlp/Udo7li9rOs/yUtgssY62m9Uej2D/MFLUg3+OnJYE+pdycKd+vlMkp5dZM+UGlJC2wEp+ZJ2T5jypVzvN0fqG2guIEL2krWSptPZaXta2xjLT1WW5pW2f5aW0bLK9oO8fyM9rOs2xqu8CypanjBvaqpgKXCjIKsjCupbJAi2d2W+NqjKvNBC9roh6d0U1VthVf7M9kBJz9Z6cttsuNLk8cXm7autzoZtu5y/Jzp8pzFueapldc5K9oMeF0P+4TMn5qLLwvNv8u+Ld7S7XtNbnBuV7X1KHeGfFDmLKd4FXduthJ0P5vVEgzaCd4TVtPbEbUoh5fCfCi26NRT/VUSdlRwLeuSsdtKTfWmwluaIhNXFQp/Ah+5Gh2SaR4zsTHo5Yi6ozaCW4+TqNWdR4aKp2yCQXfKTt3shOf6hSc+Fv15/OUb9pFQyPlLNRegYZ58nEt+Lar3kq+KYYKdVMO+xl8Uwaom4JvuidtSkUEf0vtle1AYdHs8Rtr0TgvBT3Niaru1IYpuBn1qET9Y6fC3+IgIg6iFhXDyU36H195gs60FkSE+takFqrTTvD6TIVFp99TPXbKXbw1KyEnU1Ua4jBrUUeF7n072SSOa9IKNCLUo9unv12qJj5t2ifdUjzyb5yKxEzbVfAHzpMpT1u8oxW1uIp7uGiyfnCQZ9TJW3ZbrscJ3nxMexD0H9OmT7V9loXRuBE/y+Guxs14RNThGRu1z6aiYVrYjhN0Xco8n1tV5UssqbRKnQdUUYdaqj05f0/bRT9Kpyb/40j3/l9TzDnxPdZR7SA8NS9hPomzp624EU+r8pa24mYcqkldJtnMSnBbQ2xUj/1Y8BO+1sL1ZoK3z9jf11bI9TW82kzweY3Xmgne4Sp2FbVob6TKabW+oHmg8U6c4It6LMRenKCvx0IyuKPH0u0c6LF0O3eZ04sTHDKHwT3mMPgScxh8WZ8IIUycINMn/OkUJ8j1iaz27usTWe29yzzJ6CvMc+g95jn0VeY59DX22Y0TFOyTQck+GRyxTwYD5rwVJxgyh8Excxg8YA6Dr7u4duME33BxMfqmi4vRt1xcjL7t4mL0HRcXo++6uBh9z8XF6Pvais6sgT9wK+zECd6v4Jtxgg+46G6Vxgl+qK2ccH5UQeb82HHkhPMTbcXrs1N/6lbO4mEF2eJnFWT6z7WVE8IvKsiEX1aQCb/SVtyanfdrt3L031SQ6b+tINN/p62cEH5fQSb8oYJM+KO24o3ZeX9yK0f/cwWZ/pcKMv2v2soJ4W8VZMKogkz4UI+fc1+2aARj36t1MxUGYZ6nMeaPUbvcfzh9WSf/BgAA//8BAAD//2NMAUcAAQAB//8AD3icjHlriBzZefZ7bnWqqruruuvaXdVdfanuqr73TPd092guPS3N6PJpZ6RZe73SaG3Ls5Z3V76j9Rdng1nLBhsMJiYQMCQQCGsnBPLDxjeCk/yKIcEmv0z+JYYkLPkRnBicxXHYUaiq7tFo1loCA1LVeY7Qec/zPs/z1gCFJgD6J/xbwCEFKrjw/vkRw5iA6xTytmUaupZLMSogjDDZB0oYoewhRwwThl8HAEKBvAwYIXwLMEZ3BYQwuplOA6TVtKpkUrIkAgeui4LdGYW5adXO8UY1V9Vz1Vxjak/DachDbvMVUUTflKSTe+j3Tz7uo5snv7rzgn7njv7CHf3OHQl/WJbe/kMxi9/39k9w9u3/3H3jjdo3vul/4xv+G38CABiGj97CAW5DAOvwo3lKQQzVKKYM7z/zLfnw9rwOGMMxETCAeQCMoWNAyDngiNLla7jhPvOt9OHteQkwdt4NpB3enlfPgYAQbYEUUAKclwEBo4jdB4zJ8TsRR0dHc7sZIlgdhOvN9XJJy6YkCFAgcqtj14IgHK/N8GhoWfZkMhpapiGYhmWahuBHi6GCw+EMj9eCwK8p2DQs6+f9w4nYvP7SdqFRVsVivmQyOVdybU5obTzf9neGRaXqVXeGnlqT21d7o/UHx5uajltuozj96Hr3g13TalQHOq2tVz/SubxfLYzq/asH5cKwCgCAYAIqzuEqNOF+UocGYMIIZg+BUcLo60DIsiLLk2pRLfzzOAQEI3L/LOporiOoVbyiqedUiUMTNTm3Oo1aEIzXogp4eHH25XlHw8l0NDQNhaDstePV3c/u2xcmfsXOB0G+OgnM1tVu62rd6LXm12bq1VcvPfP6gWQHnpUvFJqzy95oalZyPTcoKAJg8B79Ah8QHbqwAz9PTqcUEOAMEmAbMYHsu8sXaPHi6JlvZZMiYHLMKSbEPABBgGOEAJwDETG2fE+WzKmdASyJYcZQehzRw6QRcnh4ex4CAgGQ8BAABAbC/afB5/XzSBExjiijHzndQmK6mf0ewPqkt9PfgS50Os1cU+JOx+7jBdXs6YxME7aZQky3BdsC3xcEPyFcH8cXYFrWd4e71fW7r120OxZFlEuC6BUKqqLKqYJTTFOM6donrgrhtQtVMZ1hK8/vhmKgZnaeH1x87e56BmW0yeYka1cr+cKrP/vU6HisN0pdQ71w6aX23s26VG+64aXn+s1SNenxX6BfYg2asA4//t4YMQHtJyWtiIhF/ML3QRAW9KOIEDjmaNm0/cPbcy8qE0NxeRL8edQw1orowuiDJ8A0+scJgReX2Hnr6TAAcrQEE3hPVPhCuxX1eWu9vV6rlEtaThahiUKJWx0W8ztpdNNQsF8LwiAMAt/Do2HS9womw8lkvBYs6462r712Pbz+ysXuwSC49N4eX1FkAcuY9zZdPbSsittqzb3N0C85G6OKs6b2Pnxz68EHpv7uSv+5Sw1OsYBYKdRY3rXyIkKW3a+VasXuKE9pChD0Tt7EGtbgBvx4nr4yNonAswgLeFHwVeBUoDziG0YY0EOGKI155kT8x8eAsXkACInHEhJFS4xqmz+8PR+c3wiEIcoJvf+UbfMxUMYZ5Q+BC4wLrz/eGCvJU/YdHc1zAHADDlpBtREOaoHMvY4e0TyqqDUazvB0hsfjNd+PK37mBiK+R29NM4FNJklDWLZpKNT/VWlcrepWqZovdb0cirqMejs3RuFee/Khz183uuWqnS1njenRmliw+90gqwbZlKEUbBkztTI+vHDyplztFGzLdYOtPY8P1tKy6F9fbe61L3/l03tK2bGLcvbZj01rpdpolHMGjiK7Te2Z1iufeuW5YaLDm8DwNfxfMIW/SEwrJSOMyjoGivfd0ydCcaRREcAGhPRIlONqGQeE4USakxt1zy3HbsXQElI9vD0vAAZKML2fQM8C5sUoCVACD5/ALJYj/ucQrPQbvltQ0jBFU4FbnWktkvXxWjAeL8Q9F6lPXGnbNATBr/Vx2Kd+TeBC9POg6KoqLyh2KcsF5K6OL3aCaYV5VLedUppiRARZTeVqqbW7AzHPQmfrcxv3/vqek81U+n315LsCcvd22s25/1Mv6+dbWxs5HgwH5aK69/VrGSvOEc+CCr/Eb0EKBnD7B15WJZgsVcamCCBWl/j0xgFDGGv4hnt+BR8vVo7meiaNwMmnB5kBZ5BCqejgenzwxNBJLXH56YJ9piHw2NviHy4I3/S6a265M9rTDcY4x0TKW3mTYsw5QZjQIn4laDS8IKh7b/9p0/gC62xOs8ZK3a5pPs6IftU20vVSpqCouUIr4c6jt/AMP4LL8EZiX2mGMJkHlACOyHP6SDFeOpwDmADB8PDx6Sl7IhB5gEl082cQQGlCkVgvK0AQRgQ/BEwRjhJAQrhTSMKS9UnR0XIpCS6jy0KSg8ZjPfH/uDv5oneT+nGFcNO2LNsj9mk8CPsk9DkXhE9aJZ8WykWbSSiNK91ORuv2DdttGvJovmUyrnJ16/JmJuPZrp4fdHR5uruZpdSgJbli6OgT/2xOmsGasfHa1ZSaEyRbq9quKTKrYIuEcZlLzX4oyqar5SvFIMPr3WZK+rbhxHV+/6P/gX8hXXChMi/pCBDaB4TgGCfHRZBTwUUuWYS9uBeW5suX3vt7ts0RpkKK84aeyxNdkx1W7ufTtpy/94WvfnG1N5nMXv2HBysfWin7S22QCcUa3EPt+PJ+sBHmicDQvpv8jaOlJlSjsMCE+FajnMsYPiYoan8qnqpDNpZtgVEm0MfAWOyNxZ5EMaKrFNFZUemBwClfboPTXcD5b97kHN6et043EWA8UngMXMD8foyNK7jcMO+cYilwCq+/Y8sZ9FEctxHcet/+9d2L03GvUy3nVLiH7kmPxWi8Fjlv3J0etiO+WfZCkqwoG+FYpxJxCiJ0EMdvXyFcOKVeECmWgnn88stWlbEUZYZjOgonWKQ4U22NypWqIVNMU8Zo3qz0SopkGXYRE5pOS56XVTK87DpuhmI5JWNBkAwmWDrBet4gsimXrOqscqn1bDPtKkar3OupGU9BMrOnq5Vyz5LNVLa4u9rYmDk/Vf1CRfs+MSwm1jxn0B95Tq/U1qX2sJeSnLTUa3Ohv7ki6pWEOwb+DLZhBj9MIlMqhSiumUtfWTwtfEVb+Irzm30l2m9GhgCJIcDxmcUoaf0m14DjU1Opni5Hjn90HoTg2YWzjEdho+SqGZih2cJZnrCW5PZGsbl4xE5UIr6pOGfVYnfhCv5CIS8wQzJy5aKEUZSu9fZoFg6vrHgazztugWJBFDAxJano5sNSqtC0pWzRKHWM/vvbvfe0QlMNx1ZqXqTF+bp/4YWP3qsXrE7RklqrHdmYGma/1teahwN9tQ7J3AqAP42LYEAAB8uCno5QkY3AMV0qqLkcmp54fzTXLROBVzQDK0jLYCAjqkF1MTVNl4NTNC3GGXJ5YNOw0KVrn9vv7Na0oXPxt++ur9362P70xZ3NO4O8l88Wu8/NHuyvHd2oabnizsvXt+9dCz8V3twY7VWVfLZ0uXtlFp9h8+RNfIBnsAGH8MN5WhWxwFdJzJjkRGEyK3O+SIgSEgR6HEXGM/1swTIjdoAAFwiPxp0l7Klb5q0zaHYMjC3BcB57dDR3tzYR7F3aPNw67HXazapXsA0NNtCGnNhyGGtAnBKnCxGIRswZHp0J53E2NHhCGT2ZwJOMkkznlvXZrCEVuK6k8o1MTpNFLtuy6ORxd/bxvZXnPrGth4aEGEUIM0Qyha+1rq1XnlnTa+rUw07j5E1Nu3z8l/c+lkpns7pVeClr6I6eJoSzzu29rc9+eFMu7KylKBGUkqL6BfSV1u7NYLJCeH4zzDaMmzmdR/finXwdVzGBIezC/blywRUIob0OI4CWN1OM2+jLy+51DgS0IJ+JbrhzZ7G8aLyzi0dzc22EYHtztLu2a+ppGYZoGE3rKOLdWH9nquaWZSd+bQiCaRqjSfQWDWdkejrQo+806qmOWLr0/4LebrD50hevuBcHQkpVcS2FRUnEjNF6/sLJvxY3Ni+M86xh9j9wY2CcfD3YqtRQxxlWVm90rn7+eF1r1zPZNB9Upy+PpcF0kBJb7bTMiRcGK+jvm7Mr27rbaF+51St1lpkI/RUm0IevJiRMGWlMEI0aLtI9I40pTp4WuqfTuBoYJY26jELRXoMiAogcRWuJnJlPy8iny4mQ+dWKV7CzCvRRX3j8EehsSLafGFOiTlYIV/ArmiYQWRZd1bIkUSqNN+tay2tpaSvtb/cVSqP/TKoo56uZ6+uvTp2VgqsqhZqL9bqdLZlOXvZXTKk9HmrV7TDJEfVHv0B/hwlM4Q+W33ooi2gb6TFD+PWlocffMR5/90q03T8PXs5rZ6Hz5lNRAPhoicWR0s91BO1mUC+X1IzEoyGCxxVazHQeGcXy1qcJ5yLJ8/1E7EzDo5Fn/3fx2l7PKWmGajYq9rQZbF3aCoLtq1V9uFLpZ7y2m+7U4pfbd1UpvxI6oea4WspzbNcwK+N2uN7ISYbv9HMa04ycZeQb6+3t69W4Xv6jf0d/i/8YpvBHSWqSXURJHaHYOhcPjJ5magsowxgBRfeBkNzB4/pF01YJI8SAIYiyDUOUvfwEaF57vE4okKMzqLhmZFmzVlir5K20LImPaxa16NpkGkWW6M/pjC44JZhmkqsFP5K05SgiCD8rexJDBV/rp/XbuRRiBc80RUx+x8oLWeUhEihmFDHBMoKpHew8vI5oL1emBvUHfc+uqNi2SKVlUksnjLhVV59+cttolxZ5Fd9C/wE78Pxc2ug1hYiry5kLKEXHBCFkxCR78TQcmAQhoIDo/bPvz8SBrAI7aCeJA/1o0p9Mkuky0qJYq6Pxnsb+GEUC01zOD1EsiB3yJ50LlYwQzVxqQXNLKcozVLNyg/FkUOOipgwkRoxc0fbqsqBytWFUnpcbW1f9VdJaSSudTqli63U92A+Vbq175b03t9MppVvv3mptZp1Czq60itqFojPKNy9FdYBHD8j40Z9DBnrfFu7tzWvyYmYAQLcirbiLIzm+iUBkkEHpaHD4tgB7djJOVuOT+WtGRTfxP+bKWet302rKULPUTvp5Fbz4+9kQ/v/3OwX8eLC1ll+wkxrHweJxHrcAEfQlIJh86YnVuXt24bRd6bJd1ahdaxU1EzkDi7/j9nEcrhfTrxUPbJZpxEk76t7p6WVE7opyjUlYTOk+Uoq2qzIsSVI6m8GiyuVchnwwVSrkU4r6orrmteZXioOPr/GsaDW8dk5tNtKyIZNyWGHZgl3k/2aU7Er1kvejUi+pxfDRW5hgDW7C3yxy7qCIETlAyQgcP9HkaaH3DiCCCcIPI92PFU87I/v984jYT88iIk2sACWIJGpHYrU7j5t774AABoLvs8e/MogZ3gxi072JbgrJJ8Swj8M+jg2BR94bzZLJNBPXfDSMym3b0+nyVwnJeGIa0eRsxV970Z9ZTgqbFmOaxllOxaVMPTRbXrfnYap2TSXfzPtZXqlyRfqaaMmaxUWp0amLMmXMrTgkLWaysqmzWkPknqMbuJEJir3CsNeuKyLl3gUn17RbpazUacsK+5qIHUPVU1JzJeSyxCTGe+M204uamxGiOzr5NS7iDGzAZ77noXenq/WudLX+b3TtdYJ63oriIDv9SjOdkfF46Snxb2Ai4bAT7RgNEy1JouBPNK2YYqoqT693LY4lU2/YTOCYeW5lNazXO27PzKq1THO3LOYbJ7/2c5ULpUyr7WFCh/svfLCV6XS9ScUKbJn3V9LV1eHh0eFwWJuVSuul933njr3eBPhfAAAA//8BAAD//0hpfGQAAAAAAQAAAAECj3OmGgxfDzz1AA8D6AAAAADcdfC+AAAAAN2nVnn/iP6XBP4ErAABAAYAAgAAAAAAAAABAAADhP6iAAAFKf+I/dEE/gABAAAAAAAAAAAAAAAAAAAAFwIGACgCYQAyAkMANgKJAB4CKgAyAkgALQJrADsBBgBRAlwAOwEFAFwDQAA7AqIAOwKmADICawA7AlwAHgGVADsB9wAkAeUAIwKNADsDQAAAAhQAMQI+ADICQwAyAAAAZAEYAYYCVgMMA9wEiAT6Ba4F6gcIB8AIIgjuCYQKDgqmC0ILxgv2DHwNTg3aAAEAAAAXBKsACQC6AAUAAgAuAF0AjQAAAVkODAADAAF4nJyS32oTQRTGf7utpUXrA3g1hF5YsZtUsZT2qhVThEDUini7m8z+qWtm2ZltSK59Di98EPHRZI+TsikGRELYHztnzved7yywzw+2CLb3gJ/hN88BT8IbzyG7YeJ5i9PwmedtDsIdzw8YBr8879ALvnve5SBYet7r8EN6wWfPjzq8H/Q48fyYEyDH4aiwnNGnj2VCTUGFwxJhKSiJMNRk9BkzZMRHcgosiiGGGQ7FNYYUx5yYGo3yFSUFEzQzLJopioYZUzQ1Ckcutde8ZYRiTCW13c6jtQ7PUXyS2603I7XHRPJXHWfruis3MbfEMlNMQikncwrx0Z62uhe8F3acof4zobn8IhwLmaj14EQnYoLhKx8wJDJHO+MbcT9C04hCzhc0QxqWLFlwSUPiHVuOuMRQMv1rEgOOGXAu6TpSYhocRpL5k+hTbqXylIiXHHZ01D0ldafU7XzFmDFXnP+Dw9Vzs8ZrDBULSTWTvBUvGDDgld+olr1s9viOGsMNmoncvpCJc9mJlXnvbzHzO2/7rDbSvjUYMumb+u/P0ie90z4iWdM+/A0AAP//AQAA///3gZyweJxiYGYAg//VDCIMWAAAAAD//wEAAP//JRYBknicNIkxqsJAFEXvvD8/Pg0oVoIWIgpKVjGE11kpFkmdLMAl2AhpdC15hEBiNuCulEnwVueci2OD9zlRY55paVoGI7sqRnGFJSHyVK/tjGky8JYWQc/juGNYgBBGijDu4OB6a/EHiO5McUpKVyTec9GD94YxBEi60r1PL77BWFdkl9/hV29oHtA0asznXtqHEqT6zwOIfAEAAP//AQAA//+b8iuH"); + src: url("data:application/font-woff;base64,d09GRgABAAAAAB3oAA4AAAAAMawAAQKPAAAAAAAAAAAAAAAAAAAAAAAAAABPUy8yAAABRAAAAFwAAABgY8E/zmNtYXAAAAGgAAAAagAAAIoCDgLgY3Z0IAAAAgwAAAAyAAAASgVEEfRmcGdtAAACQAAABxAAAA4MYi79fGdhc3AAAAlQAAAACAAAAAgAAAAQZ2x5ZgAACVgAABERAAAbtIPlYgtoZWFkAAAabAAAADYAAAA2HceN7GhoZWEAABqkAAAAJAAAACQIDQG0aG10eAAAGsgAAABcAAAAXDOZBINsb2NhAAAbJAAAADAAAAAwUXBYnG1heHAAABtUAAAAIAAAACACPRPRbmFtZQAAG3QAAAG0AAAD5F+agdBwb3N0AAAdKAAAABwAAAAg/34AFHByZXAAAB1EAAAApAAAALJqvdaoeJxiYGEKZ9rDwMrAwNTFFMHAwOANoRnjGEQY7RiQwAIGhvoABgZvGN/d39+dYQED728m5pZ/ixgYWNYwZjEwME4GyTFxMK1gYGBQYGAGAAAA//8BAAD//1KODSd4nFTMSQ4BURgA4e95bW484/VERESsddphDIdwv1+IjUpqU4tCkiXUKi2KImNr5+DkonGN+JW9o7NGGxGveMYj7nH7+H38s5R0ZJWunr6BoZGx2sTUTDG3sLK24Q0AAP//AQAA//8mTxbiAAB4nGLADbIgkGkDAxfTN8Zn/3//ewZhMwmB2AwSEMh0ndEYhAEAAAD//wEAAP//nS0QQgAAeJysVml328YVnQFBaoksydZiN0jTh4yhusSAVlrHYWzGUTCiGEdNS8tyCzhNC4iUuy9JN3ffN+bP3KHaU/dbflrPG5Cs7Fju6TnlB7478+6bt2IACE0Q97JuTrT/SCzf2Ufj7v0M1wJcyYsHNLqXwYvKf82LeTEYqKMgDCFyCKN2x0IKU6QJpAYVDxJ4WoUqTFDTNDyprW+I1GDNUFGk1ls3qY1qBp45fEhYUvCMKYfw+w/HnueZIkV4/ELIu+PlDZm+QPCMSsdrcs0UqYLoZ8f5eFN6zqGvUYuxYTL2h01jJoSAhoSP+vC37o+vyHOmO+ii0c1C1KL84N0sVGEwygj9fhZiJw8IbUbtPCdbscshrvSzcLIibLN+m5kf9TN6QKNRSVjsZ0VAINYtMrrO6HoRFHmeB/AiLJkBxEEGsc/kEEsm2MeLjF7cLx+tigEzHtXFUZ4PyxwyzvNJBjkNsWlUmieoa+oS/KgcEuZMP8OcSjGv0iAMc8giQcOVG7WYhnbuKCVWcrpBFT7/wyu6A9SbIWHe0IhGkLHdrkfwt+5kRT8oD/JM5WFO2LmbQcYB12USSoI5jQUTj4VXtXleY0GliiBUWsI7egA5gCww10ywoImjXTaDR744Ij4BO0XOlGLXRbuoxwvLwnTTZjgbnOf044O0VJ0iYwVh4EcFdUeq5Ka6YouAGwIKsDMrGGqRKncrF+fOMMflfsbGO08zWtYuoZNzS6LW7WdhoMK8GSZY0dbzuhiWuwlWNWRBhBXzNh9AWFFpjlVeHWSEVdev85qw6opCj3wxGKkS501Bo4JwXqUqwQW9f5hZf7ibX8a5Y/UwwZrev5Pt3602gzC/jDW3v66tuGDuZfbCBQNZpjgf8yMHL0rtCv+telEKuakItaifWS4f/CgdjYjdrjZDBVlOcVDp2cSL3E6OFdPDqukV8B5v1hkttEKsqV1IA3FrLKV03drQwgqve5jhgkqpi2WV4pyCV6RU/PPSJSnOizWRpilXYF2lkKVdn4/xYRy8lCfY1FZsxAkuaitZXtLWY/kJbWssn9fWZxloW2f5grYNlp/Udo7li9rOs/yUtgssY62m9Uej2D/MFLUg3+OnJYE+pdycKd+vlMkp5dZM+UGlJC2wEp+ZJ2T5jypVzvN0fqG2guIEL2krWSptPZaXta2xjLT1WW5pW2f5aW0bLK9oO8fyM9rOs2xqu8CypanjBvaqpgKXCjIKsjCupbJAi2d2W+NqjKvNBC9roh6d0U1VthVf7M9kBJz9Z6cttsuNLk8cXm7autzoZtu5y/Jzp8pzFueapldc5K9oMeF0P+4TMn5qLLwvNv8u+Ld7S7XtNbnBuV7X1KHeGfFDmLKd4FXduthJ0P5vVEgzaCd4TVtPbEbUoh5fCfCi26NRT/VUSdlRwLeuSsdtKTfWmwluaIhNXFQp/Ah+5Gh2SaR4zsTHo5Yi6ozaCW4+TqNWdR4aKp2yCQXfKTt3shOf6hSc+Fv15/OUb9pFQyPlLNRegYZ58nEt+Lar3kq+KYYKdVMO+xl8Uwaom4JvuidtSkUEf0vtle1AYdHs8Rtr0TgvBT3Niaru1IYpuBn1qET9Y6fC3+IgIg6iFhXDyU36H195gs60FkSE+takFqrTTvD6TIVFp99TPXbKXbw1KyEnU1Ua4jBrUUeF7n072SSOa9IKNCLUo9unv12qJj5t2ifdUjzyb5yKxEzbVfAHzpMpT1u8oxW1uIp7uGiyfnCQZ9TJW3ZbrscJ3nxMexD0H9OmT7V9loXRuBE/y+Guxs14RNThGRu1z6aiYVrYjhN0Xco8n1tV5UssqbRKnQdUUYdaqj05f0/bRT9Kpyb/40j3/l9TzDnxPdZR7SA8NS9hPomzp624EU+r8pa24mYcqkldJtnMSnBbQ2xUj/1Y8BO+1sL1ZoK3z9jf11bI9TW82kzweY3Xmgne4Sp2FbVob6TKabW+oHmg8U6c4It6LMRenKCvx0IyuKPH0u0c6LF0O3eZ04sTHDKHwT3mMPgScxh8WZ8IIUycINMn/OkUJ8j1iaz27usTWe29yzzJ6CvMc+g95jn0VeY59DX22Y0TFOyTQck+GRyxTwYD5rwVJxgyh8Excxg8YA6Dr7u4duME33BxMfqmi4vRt1xcjL7t4mL0HRcXo++6uBh9z8XF6Pvais6sgT9wK+zECd6v4Jtxgg+46G6Vxgl+qK2ccH5UQeb82HHkhPMTbcXrs1N/6lbO4mEF2eJnFWT6z7WVE8IvKsiEX1aQCb/SVtyanfdrt3L031SQ6b+tINN/p62cEH5fQSb8oYJM+KO24o3ZeX9yK0f/cwWZ/pcKMv2v2soJ4W8VZMKogkz4UI+fc1+2aARj36t1MxUGYZ6nMeaPUbvcfzh9WSf/BgAA//8BAAD//2NMAUcAAQAB//8AD3icjHlriBzZefZ7bnWqqruruuvaXdVdfanuqr73TPd092guPS3N6PJpZ6RZe73SaG3Ls5Z3V76j9Rdng1nLBhsMJiYQMCQQCGsnBPLDxjeCk/yKIcEmv0z+JYYkLPkRnBicxXHYUaiq7tFo1loCA1LVeY7Qec/zPs/z1gCFJgD6J/xbwCEFKrjw/vkRw5iA6xTytmUaupZLMSogjDDZB0oYoewhRwwThl8HAEKBvAwYIXwLMEZ3BYQwuplOA6TVtKpkUrIkAgeui4LdGYW5adXO8UY1V9Vz1Vxjak/DachDbvMVUUTflKSTe+j3Tz7uo5snv7rzgn7njv7CHf3OHQl/WJbe/kMxi9/39k9w9u3/3H3jjdo3vul/4xv+G38CABiGj97CAW5DAOvwo3lKQQzVKKYM7z/zLfnw9rwOGMMxETCAeQCMoWNAyDngiNLla7jhPvOt9OHteQkwdt4NpB3enlfPgYAQbYEUUAKclwEBo4jdB4zJ8TsRR0dHc7sZIlgdhOvN9XJJy6YkCFAgcqtj14IgHK/N8GhoWfZkMhpapiGYhmWahuBHi6GCw+EMj9eCwK8p2DQs6+f9w4nYvP7SdqFRVsVivmQyOVdybU5obTzf9neGRaXqVXeGnlqT21d7o/UHx5uajltuozj96Hr3g13TalQHOq2tVz/SubxfLYzq/asH5cKwCgCAYAIqzuEqNOF+UocGYMIIZg+BUcLo60DIsiLLk2pRLfzzOAQEI3L/LOporiOoVbyiqedUiUMTNTm3Oo1aEIzXogp4eHH25XlHw8l0NDQNhaDstePV3c/u2xcmfsXOB0G+OgnM1tVu62rd6LXm12bq1VcvPfP6gWQHnpUvFJqzy95oalZyPTcoKAJg8B79Ah8QHbqwAz9PTqcUEOAMEmAbMYHsu8sXaPHi6JlvZZMiYHLMKSbEPABBgGOEAJwDETG2fE+WzKmdASyJYcZQehzRw6QRcnh4ex4CAgGQ8BAABAbC/afB5/XzSBExjiijHzndQmK6mf0ewPqkt9PfgS50Os1cU+JOx+7jBdXs6YxME7aZQky3BdsC3xcEPyFcH8cXYFrWd4e71fW7r120OxZFlEuC6BUKqqLKqYJTTFOM6donrgrhtQtVMZ1hK8/vhmKgZnaeH1x87e56BmW0yeYka1cr+cKrP/vU6HisN0pdQ71w6aX23s26VG+64aXn+s1SNenxX6BfYg2asA4//t4YMQHtJyWtiIhF/ML3QRAW9KOIEDjmaNm0/cPbcy8qE0NxeRL8edQw1orowuiDJ8A0+scJgReX2Hnr6TAAcrQEE3hPVPhCuxX1eWu9vV6rlEtaThahiUKJWx0W8ztpdNNQsF8LwiAMAt/Do2HS9womw8lkvBYs6462r712Pbz+ysXuwSC49N4eX1FkAcuY9zZdPbSsittqzb3N0C85G6OKs6b2Pnxz68EHpv7uSv+5Sw1OsYBYKdRY3rXyIkKW3a+VasXuKE9pChD0Tt7EGtbgBvx4nr4yNonAswgLeFHwVeBUoDziG0YY0EOGKI155kT8x8eAsXkACInHEhJFS4xqmz+8PR+c3wiEIcoJvf+UbfMxUMYZ5Q+BC4wLrz/eGCvJU/YdHc1zAHADDlpBtREOaoHMvY4e0TyqqDUazvB0hsfjNd+PK37mBiK+R29NM4FNJklDWLZpKNT/VWlcrepWqZovdb0cirqMejs3RuFee/Khz183uuWqnS1njenRmliw+90gqwbZlKEUbBkztTI+vHDyplztFGzLdYOtPY8P1tKy6F9fbe61L3/l03tK2bGLcvbZj01rpdpolHMGjiK7Te2Z1iufeuW5YaLDm8DwNfxfMIW/SEwrJSOMyjoGivfd0ydCcaRREcAGhPRIlONqGQeE4USakxt1zy3HbsXQElI9vD0vAAZKML2fQM8C5sUoCVACD5/ALJYj/ucQrPQbvltQ0jBFU4FbnWktkvXxWjAeL8Q9F6lPXGnbNATBr/Vx2Kd+TeBC9POg6KoqLyh2KcsF5K6OL3aCaYV5VLedUppiRARZTeVqqbW7AzHPQmfrcxv3/vqek81U+n315LsCcvd22s25/1Mv6+dbWxs5HgwH5aK69/VrGSvOEc+CCr/Eb0EKBnD7B15WJZgsVcamCCBWl/j0xgFDGGv4hnt+BR8vVo7meiaNwMmnB5kBZ5BCqejgenzwxNBJLXH56YJ9piHw2NviHy4I3/S6a265M9rTDcY4x0TKW3mTYsw5QZjQIn4laDS8IKh7b/9p0/gC62xOs8ZK3a5pPs6IftU20vVSpqCouUIr4c6jt/AMP4LL8EZiX2mGMJkHlACOyHP6SDFeOpwDmADB8PDx6Sl7IhB5gEl082cQQGlCkVgvK0AQRgQ/BEwRjhJAQrhTSMKS9UnR0XIpCS6jy0KSg8ZjPfH/uDv5oneT+nGFcNO2LNsj9mk8CPsk9DkXhE9aJZ8WykWbSSiNK91ORuv2DdttGvJovmUyrnJ16/JmJuPZrp4fdHR5uruZpdSgJbli6OgT/2xOmsGasfHa1ZSaEyRbq9quKTKrYIuEcZlLzX4oyqar5SvFIMPr3WZK+rbhxHV+/6P/gX8hXXChMi/pCBDaB4TgGCfHRZBTwUUuWYS9uBeW5suX3vt7ts0RpkKK84aeyxNdkx1W7ufTtpy/94WvfnG1N5nMXv2HBysfWin7S22QCcUa3EPt+PJ+sBHmicDQvpv8jaOlJlSjsMCE+FajnMsYPiYoan8qnqpDNpZtgVEm0MfAWOyNxZ5EMaKrFNFZUemBwClfboPTXcD5b97kHN6et043EWA8UngMXMD8foyNK7jcMO+cYilwCq+/Y8sZ9FEctxHcet/+9d2L03GvUy3nVLiH7kmPxWi8Fjlv3J0etiO+WfZCkqwoG+FYpxJxCiJ0EMdvXyFcOKVeECmWgnn88stWlbEUZYZjOgonWKQ4U22NypWqIVNMU8Zo3qz0SopkGXYRE5pOS56XVTK87DpuhmI5JWNBkAwmWDrBet4gsimXrOqscqn1bDPtKkar3OupGU9BMrOnq5Vyz5LNVLa4u9rYmDk/Vf1CRfs+MSwm1jxn0B95Tq/U1qX2sJeSnLTUa3Ohv7ki6pWEOwb+DLZhBj9MIlMqhSiumUtfWTwtfEVb+Irzm30l2m9GhgCJIcDxmcUoaf0m14DjU1Opni5Hjn90HoTg2YWzjEdho+SqGZih2cJZnrCW5PZGsbl4xE5UIr6pOGfVYnfhCv5CIS8wQzJy5aKEUZSu9fZoFg6vrHgazztugWJBFDAxJano5sNSqtC0pWzRKHWM/vvbvfe0QlMNx1ZqXqTF+bp/4YWP3qsXrE7RklqrHdmYGma/1teahwN9tQ7J3AqAP42LYEAAB8uCno5QkY3AMV0qqLkcmp54fzTXLROBVzQDK0jLYCAjqkF1MTVNl4NTNC3GGXJ5YNOw0KVrn9vv7Na0oXPxt++ur9362P70xZ3NO4O8l88Wu8/NHuyvHd2oabnizsvXt+9dCz8V3twY7VWVfLZ0uXtlFp9h8+RNfIBnsAGH8MN5WhWxwFdJzJjkRGEyK3O+SIgSEgR6HEXGM/1swTIjdoAAFwiPxp0l7Klb5q0zaHYMjC3BcB57dDR3tzYR7F3aPNw67HXazapXsA0NNtCGnNhyGGtAnBKnCxGIRswZHp0J53E2NHhCGT2ZwJOMkkznlvXZrCEVuK6k8o1MTpNFLtuy6ORxd/bxvZXnPrGth4aEGEUIM0Qyha+1rq1XnlnTa+rUw07j5E1Nu3z8l/c+lkpns7pVeClr6I6eJoSzzu29rc9+eFMu7KylKBGUkqL6BfSV1u7NYLJCeH4zzDaMmzmdR/finXwdVzGBIezC/blywRUIob0OI4CWN1OM2+jLy+51DgS0IJ+JbrhzZ7G8aLyzi0dzc22EYHtztLu2a+ppGYZoGE3rKOLdWH9nquaWZSd+bQiCaRqjSfQWDWdkejrQo+806qmOWLr0/4LebrD50hevuBcHQkpVcS2FRUnEjNF6/sLJvxY3Ni+M86xh9j9wY2CcfD3YqtRQxxlWVm90rn7+eF1r1zPZNB9Upy+PpcF0kBJb7bTMiRcGK+jvm7Mr27rbaF+51St1lpkI/RUm0IevJiRMGWlMEI0aLtI9I40pTp4WuqfTuBoYJY26jELRXoMiAogcRWuJnJlPy8iny4mQ+dWKV7CzCvRRX3j8EehsSLafGFOiTlYIV/ArmiYQWRZd1bIkUSqNN+tay2tpaSvtb/cVSqP/TKoo56uZ6+uvTp2VgqsqhZqL9bqdLZlOXvZXTKk9HmrV7TDJEfVHv0B/hwlM4Q+W33ooi2gb6TFD+PWlocffMR5/90q03T8PXs5rZ6Hz5lNRAPhoicWR0s91BO1mUC+X1IzEoyGCxxVazHQeGcXy1qcJ5yLJ8/1E7EzDo5Fn/3fx2l7PKWmGajYq9rQZbF3aCoLtq1V9uFLpZ7y2m+7U4pfbd1UpvxI6oea4WspzbNcwK+N2uN7ISYbv9HMa04ycZeQb6+3t69W4Xv6jf0d/i/8YpvBHSWqSXURJHaHYOhcPjJ5magsowxgBRfeBkNzB4/pF01YJI8SAIYiyDUOUvfwEaF57vE4okKMzqLhmZFmzVlir5K20LImPaxa16NpkGkWW6M/pjC44JZhmkqsFP5K05SgiCD8rexJDBV/rp/XbuRRiBc80RUx+x8oLWeUhEihmFDHBMoKpHew8vI5oL1emBvUHfc+uqNi2SKVlUksnjLhVV59+cttolxZ5Fd9C/wE78Pxc2ug1hYiry5kLKEXHBCFkxCR78TQcmAQhoIDo/bPvz8SBrAI7aCeJA/1o0p9Mkuky0qJYq6Pxnsb+GEUC01zOD1EsiB3yJ50LlYwQzVxqQXNLKcozVLNyg/FkUOOipgwkRoxc0fbqsqBytWFUnpcbW1f9VdJaSSudTqli63U92A+Vbq175b03t9MppVvv3mptZp1Czq60itqFojPKNy9FdYBHD8j40Z9DBnrfFu7tzWvyYmYAQLcirbiLIzm+iUBkkEHpaHD4tgB7djJOVuOT+WtGRTfxP+bKWet302rKULPUTvp5Fbz4+9kQ/v/3OwX8eLC1ll+wkxrHweJxHrcAEfQlIJh86YnVuXt24bRd6bJd1ahdaxU1EzkDi7/j9nEcrhfTrxUPbJZpxEk76t7p6WVE7opyjUlYTOk+Uoq2qzIsSVI6m8GiyuVchnwwVSrkU4r6orrmteZXioOPr/GsaDW8dk5tNtKyIZNyWGHZgl3k/2aU7Er1kvejUi+pxfDRW5hgDW7C3yxy7qCIETlAyQgcP9HkaaH3DiCCCcIPI92PFU87I/v984jYT88iIk2sACWIJGpHYrU7j5t774AABoLvs8e/MogZ3gxi072JbgrJJ8Swj8M+jg2BR94bzZLJNBPXfDSMym3b0+nyVwnJeGIa0eRsxV970Z9ZTgqbFmOaxllOxaVMPTRbXrfnYap2TSXfzPtZXqlyRfqaaMmaxUWp0amLMmXMrTgkLWaysqmzWkPknqMbuJEJir3CsNeuKyLl3gUn17RbpazUacsK+5qIHUPVU1JzJeSyxCTGe+M204uamxGiOzr5NS7iDGzAZ77noXenq/WudLX+b3TtdYJ63oriIDv9SjOdkfF46Snxb2Ai4bAT7RgNEy1JouBPNK2YYqoqT693LY4lU2/YTOCYeW5lNazXO27PzKq1THO3LOYbJ7/2c5ULpUyr7WFCh/svfLCV6XS9ScUKbJn3V9LV1eHh0eFwWJuVSuul933njr3eBPhfAAAA//8BAAD//0hpfGQAAAAAAQAAAAECj3OmGexfDzz1AA8D6AAAAADcdfC+AAAAAN2nVnn/iP6XBP4ErAABAAYAAgAAAAAAAAABAAADhP6iAAAFKf+I/dEE/gABAAAAAAAAAAAAAAAAAAAAFwIGACgCYQAyAkMANgKJAB4CKgAyAkgALQJrADsBBgBRAlwAOwEFAFwDQAA7AqIAOwKmADICawA7AlwAHgGVADsB9wAkAeUAIwKNADsDQAAAAhQAMQI+ADICQwAyAAAAZAEYAYYCVgMMA9wEiAT6Ba4F6gcIB8AIIgjuCYQKDgqmC0ILxgv2DHwNTg3aAAEAAAAXBKsACQC6AAUAAgAuAF0AjQAAAVkODAADAAF4nJyS32oTQRTGf7utpUXrA3g1hF5YsZtUsZT2qhVThEDUini7m8z+qWtm2ZltSK59Di98EPHRZI+TsikGRELYHztnzved7yywzw+2CLb3gJ/hN88BT8IbzyG7YeJ5i9PwmedtDsIdzw8YBr8879ALvnve5SBYet7r8EN6wWfPjzq8H/Q48fyYEyDH4aiwnNGnj2VCTUGFwxJhKSiJMNRk9BkzZMRHcgosiiGGGQ7FNYYUx5yYGo3yFSUFEzQzLJopioYZUzQ1Ckcutde8ZYRiTCW13c6jtQ7PUXyS2603I7XHRPJXHWfruis3MbfEMlNMQikncwrx0Z62uhe8F3acof4zobn8IhwLmaj14EQnYoLhKx8wJDJHO+MbcT9C04hCzhc0QxqWLFlwSUPiHVuOuMRQMv1rEgOOGXAu6TpSYhocRpL5k+hTbqXylIiXHHZ01D0ldafU7XzFmDFXnP+Dw9Vzs8ZrDBULSTWTvBUvGDDgld+olr1s9viOGsMNmoncvpCJc9mJlXnvbzHzO2/7rDbSvjUYMumb+u/P0ie90z4iWdM+/A0AAP//AQAA///3gZyweJxiYGYAg//VDCIMWAAAAAD//wEAAP//JRYBknicNIkxqsJAFEXvvD8/Pg0oVoIWIgpKVjGE11kpFkmdLMAl2AhpdC15hEBiNuCulEnwVueci2OD9zlRY55paVoGI7sqRnGFJSHyVK/tjGky8JYWQc/juGNYgBBGijDu4OB6a/EHiO5McUpKVyTec9GD94YxBEi60r1PL77BWFdkl9/hV29oHtA0asznXtqHEqT6zwOIfAEAAP//AQAA//+b8iuH"); }]]>ab + + +abdc + + +abdce + + + \ No newline at end of file From 5c7d4f37ff09680284408f3f76b515fdfdcd5c0e Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Wed, 31 May 2023 22:29:55 -0700 Subject: [PATCH 26/62] changelog --- ci/release/changelogs/next.md | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/release/changelogs/next.md b/ci/release/changelogs/next.md index b849e05cd..396a9e5f2 100644 --- a/ci/release/changelogs/next.md +++ b/ci/release/changelogs/next.md @@ -14,3 +14,4 @@ - Shadow is cut off when `--pad` is 0. Thank you @LeonardsonCC ! [#1326](https://github.com/terrastruct/d2/pull/1326) - Fixes grid layout overwriting label placements for nested objects. [#1345](https://github.com/terrastruct/d2/pull/1345) - Fixes fonts not rendering correctly on certain platforms. Thanks @mikeday for identifying the solution. [#1356](https://github.com/terrastruct/d2/pull/1356) +- Fixes folders not rendering in animations (`--animate-interval`) [#1357](https://github.com/terrastruct/d2/pull/1357) From e998a95b96b9f04d803f6cd5a202985ab70c0215 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Wed, 31 May 2023 23:04:09 -0700 Subject: [PATCH 27/62] d2ir: prevent illegal non-tail keywords --- d2compiler/compile_test.go | 7 +++++++ d2graph/d2graph.go | 3 ++- d2ir/d2ir.go | 7 +++---- .../TestCompile/keyword-container.exp.json | 12 ++++++++++++ 4 files changed, 24 insertions(+), 5 deletions(-) create mode 100644 testdata/d2compiler/TestCompile/keyword-container.exp.json diff --git a/d2compiler/compile_test.go b/d2compiler/compile_test.go index 657d09575..cbe248773 100644 --- a/d2compiler/compile_test.go +++ b/d2compiler/compile_test.go @@ -1722,6 +1722,13 @@ y -> x.style `, expErr: `d2/testdata/d2compiler/TestCompile/edge_to_style.d2:2:8: reserved keywords are prohibited in edges`, }, + { + name: "keyword-container", + + text: `a.near.b +`, + expErr: `d2/testdata/d2compiler/TestCompile/keyword-container.d2:1:3: "near" must be the last part of the key`, + }, { name: "escaped_id", diff --git a/d2graph/d2graph.go b/d2graph/d2graph.go index 301cc5bd8..6a0bfd51b 100644 --- a/d2graph/d2graph.go +++ b/d2graph/d2graph.go @@ -1645,11 +1645,12 @@ var SimpleReservedKeywords = map[string]struct{}{ "classes": {}, } -// ReservedKeywordHolders are reserved keywords that are meaningless on its own and exist solely to hold a set of reserved keywords +// ReservedKeywordHolders are reserved keywords that can hold composites var ReservedKeywordHolders = map[string]struct{}{ "style": {}, "source-arrowhead": {}, "target-arrowhead": {}, + "classes": {}, } // StyleKeywords are reserved keywords which cannot exist outside of the "style" keyword diff --git a/d2ir/d2ir.go b/d2ir/d2ir.go index 50fb8c104..6f0ad2c67 100644 --- a/d2ir/d2ir.go +++ b/d2ir/d2ir.go @@ -669,10 +669,9 @@ func (m *Map) ensureField(i int, kp *d2ast.KeyPath, refctx *RefContext) (*Field, if _, ok := d2graph.ReservedKeywords[strings.ToLower(head)]; ok { head = strings.ToLower(head) - } - - if head == "class" && i < len(kp.Path)-1 { - return nil, d2parser.Errorf(kp.Path[i].Unbox(), `"class" must be the last part of the key`) + if _, ok := d2graph.ReservedKeywordHolders[head]; !ok && i < len(kp.Path)-1 { + return nil, d2parser.Errorf(kp.Path[i].Unbox(), fmt.Sprintf(`"%s" must be the last part of the key`, head)) + } } if head == "_" { diff --git a/testdata/d2compiler/TestCompile/keyword-container.exp.json b/testdata/d2compiler/TestCompile/keyword-container.exp.json new file mode 100644 index 000000000..898e9071a --- /dev/null +++ b/testdata/d2compiler/TestCompile/keyword-container.exp.json @@ -0,0 +1,12 @@ +{ + "graph": null, + "err": { + "ioerr": null, + "errs": [ + { + "range": "d2/testdata/d2compiler/TestCompile/keyword-container.d2,0:2:2-0:6:6", + "errmsg": "d2/testdata/d2compiler/TestCompile/keyword-container.d2:1:3: \"near\" must be the last part of the key" + } + ] + } +} From febd237f34c245950b28c7a8ba2f20977cad1285 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Wed, 31 May 2023 23:06:13 -0700 Subject: [PATCH 28/62] changelog --- ci/release/changelogs/next.md | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/release/changelogs/next.md b/ci/release/changelogs/next.md index 396a9e5f2..09c52375e 100644 --- a/ci/release/changelogs/next.md +++ b/ci/release/changelogs/next.md @@ -15,3 +15,4 @@ - Fixes grid layout overwriting label placements for nested objects. [#1345](https://github.com/terrastruct/d2/pull/1345) - Fixes fonts not rendering correctly on certain platforms. Thanks @mikeday for identifying the solution. [#1356](https://github.com/terrastruct/d2/pull/1356) - Fixes folders not rendering in animations (`--animate-interval`) [#1357](https://github.com/terrastruct/d2/pull/1357) +- Fixes panic using reserved keywords as containers [#1358](https://github.com/terrastruct/d2/pull/1358) From 69f40ae9fb4f0d6a9b0c3177f4a00e90d2adb6f2 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Wed, 31 May 2023 23:28:33 -0700 Subject: [PATCH 29/62] fix --- d2graph/d2graph.go | 28 ++++++++++------------------ d2ir/d2ir.go | 2 +- 2 files changed, 11 insertions(+), 19 deletions(-) diff --git a/d2graph/d2graph.go b/d2graph/d2graph.go index 6a0bfd51b..57f135d57 100644 --- a/d2graph/d2graph.go +++ b/d2graph/d2graph.go @@ -1618,9 +1618,6 @@ func Key(k *d2ast.KeyPath) []string { // All reserved keywords. See init below. var ReservedKeywords map[string]struct{} -// All reserved keywords not including style keywords. -var ReservedKeywords2 map[string]struct{} - // Non Style/Holder keywords. var SimpleReservedKeywords = map[string]struct{}{ "label": {}, @@ -1642,15 +1639,18 @@ var SimpleReservedKeywords = map[string]struct{}{ "vertical-gap": {}, "horizontal-gap": {}, "class": {}, - "classes": {}, } -// ReservedKeywordHolders are reserved keywords that can hold composites +// ReservedKeywordHolders are reserved keywords that are meaningless on its own and must hold composites var ReservedKeywordHolders = map[string]struct{}{ "style": {}, "source-arrowhead": {}, "target-arrowhead": {}, - "classes": {}, +} + +// CompositeReservedKeywords are reserved keywords that can hold composites +var CompositeReservedKeywords = map[string]struct{}{ + "classes": {}, } // StyleKeywords are reserved keywords which cannot exist outside of the "style" keyword @@ -1726,23 +1726,15 @@ func init() { ReservedKeywords[k] = v } for k, v := range ReservedKeywordHolders { - ReservedKeywords[k] = v + CompositeReservedKeywords[k] = v } for k, v := range BoardKeywords { + CompositeReservedKeywords[k] = v + } + for k, v := range CompositeReservedKeywords { ReservedKeywords[k] = v } - ReservedKeywords2 = make(map[string]struct{}) - for k, v := range SimpleReservedKeywords { - ReservedKeywords2[k] = v - } - for k, v := range ReservedKeywordHolders { - ReservedKeywords2[k] = v - } - for k, v := range BoardKeywords { - ReservedKeywords2[k] = v - } - NearConstants = make(map[string]struct{}, len(NearConstantsArray)) for _, k := range NearConstantsArray { NearConstants[k] = struct{}{} diff --git a/d2ir/d2ir.go b/d2ir/d2ir.go index 6f0ad2c67..bf4b6cdd9 100644 --- a/d2ir/d2ir.go +++ b/d2ir/d2ir.go @@ -669,7 +669,7 @@ func (m *Map) ensureField(i int, kp *d2ast.KeyPath, refctx *RefContext) (*Field, if _, ok := d2graph.ReservedKeywords[strings.ToLower(head)]; ok { head = strings.ToLower(head) - if _, ok := d2graph.ReservedKeywordHolders[head]; !ok && i < len(kp.Path)-1 { + if _, ok := d2graph.CompositeReservedKeywords[head]; !ok && i < len(kp.Path)-1 { return nil, d2parser.Errorf(kp.Path[i].Unbox(), fmt.Sprintf(`"%s" must be the last part of the key`, head)) } } From 4d5d9e65ad0f04a158bcbe24aafc87906b46ec00 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Wed, 31 May 2023 23:32:22 -0700 Subject: [PATCH 30/62] remove redundant keywords in compression dict --- lib/urlenc/urlenc.go | 6 ------ 1 file changed, 6 deletions(-) diff --git a/lib/urlenc/urlenc.go b/lib/urlenc/urlenc.go index a409fbdcd..a7bc18cd4 100644 --- a/lib/urlenc/urlenc.go +++ b/lib/urlenc/urlenc.go @@ -20,15 +20,9 @@ var compressionDict = "->" + func init() { var common []string - for k := range d2graph.StyleKeywords { - common = append(common, k) - } for k := range d2graph.ReservedKeywords { common = append(common, k) } - for k := range d2graph.ReservedKeywordHolders { - common = append(common, k) - } sort.Strings(common) for _, k := range common { compressionDict += k From 25fd96c0fcdffafed32651337295ca6402914e3c Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Thu, 1 Jun 2023 00:07:57 -0700 Subject: [PATCH 31/62] add testdata for urlenc --- lib/urlenc/testdata/TestBasic.exp.txt | 1 + lib/urlenc/urlenc_test.go | 4 ++++ 2 files changed, 5 insertions(+) create mode 100644 lib/urlenc/testdata/TestBasic.exp.txt diff --git a/lib/urlenc/testdata/TestBasic.exp.txt b/lib/urlenc/testdata/TestBasic.exp.txt new file mode 100644 index 000000000..14ce0930b --- /dev/null +++ b/lib/urlenc/testdata/TestBasic.exp.txt @@ -0,0 +1 @@ +FMvBDcIwDEDRe6b4GYAFeuDOHbEAcmKjFFc4VbEQuyMGeG9OZ7JceOwxaf7qPlmTQ30Im9rw8E0TbwxrUmtd-BSIhesNC-4qhz07fV__nqmCpET5ll8AAAD__w== \ No newline at end of file diff --git a/lib/urlenc/urlenc_test.go b/lib/urlenc/urlenc_test.go index c5b9a4866..21c33087d 100644 --- a/lib/urlenc/urlenc_test.go +++ b/lib/urlenc/urlenc_test.go @@ -16,6 +16,10 @@ I just forgot my whole philosophy of life!!!: { encoded, err := Encode(script) assert.Success(t, err) + // Make it explicit in PRs when encoding changes + // Something we might want to know for playground compatability + assert.Testdata(t, ".txt", []byte(encoded)) + decoded, err := Decode(encoded) assert.Success(t, err) From 8edf2987bc59dd54a0076b75da80e5314da6b42b Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Thu, 1 Jun 2023 00:13:40 -0700 Subject: [PATCH 32/62] test --- lib/urlenc/testdata/TestBasic.exp.txt | 1 - lib/urlenc/testdata/TestChanges.exp.txt | 1 + lib/urlenc/urlenc_test.go | 165 +++++++++++++++++++++++- 3 files changed, 164 insertions(+), 3 deletions(-) delete mode 100644 lib/urlenc/testdata/TestBasic.exp.txt create mode 100644 lib/urlenc/testdata/TestChanges.exp.txt diff --git a/lib/urlenc/testdata/TestBasic.exp.txt b/lib/urlenc/testdata/TestBasic.exp.txt deleted file mode 100644 index 14ce0930b..000000000 --- a/lib/urlenc/testdata/TestBasic.exp.txt +++ /dev/null @@ -1 +0,0 @@ -FMvBDcIwDEDRe6b4GYAFeuDOHbEAcmKjFFc4VbEQuyMGeG9OZ7JceOwxaf7qPlmTQ30Im9rw8E0TbwxrUmtd-BSIhesNC-4qhz07fV__nqmCpET5ll8AAAD__w== \ No newline at end of file diff --git a/lib/urlenc/testdata/TestChanges.exp.txt b/lib/urlenc/testdata/TestChanges.exp.txt new file mode 100644 index 000000000..c8aeb9aed --- /dev/null +++ b/lib/urlenc/testdata/TestChanges.exp.txt @@ -0,0 +1 @@ +vFdtb9s4Ev6uXzFwWvQuiN5sN0mFwx1yadMUaLHe2rv9UmBBiyOZrUSqJGUn3ea_L4aSbFl2usUusPkQkzPkzMNnXkhZUSIpoBR3qBMYjeB3DwDvqoJJRkwm8K3kHgDAyQmcni72NpyeOo0Pb-QnTC0wbs5gs1K-VX6mikJtzkDJpWKaC5m3a6-VXKM2zjqUitcFdppaG6WFzM8qlovGf6tabJBZ4MjrqhBpXzNHvUYOnFkGhcrzxtE378GboaoKBC5Mqtao7xMYDUXwURrUa5HiyGO8JeGKN6dzVDiiA0qZBEYnaczG2WTkPXje7lzQmkhg9NNO2LO8zzL4_4UhjiNLDu0fWdRi9lJKRyFRR9sY5ppVqy-FB5CqskRpPQBbGFYJ76G3PmjXJfCaBj-__ShvkKOmyoO51cwquHbl0NBB6ZqAKFlOUaPkT2BlbWWSMKyrQjEebMRnUSIXLFA6D2lW0SwkHEqa0K7qchnGYXwRtj5_e6tyFZh1HsbjKKru_KE8qGS-D7s9VJeeJyeUImjD2qAGWofSwuqea5crZ7AWRixFIew9ZKKwSGnmfetbbMhJYPF27l_N3sC_lkjkc6w0pkTHv4_QRkHYD8swSv_x4cCJZzeCWhFklDSLdnKjHWwOTQD3uaWZCSxqzYzVdWqJgdCoVLAijOKJ35r0Y-JrGKmHnkeCfCz-YrZSEmGDy8cXdxzdLhYzuJJcK8G9DS4T-IDLH0bNvtYaww-4fDqO5k1uPx1H19SHw6uq2pO-VCUT0hw_lPemIsxJz_OzzrUxF8H668Y5FCZ0W8Jf0bXuD0JjgcaErKoK9IWz4sdj_3yaL_2q1iR9PoniC7_8JONJUfjsf084Eia_yJ88O4TSkpEcISHlchqQKBPUiB0ialcNO6Epmba-g2B8i-lKqkLlAk34PB6HrLHb6F0ZHLKwwaXLw23UdjloUqVdY-8a90c5d6LRke6WZRyzmLrbSpUImsnPtPeWJu_dxOtZ7pre9kqYP9qmDuAsVlpkFt7Pro-s3nO-Q9m7CROYDsQEP4qiV5OXBP97CFqQzknb8G-3Y-fu5NGmf7z--6b-EtydgSNkDbR_n5zHvLXElEyumLVMwjiBd93Ey8VXuqvTzwm87oZe034cFQnM3aS5dzxLzfi-EpQfbggzgQPXPU8DzdbZQN7zNzxG569tCYN6aKtzIK00cuHei93pxwnMdsI2of_84ku59F0x-5XMg6xglmau0KmGz6fnsft3Gb9obzKHvqsGl39NWX63KreE9QNTYpmydIUJvGtHR1oQj7-cZxHD4i6qlA7SQtU8o-smkGjDShPZ1i9UrkzIMZrGz6OpH3G-9KeT7NxfXr5AP8NoOo0macouud955e15vAxtukrghn56h-gewAlYXeOOR3rhNtuYrTXSRjf48a1EnpB54oiji_qHdzqolAqt8w6Ey7DGmHckN_6p1GghEJpDEDvw2140DlLdvDz6WbVXYPQoPNRuE2c0GuqOVEb_Ttg2on6L2qkOoSVwzSQXnFlsUmTXSsfbF-tjLeuwIOiP5Dvr-t22fQ-X31zcXN68ouUP9GnDdHG_FJon8IqG_xea3o-1ZXkCv1jm7teKUbjn9NO-n2sprECTwPVu4j14aNMEgiBAmx7w63RdWt92L1Gvn23bAO0J27j0Zc7WjsLme9F4fwQAAP__ \ No newline at end of file diff --git a/lib/urlenc/urlenc_test.go b/lib/urlenc/urlenc_test.go index 21c33087d..5b492938f 100644 --- a/lib/urlenc/urlenc_test.go +++ b/lib/urlenc/urlenc_test.go @@ -16,8 +16,169 @@ I just forgot my whole philosophy of life!!!: { encoded, err := Encode(script) assert.Success(t, err) - // Make it explicit in PRs when encoding changes - // Something we might want to know for playground compatability + decoded, err := Decode(encoded) + assert.Success(t, err) + + assert.String(t, script, decoded) +} + +// TestChanges makes it explicit in PRs when encoding changes +// Something we might want to know for playground compatability +func TestChanges(t *testing.T) { + // Choose something with many keywords and varied text + const script = `timeline mixer: "" { + explanation: |md + ## **Timeline mixer** + - Inject ads, who-to-follow, onboarding + - Conversation module + - Cursoring,pagination + - Tweat deduplication + - Served data logging + | +} +People discovery: "People discovery \nservice" +admixer: Ad mixer { + style.fill: "#c1a2f3" +} + +onboarding service: "Onboarding \nservice" +timeline mixer -> People discovery +timeline mixer -> onboarding service +timeline mixer -> admixer +container0: "" { + graphql + comment + tlsapi +} +container0.graphql: GraphQL\nFederated Strato Column { + shape: image + icon: https://upload.wikimedia.org/wikipedia/commons/thumb/1/17/GraphQL_Logo.svg/1200px-GraphQL_Logo.svg.png +} +container0.comment: |md + ## Tweet/user content hydration, visibility filtering +| +container0.tlsapi: TLS-API (being deprecated) +container0.graphql -> timeline mixer +timeline mixer <- container0.tlsapi +twitter fe: "Twitter Frontend " { + icon: https://icons.terrastruct.com/social/013-twitter-1.svg + shape: image +} +twitter fe -> container0.graphql: iPhone web +twitter fe -> container0.tlsapi: HTTP Android +web: Web { + icon: https://icons.terrastruct.com/azure/Web%20Service%20Color/App%20Service%20Domains.svg + shape: image +} + +Iphone: { + icon: 'https://ss7.vzw.com/is/image/VerizonWireless/apple-iphone-12-64gb-purple-53017-mjn13ll-a?$device-lg$' + shape: image +} +Android: { + icon: https://cdn4.iconfinder.com/data/icons/smart-phones-technologies/512/android-phone.png + shape: image +} + +web -> twitter fe +timeline scorer: "Timeline\nScorer" { + style.fill: "#ffdef1" +} +home ranker: Home Ranker + +timeline service: Timeline Service +timeline mixer -> timeline scorer: Thrift RPC +timeline mixer -> home ranker: { + style.stroke-dash: 4 + style.stroke: "#000E3D" +} +timeline mixer -> timeline service +home mixer: Home mixer { + # style.fill: "#c1a2f3" +} +container0.graphql -> home mixer: { + style.stroke-dash: 4 + style.stroke: "#000E3D" +} +home mixer -> timeline scorer +home mixer -> home ranker: { + style.stroke-dash: 4 + style.stroke: "#000E3D" +} +home mixer -> timeline service +manhattan 2: Manhattan +gizmoduck: Gizmoduck +socialgraph: Social graph +tweetypie: Tweety Pie +home mixer -> manhattan 2 +home mixer -> gizmoduck +home mixer -> socialgraph +home mixer -> tweetypie +Iphone -> twitter fe +Android -> twitter fe +prediction service2: Prediction Service { + shape: image + icon: https://cdn-icons-png.flaticon.com/512/6461/6461819.png +} +home scorer: Home Scorer { + style.fill: "#ffdef1" +} +manhattan: Manhattan +memcache: Memcache { + icon: https://d1q6f0aelx0por.cloudfront.net/product-logos/de041504-0ddb-43f6-b89e-fe04403cca8d-memcached.png +} + +fetch: Fetch { + style.multiple: true + shape: step +} + +feature: Feature { + style.multiple: true + shape: step +} +scoring: Scoring { + style.multiple: true + shape: step +} +fetch -> feature +feature -> scoring + +prediction service: Prediction Service { + shape: image + icon: https://cdn-icons-png.flaticon.com/512/6461/6461819.png +} +scoring -> prediction service +fetch -> container2.crmixer + +home scorer -> manhattan: "" + +home scorer -> memcache: "" +home scorer -> prediction service2 +home ranker -> home scorer +home ranker -> container2.crmixer: Candidate Fetch +container2: "" { + style.stroke: "#000E3D" + style.fill: "#ffffff" + crmixer: CrMixer { + style.fill: "#F7F8FE" + } + earlybird: EarlyBird + utag: Utag + space: Space + communities: Communities +} +etc: ...etc + +home scorer -> etc: Feature Hydration + +feature -> manhattan +feature -> memcache +feature -> etc: Candidate sources +` + + encoded, err := Encode(script) + assert.Success(t, err) assert.Testdata(t, ".txt", []byte(encoded)) decoded, err := Decode(encoded) From 6d2b77170b6653b17404ad6310e749b15b6ed3c8 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Thu, 1 Jun 2023 17:11:11 -0700 Subject: [PATCH 33/62] fix arrowhead overriding --- d2compiler/compile.go | 8 +- d2compiler/compile_test.go | 23 + .../TestCompile/nested-array-classes.exp.json | 656 ++++++++++++++++++ 3 files changed, 685 insertions(+), 2 deletions(-) create mode 100644 testdata/d2compiler/TestCompile/nested-array-classes.exp.json diff --git a/d2compiler/compile.go b/d2compiler/compile.go index 4c39c7084..8c60316cd 100644 --- a/d2compiler/compile.go +++ b/d2compiler/compile.go @@ -667,10 +667,14 @@ func (c *compiler) compileEdgeField(edge *d2graph.Edge, f *d2ir.Field) { func (c *compiler) compileArrowheads(edge *d2graph.Edge, f *d2ir.Field) { var attrs *d2graph.Attributes if f.Name == "source-arrowhead" { - edge.SrcArrowhead = &d2graph.Attributes{} + if edge.SrcArrowhead == nil { + edge.SrcArrowhead = &d2graph.Attributes{} + } attrs = edge.SrcArrowhead } else { - edge.DstArrowhead = &d2graph.Attributes{} + if edge.DstArrowhead == nil { + edge.DstArrowhead = &d2graph.Attributes{} + } attrs = edge.DstArrowhead } diff --git a/d2compiler/compile_test.go b/d2compiler/compile_test.go index cbe248773..78dbd5365 100644 --- a/d2compiler/compile_test.go +++ b/d2compiler/compile_test.go @@ -2475,6 +2475,29 @@ classes.x.shape: diamond tassert.Equal(t, "diamond", g.Objects[0].Shape.Value) }, }, + { + name: "nested-array-classes", + text: `classes: { + one target: { + target-arrowhead.label: 1 + } + association: { + target-arrowhead.shape: arrow + } +} + +a -> b: { class: [one target; association] } +a -> b: { class: [association; one target] } +`, + assertions: func(t *testing.T, g *d2graph.Graph) { + // They have the same, regardless of order of class application + // since the classes modify attributes exclusive of each other + tassert.Equal(t, "1", g.Edges[0].DstArrowhead.Label.Value) + tassert.Equal(t, "1", g.Edges[1].DstArrowhead.Label.Value) + tassert.Equal(t, "arrow", g.Edges[0].DstArrowhead.Shape.Value) + tassert.Equal(t, "arrow", g.Edges[1].DstArrowhead.Shape.Value) + }, + }, { name: "class-shape-class", text: `classes: { diff --git a/testdata/d2compiler/TestCompile/nested-array-classes.exp.json b/testdata/d2compiler/TestCompile/nested-array-classes.exp.json new file mode 100644 index 000000000..4a65875df --- /dev/null +++ b/testdata/d2compiler/TestCompile/nested-array-classes.exp.json @@ -0,0 +1,656 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,0:0:0-11:0:203", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,0:0:0-7:1:111", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,0:0:0-0:7:7", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,0:0:0-0:7:7", + "value": [ + { + "string": "classes", + "raw_string": "classes" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,0:9:9-7:0:110", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,1:2:13-3:3:58", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,1:2:13-1:12:23", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,1:2:13-1:12:23", + "value": [ + { + "string": "one target", + "raw_string": "one target" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,1:14:25-3:2:57", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,2:2:29-2:27:54", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,2:2:29-2:24:51", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,2:2:29-2:18:45", + "value": [ + { + "string": "target-arrowhead", + "raw_string": "target-arrowhead" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,2:19:46-2:24:51", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "number": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,2:26:53-2:27:54", + "raw": "1", + "value": "1" + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,4:1:60-6:2:109", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,4:1:60-4:12:71", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,4:1:60-4:12:71", + "value": [ + { + "string": "association", + "raw_string": "association" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,4:14:73-6:1:108", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,5:2:77-5:31:106", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,5:2:77-5:24:99", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,5:2:77-5:18:93", + "value": [ + { + "string": "target-arrowhead", + "raw_string": "target-arrowhead" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,5:19:94-5:24:99", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,5:26:101-5:31:106", + "value": [ + { + "string": "arrow", + "raw_string": "arrow" + } + ] + } + } + } + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,9:0:113-9:44:157", + "edges": [ + { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,9:0:113-9:6:119", + "src": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,9:0:113-9:1:114", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,9:0:113-9:1:114", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,9:5:118-9:6:119", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,9:5:118-9:6:119", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,9:8:121-9:43:156", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,9:10:123-9:42:155", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,9:10:123-9:15:128", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,9:10:123-9:15:128", + "value": [ + { + "string": "class", + "raw_string": "class" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "array": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,9:17:130-9:41:154", + "nodes": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,9:18:131-9:28:141", + "value": [ + { + "string": "one target", + "raw_string": "one target" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,9:30:143-9:41:154", + "value": [ + { + "string": "association", + "raw_string": "association" + } + ] + } + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,10:0:158-10:44:202", + "edges": [ + { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,10:0:158-10:6:164", + "src": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,10:0:158-10:1:159", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,10:0:158-10:1:159", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,10:5:163-10:6:164", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,10:5:163-10:6:164", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,10:8:166-10:43:201", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,10:10:168-10:42:200", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,10:10:168-10:15:173", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,10:10:168-10:15:173", + "value": [ + { + "string": "class", + "raw_string": "class" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "array": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,10:17:175-10:41:199", + "nodes": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,10:18:176-10:29:187", + "value": [ + { + "string": "association", + "raw_string": "association" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,10:31:189-10:41:199", + "value": [ + { + "string": "one target", + "raw_string": "one target" + } + ] + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": { + "value": "" + } + }, + "zIndex": 0 + }, + "edges": [ + { + "index": 0, + "isCurve": false, + "src_arrow": false, + "dst_arrow": true, + "dstArrowhead": { + "label": { + "value": "1" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "arrow" + }, + "direction": { + "value": "" + }, + "constraint": { + "value": "" + } + }, + "references": [ + { + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": { + "value": "" + } + }, + "zIndex": 0 + }, + { + "index": 1, + "isCurve": false, + "src_arrow": false, + "dst_arrow": true, + "dstArrowhead": { + "label": { + "value": "1" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "arrow" + }, + "direction": { + "value": "" + }, + "constraint": { + "value": "" + } + }, + "references": [ + { + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": { + "value": "" + } + }, + "zIndex": 0 + } + ], + "objects": [ + { + "id": "a", + "id_val": "a", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,9:0:113-9:1:114", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,9:0:113-9:1:114", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,10:0:158-10:1:159", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,10:0:158-10:1:159", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "a" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": { + "value": "" + } + }, + "zIndex": 0 + }, + { + "id": "b", + "id_val": "b", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,9:5:118-9:6:119", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,9:5:118-9:6:119", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,10:5:163-10:6:164", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,10:5:163-10:6:164", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "b" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": { + "value": "" + } + }, + "zIndex": 0 + } + ] + }, + "err": null +} From f6b1d751df9edfcf7acb66bcc12225410f096529 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Thu, 1 Jun 2023 17:13:00 -0700 Subject: [PATCH 34/62] changelog --- ci/release/changelogs/next.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ci/release/changelogs/next.md b/ci/release/changelogs/next.md index 09c52375e..9fcfa6163 100644 --- a/ci/release/changelogs/next.md +++ b/ci/release/changelogs/next.md @@ -16,3 +16,5 @@ - Fixes fonts not rendering correctly on certain platforms. Thanks @mikeday for identifying the solution. [#1356](https://github.com/terrastruct/d2/pull/1356) - Fixes folders not rendering in animations (`--animate-interval`) [#1357](https://github.com/terrastruct/d2/pull/1357) - Fixes panic using reserved keywords as containers [#1358](https://github.com/terrastruct/d2/pull/1358) +- When multiple classes are applied changing different attributes of arrowheads, they are + all applied instead of only the last one [#1362](https://github.com/terrastruct/d2/pull/1362) From 3db70bb31d3dfc0737b8c9802ca0a6a265ad160f Mon Sep 17 00:00:00 2001 From: Bernard Xie Date: Thu, 1 Jun 2023 18:42:43 -0700 Subject: [PATCH 35/62] Update compile.go --- d2compiler/compile.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/d2compiler/compile.go b/d2compiler/compile.go index 8c60316cd..1c83edf99 100644 --- a/d2compiler/compile.go +++ b/d2compiler/compile.go @@ -270,6 +270,9 @@ func (c *compiler) compileLabel(attrs *d2graph.Attributes, f d2ir.Node) { // TODO: Delete instead. attrs.Label.Value = scalar.ScalarString() case *d2ast.BlockString: + if scalar.ScalarString() == "" { + c.errorf(f.LastPrimaryKey(), "block string cannot be empty") + } attrs.Language = scalar.Tag fullTag, ok := ShortToFullLanguageAliases[scalar.Tag] if ok { From 7d05c395930fa935754ecaf2b85aefdf78cb77cf Mon Sep 17 00:00:00 2001 From: Bernard Xie Date: Thu, 1 Jun 2023 18:45:15 -0700 Subject: [PATCH 36/62] Update next.md --- ci/release/changelogs/next.md | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/release/changelogs/next.md b/ci/release/changelogs/next.md index 9fcfa6163..274a93921 100644 --- a/ci/release/changelogs/next.md +++ b/ci/release/changelogs/next.md @@ -18,3 +18,4 @@ - Fixes panic using reserved keywords as containers [#1358](https://github.com/terrastruct/d2/pull/1358) - When multiple classes are applied changing different attributes of arrowheads, they are all applied instead of only the last one [#1362](https://github.com/terrastruct/d2/pull/1362) +- Prevent empty blocks strings [#1364](https://github.com/terrastruct/d2/pull/1364) From 1a6b1a4084fc6d0b26622fed313bd30da9164911 Mon Sep 17 00:00:00 2001 From: Bernard Xie Date: Thu, 1 Jun 2023 18:48:37 -0700 Subject: [PATCH 37/62] add test --- d2compiler/compile_test.go | 5 +++++ .../TestCompile/no_empty_block_strings.exp.json | 12 ++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 testdata/d2compiler/TestCompile/no_empty_block_strings.exp.json diff --git a/d2compiler/compile_test.go b/d2compiler/compile_test.go index 78dbd5365..c7c6267da 100644 --- a/d2compiler/compile_test.go +++ b/d2compiler/compile_test.go @@ -610,6 +610,11 @@ x: { expErr: `d2/testdata/d2compiler/TestCompile/md_block_string_err.d2:4:19: unexpected text after md block string. See https://d2lang.com/tour/text#advanced-block-strings. d2/testdata/d2compiler/TestCompile/md_block_string_err.d2:5:1: block string must be terminated with |`, }, + { + name: "no_empty_block_strings", + text: `Text: |md |`, + expErr: `d2/testdata/d2compiler/TestCompile/no_empty_block_strings.d2:1:1: block string cannot be empty`, + }, { name: "underscore_edge_existing", diff --git a/testdata/d2compiler/TestCompile/no_empty_block_strings.exp.json b/testdata/d2compiler/TestCompile/no_empty_block_strings.exp.json new file mode 100644 index 000000000..be534202f --- /dev/null +++ b/testdata/d2compiler/TestCompile/no_empty_block_strings.exp.json @@ -0,0 +1,12 @@ +{ + "graph": null, + "err": { + "ioerr": null, + "errs": [ + { + "range": "d2/testdata/d2compiler/TestCompile/no_empty_block_strings.d2,0:0:0-0:11:11", + "errmsg": "d2/testdata/d2compiler/TestCompile/no_empty_block_strings.d2:1:1: block string cannot be empty" + } + ] + } +} From 107a47e9e338566139dba2b5f290b5a591fbc28e Mon Sep 17 00:00:00 2001 From: Bernard Xie Date: Thu, 1 Jun 2023 18:49:02 -0700 Subject: [PATCH 38/62] Update next.md --- ci/release/changelogs/next.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/release/changelogs/next.md b/ci/release/changelogs/next.md index 274a93921..0735e46d5 100644 --- a/ci/release/changelogs/next.md +++ b/ci/release/changelogs/next.md @@ -18,4 +18,4 @@ - Fixes panic using reserved keywords as containers [#1358](https://github.com/terrastruct/d2/pull/1358) - When multiple classes are applied changing different attributes of arrowheads, they are all applied instead of only the last one [#1362](https://github.com/terrastruct/d2/pull/1362) -- Prevent empty blocks strings [#1364](https://github.com/terrastruct/d2/pull/1364) +- Prevent empty block strings [#1364](https://github.com/terrastruct/d2/pull/1364) From e6750a99b65dfc113ec7171233aa07e4ff21e123 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Thu, 1 Jun 2023 19:42:40 -0700 Subject: [PATCH 39/62] fix renameiddelta --- d2oracle/edit.go | 22 ++- d2oracle/edit_test.go | 24 +++ .../TestRename/generated-conflict.exp.json | 180 ++++++++++++++++++ 3 files changed, 217 insertions(+), 9 deletions(-) create mode 100644 testdata/d2oracle/TestRename/generated-conflict.exp.json diff --git a/d2oracle/edit.go b/d2oracle/edit.go index 1fbf2caf2..566a0a573 100644 --- a/d2oracle/edit.go +++ b/d2oracle/edit.go @@ -2735,7 +2735,7 @@ func RenameIDDeltas(g *d2graph.Graph, key, newName string) (deltas map[string]st } mk.Key.Path[len(mk.Key.Path)-1].Unbox().SetString(newName) - uniqueKeyStr, _, err := generateUniqueKey(g, strings.Join(d2graph.Key(mk.Key), "."), nil, nil) + uniqueKeyStr, _, err := generateUniqueKey(g, strings.Join(d2graph.Key(mk.Key), "."), obj, nil) if err != nil { return nil, err } @@ -2749,19 +2749,23 @@ func RenameIDDeltas(g *d2graph.Graph, key, newName string) (deltas map[string]st beforeObjID := obj.ID appendNodeDelta := func(ch *d2graph.Object) { - beforeID := ch.AbsID() - obj.ID = newNameKey - deltas[beforeID] = ch.AbsID() - obj.ID = beforeObjID + if obj.ID != newNameKey { + beforeID := ch.AbsID() + obj.ID = newNameKey + deltas[beforeID] = ch.AbsID() + obj.ID = beforeObjID + } } appendEdgeDelta := func(ch *d2graph.Object) { for _, e := range obj.Graph.Edges { if e.Src == ch || e.Dst == ch { - beforeID := e.AbsID() - obj.ID = newNameKey - deltas[beforeID] = e.AbsID() - obj.ID = beforeObjID + if obj.ID != newNameKey { + beforeID := e.AbsID() + obj.ID = newNameKey + deltas[beforeID] = e.AbsID() + obj.ID = beforeObjID + } } } } diff --git a/d2oracle/edit_test.go b/d2oracle/edit_test.go index 7f2afb369..a48bcc0d1 100644 --- a/d2oracle/edit_test.go +++ b/d2oracle/edit_test.go @@ -1840,6 +1840,19 @@ func TestRename(t *testing.T) { newName: `Square`, exp: `Square +`, + }, + { + name: "generated-conflict", + + text: `Square +Square 2 +`, + key: `Square 2`, + newName: `Square`, + + exp: `Square +Square 2 `, }, { @@ -7261,6 +7274,17 @@ y "x": "y 2" }`, }, + { + name: "generated-conflict", + + text: `Square +Square 2 +`, + key: `Square 2`, + newName: `Square`, + + exp: `{}`, + }, { name: "rename_conflict_with_dots", diff --git a/testdata/d2oracle/TestRename/generated-conflict.exp.json b/testdata/d2oracle/TestRename/generated-conflict.exp.json new file mode 100644 index 000000000..9e3866c39 --- /dev/null +++ b/testdata/d2oracle/TestRename/generated-conflict.exp.json @@ -0,0 +1,180 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2oracle/TestRename/generated-conflict.d2,0:0:0-2:0:16", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2oracle/TestRename/generated-conflict.d2,0:0:0-0:6:6", + "key": { + "range": "d2/testdata/d2oracle/TestRename/generated-conflict.d2,0:0:0-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestRename/generated-conflict.d2,0:0:0-0:6:6", + "value": [ + { + "string": "Square", + "raw_string": "Square" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": "d2/testdata/d2oracle/TestRename/generated-conflict.d2,1:0:7-1:8:15", + "key": { + "range": "d2/testdata/d2oracle/TestRename/generated-conflict.d2,1:0:7-1:8:15", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestRename/generated-conflict.d2,1:0:7-1:8:15", + "value": [ + { + "string": "Square 2", + "raw_string": "Square 2" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": { + "value": "" + } + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "Square", + "id_val": "Square", + "references": [ + { + "key": { + "range": "d2/testdata/d2oracle/TestRename/generated-conflict.d2,0:0:0-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestRename/generated-conflict.d2,0:0:0-0:6:6", + "value": [ + { + "string": "Square", + "raw_string": "Square" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "Square" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": { + "value": "" + } + }, + "zIndex": 0 + }, + { + "id": "Square 2", + "id_val": "Square 2", + "references": [ + { + "key": { + "range": "d2/testdata/d2oracle/TestRename/generated-conflict.d2,1:0:7-1:8:15", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestRename/generated-conflict.d2,1:0:7-1:8:15", + "value": [ + { + "string": "Square 2", + "raw_string": "Square 2" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "Square 2" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": { + "value": "" + } + }, + "zIndex": 0 + } + ] + }, + "err": "" +} From cd09aba54ff82b5632922355c1491da6466363a9 Mon Sep 17 00:00:00 2001 From: Bernard Xie Date: Fri, 2 Jun 2023 10:42:44 -0700 Subject: [PATCH 40/62] trim space --- d2compiler/compile.go | 2 +- d2compiler/compile_test.go | 17 +++++++++++++++-- .../TestCompile/no_empty_block_string.exp.json | 12 ++++++++++++ .../no_new_lines_only_block_string.exp.json | 12 ++++++++++++ .../no_white_spaces_only_block_string.exp.json | 12 ++++++++++++ 5 files changed, 52 insertions(+), 3 deletions(-) create mode 100644 testdata/d2compiler/TestCompile/no_empty_block_string.exp.json create mode 100644 testdata/d2compiler/TestCompile/no_new_lines_only_block_string.exp.json create mode 100644 testdata/d2compiler/TestCompile/no_white_spaces_only_block_string.exp.json diff --git a/d2compiler/compile.go b/d2compiler/compile.go index 1c83edf99..2e85a27be 100644 --- a/d2compiler/compile.go +++ b/d2compiler/compile.go @@ -270,7 +270,7 @@ func (c *compiler) compileLabel(attrs *d2graph.Attributes, f d2ir.Node) { // TODO: Delete instead. attrs.Label.Value = scalar.ScalarString() case *d2ast.BlockString: - if scalar.ScalarString() == "" { + if strings.TrimSpace(scalar.ScalarString()) == "" { c.errorf(f.LastPrimaryKey(), "block string cannot be empty") } attrs.Language = scalar.Tag diff --git a/d2compiler/compile_test.go b/d2compiler/compile_test.go index c7c6267da..3a73a9b08 100644 --- a/d2compiler/compile_test.go +++ b/d2compiler/compile_test.go @@ -611,9 +611,22 @@ x: { d2/testdata/d2compiler/TestCompile/md_block_string_err.d2:5:1: block string must be terminated with |`, }, { - name: "no_empty_block_strings", + name: "no_empty_block_string", text: `Text: |md |`, - expErr: `d2/testdata/d2compiler/TestCompile/no_empty_block_strings.d2:1:1: block string cannot be empty`, + expErr: `d2/testdata/d2compiler/TestCompile/no_empty_block_string.d2:1:1: block string cannot be empty`, + }, + { + name: "no_white_spaces_only_block_string", + text: `Text: |md |`, + expErr: `d2/testdata/d2compiler/TestCompile/no_white_spaces_only_block_string.d2:1:1: block string cannot be empty`, + }, + { + name: "no_new_lines_only_block_string", + text: `Text: |md + + +|`, + expErr: `d2/testdata/d2compiler/TestCompile/no_new_lines_only_block_string.d2:1:1: block string cannot be empty`, }, { name: "underscore_edge_existing", diff --git a/testdata/d2compiler/TestCompile/no_empty_block_string.exp.json b/testdata/d2compiler/TestCompile/no_empty_block_string.exp.json new file mode 100644 index 000000000..bf0a8c3a8 --- /dev/null +++ b/testdata/d2compiler/TestCompile/no_empty_block_string.exp.json @@ -0,0 +1,12 @@ +{ + "graph": null, + "err": { + "ioerr": null, + "errs": [ + { + "range": "d2/testdata/d2compiler/TestCompile/no_empty_block_string.d2,0:0:0-0:11:11", + "errmsg": "d2/testdata/d2compiler/TestCompile/no_empty_block_string.d2:1:1: block string cannot be empty" + } + ] + } +} diff --git a/testdata/d2compiler/TestCompile/no_new_lines_only_block_string.exp.json b/testdata/d2compiler/TestCompile/no_new_lines_only_block_string.exp.json new file mode 100644 index 000000000..2dff86029 --- /dev/null +++ b/testdata/d2compiler/TestCompile/no_new_lines_only_block_string.exp.json @@ -0,0 +1,12 @@ +{ + "graph": null, + "err": { + "ioerr": null, + "errs": [ + { + "range": "d2/testdata/d2compiler/TestCompile/no_new_lines_only_block_string.d2,0:0:0-3:1:13", + "errmsg": "d2/testdata/d2compiler/TestCompile/no_new_lines_only_block_string.d2:1:1: block string cannot be empty" + } + ] + } +} diff --git a/testdata/d2compiler/TestCompile/no_white_spaces_only_block_string.exp.json b/testdata/d2compiler/TestCompile/no_white_spaces_only_block_string.exp.json new file mode 100644 index 000000000..ab68a6cc0 --- /dev/null +++ b/testdata/d2compiler/TestCompile/no_white_spaces_only_block_string.exp.json @@ -0,0 +1,12 @@ +{ + "graph": null, + "err": { + "ioerr": null, + "errs": [ + { + "range": "d2/testdata/d2compiler/TestCompile/no_white_spaces_only_block_string.d2,0:0:0-0:16:16", + "errmsg": "d2/testdata/d2compiler/TestCompile/no_white_spaces_only_block_string.d2:1:1: block string cannot be empty" + } + ] + } +} From 9f581bd78ab5fa531c6087f62893f2541d4628ce Mon Sep 17 00:00:00 2001 From: Bernard Xie Date: Fri, 2 Jun 2023 10:50:58 -0700 Subject: [PATCH 41/62] Update regression_test.go --- e2etests/regression_test.go | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/e2etests/regression_test.go b/e2etests/regression_test.go index e0453a15e..be778d758 100644 --- a/e2etests/regression_test.go +++ b/e2etests/regression_test.go @@ -929,19 +929,6 @@ cf many required: { style.stroke-width: 8 } } -`, - }, - { - name: "empty_md_measurement", - script: ` -a -b: |md - - -| -c -d -a -> b -> c `, }, loadFromFile(t, "slow_grid"), From 98c78c1f1955cd13da82796e4ca816020ed99c52 Mon Sep 17 00:00:00 2001 From: Bernard Xie Date: Fri, 2 Jun 2023 10:57:40 -0700 Subject: [PATCH 42/62] Update measured_test.go --- e2etests/measured_test.go | 8 -------- 1 file changed, 8 deletions(-) diff --git a/e2etests/measured_test.go b/e2etests/measured_test.go index 3c33c5c24..777fda482 100644 --- a/e2etests/measured_test.go +++ b/e2etests/measured_test.go @@ -26,14 +26,6 @@ func testMeasured(t *testing.T) { name: "empty-sql_table", mtexts: []*d2target.MText{}, script: `a: "" { shape: sql_table } -`, - }, - { - name: "empty-markdown", - mtexts: []*d2target.MText{}, - script: `a: |md -` + " " + ` -| `, }, } From f6580b69df9269986766d45aa1df11523a4b7dc5 Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Fri, 2 Jun 2023 11:05:02 -0700 Subject: [PATCH 43/62] add multiple_box_selection test --- e2etests/stable_test.go | 1 + .../testdata/files/multiple_box_selection.d2 | 11 + .../dagre/board.exp.json | 437 ++++++++++++++++++ .../dagre/sketch.exp.svg | 102 ++++ .../multiple_box_selection/elk/board.exp.json | 371 +++++++++++++++ .../multiple_box_selection/elk/sketch.exp.svg | 102 ++++ 6 files changed, 1024 insertions(+) create mode 100644 e2etests/testdata/files/multiple_box_selection.d2 create mode 100644 e2etests/testdata/stable/multiple_box_selection/dagre/board.exp.json create mode 100644 e2etests/testdata/stable/multiple_box_selection/dagre/sketch.exp.svg create mode 100644 e2etests/testdata/stable/multiple_box_selection/elk/board.exp.json create mode 100644 e2etests/testdata/stable/multiple_box_selection/elk/sketch.exp.svg diff --git a/e2etests/stable_test.go b/e2etests/stable_test.go index ff25dfd6d..7adfa8072 100644 --- a/e2etests/stable_test.go +++ b/e2etests/stable_test.go @@ -2726,6 +2726,7 @@ scenarios: { loadFromFile(t, "grid_icon"), loadFromFile(t, "multiple_offset"), loadFromFile(t, "multiple_offset_left"), + loadFromFile(t, "multiple_box_selection"), } runa(t, tcs) diff --git a/e2etests/testdata/files/multiple_box_selection.d2 b/e2etests/testdata/files/multiple_box_selection.d2 new file mode 100644 index 000000000..a4301aa80 --- /dev/null +++ b/e2etests/testdata/files/multiple_box_selection.d2 @@ -0,0 +1,11 @@ +outer: { + vg: volume group { + vd: volume definition { + style.multiple: true + + volume.style.multiple: true + volume.style.stroke-dash: 3 + } + } +} +start -> outer.vg.vd.volume -> end diff --git a/e2etests/testdata/stable/multiple_box_selection/dagre/board.exp.json b/e2etests/testdata/stable/multiple_box_selection/dagre/board.exp.json new file mode 100644 index 000000000..edc87a5af --- /dev/null +++ b/e2etests/testdata/stable/multiple_box_selection/dagre/board.exp.json @@ -0,0 +1,437 @@ +{ + "name": "", + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "outer", + "type": "rectangle", + "pos": { + "x": 0, + "y": 207 + }, + "width": 268, + "height": 335, + "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": "outer", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 63, + "labelHeight": 36, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "outer.vg", + "type": "rectangle", + "pos": { + "x": 20, + "y": 272 + }, + "width": 228, + "height": 240, + "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": "volume group", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 140, + "labelHeight": 31, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "outer.vg.vd", + "type": "rectangle", + "pos": { + "x": 40, + "y": 345 + }, + "width": 188, + "height": 145, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": true, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "volume definition", + "fontSize": 20, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 147, + "labelHeight": 26, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "outer.vg.vd.volume", + "type": "rectangle", + "pos": { + "x": 80, + "y": 390 + }, + "width": 98, + "height": 66, + "opacity": 1, + "strokeDash": 3, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N7", + "stroke": "B2", + "shadow": false, + "3d": false, + "multiple": true, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "volume", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 53, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 4 + }, + { + "id": "start", + "type": "rectangle", + "pos": { + "x": 94, + "y": 0 + }, + "width": 80, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "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": "start", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 35, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "end", + "type": "rectangle", + "pos": { + "x": 98, + "y": 642 + }, + "width": 72, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "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": "end", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 27, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + } + ], + "connections": [ + { + "id": "(start -> outer.vg.vd.volume)[0]", + "src": "start", + "srcArrow": "none", + "dst": "outer.vg.vd.volume", + "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": 134, + "y": 66 + }, + { + "x": 134, + "y": 106 + }, + { + "x": 134, + "y": 126 + }, + { + "x": 134, + "y": 141 + }, + { + "x": 134, + "y": 156 + }, + { + "x": 134, + "y": 176 + }, + { + "x": 134, + "y": 191 + }, + { + "x": 134, + "y": 206 + }, + { + "x": 134, + "y": 288.79998779296875 + }, + { + "x": 134, + "y": 380 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(outer.vg.vd.volume -> end)[0]", + "src": "outer.vg.vd.volume", + "srcArrow": "none", + "dst": "end", + "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": 134, + "y": 456 + }, + { + "x": 134, + "y": 444.79998779296875 + }, + { + "x": 134, + "y": 452 + }, + { + "x": 134, + "y": 467 + }, + { + "x": 134, + "y": 482 + }, + { + "x": 134, + "y": 502 + }, + { + "x": 134, + "y": 517 + }, + { + "x": 134, + "y": 532 + }, + { + "x": 134, + "y": 602 + }, + { + "x": 134, + "y": 642 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + } + ], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/stable/multiple_box_selection/dagre/sketch.exp.svg b/e2etests/testdata/stable/multiple_box_selection/dagre/sketch.exp.svg new file mode 100644 index 000000000..07623dea1 --- /dev/null +++ b/e2etests/testdata/stable/multiple_box_selection/dagre/sketch.exp.svg @@ -0,0 +1,102 @@ +outerstartendvolume groupvolume definitionvolume + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/multiple_box_selection/elk/board.exp.json b/e2etests/testdata/stable/multiple_box_selection/elk/board.exp.json new file mode 100644 index 000000000..f9f1eb196 --- /dev/null +++ b/e2etests/testdata/stable/multiple_box_selection/elk/board.exp.json @@ -0,0 +1,371 @@ +{ + "name": "", + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "outer", + "type": "rectangle", + "pos": { + "x": 12, + "y": 153 + }, + "width": 408, + "height": 396, + "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": "outer", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 63, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "outer.vg", + "type": "rectangle", + "pos": { + "x": 62, + "y": 208 + }, + "width": 308, + "height": 286, + "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": "volume group", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 140, + "labelHeight": 31, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "outer.vg.vd", + "type": "rectangle", + "pos": { + "x": 112, + "y": 273 + }, + "width": 208, + "height": 176, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": true, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "volume definition", + "fontSize": 20, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 147, + "labelHeight": 26, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "outer.vg.vd.volume", + "type": "rectangle", + "pos": { + "x": 162, + "y": 333 + }, + "width": 98, + "height": 66, + "opacity": 1, + "strokeDash": 3, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N7", + "stroke": "B2", + "shadow": false, + "3d": false, + "multiple": true, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "volume", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 53, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 4 + }, + { + "id": "start", + "type": "rectangle", + "pos": { + "x": 176, + "y": 12 + }, + "width": 80, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "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": "start", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 35, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "end", + "type": "rectangle", + "pos": { + "x": 180, + "y": 624 + }, + "width": 72, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "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": "end", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 27, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + } + ], + "connections": [ + { + "id": "(start -> outer.vg.vd.volume)[0]", + "src": "start", + "srcArrow": "none", + "dst": "outer.vg.vd.volume", + "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": 216, + "y": 78 + }, + { + "x": 216, + "y": 323 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(outer.vg.vd.volume -> end)[0]", + "src": "outer.vg.vd.volume", + "srcArrow": "none", + "dst": "end", + "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": 216, + "y": 399 + }, + { + "x": 216, + "y": 624 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + } + ], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/stable/multiple_box_selection/elk/sketch.exp.svg b/e2etests/testdata/stable/multiple_box_selection/elk/sketch.exp.svg new file mode 100644 index 000000000..6ac271a10 --- /dev/null +++ b/e2etests/testdata/stable/multiple_box_selection/elk/sketch.exp.svg @@ -0,0 +1,102 @@ +outerstartendvolume groupvolume definitionvolume + + + \ No newline at end of file From 4015a486643107ef4092e7f5adc38f64f120c349 Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Fri, 2 Jun 2023 14:15:49 -0700 Subject: [PATCH 44/62] fix dagre shifting connection start past 2nd point --- d2graph/layout.go | 112 ++++++++++++++++++++++++++++++ d2layouts/d2dagrelayout/layout.go | 4 +- lib/geo/point.go | 19 +++++ 3 files changed, 133 insertions(+), 2 deletions(-) diff --git a/d2graph/layout.go b/d2graph/layout.go index 43342daa1..25b66795b 100644 --- a/d2graph/layout.go +++ b/d2graph/layout.go @@ -141,6 +141,118 @@ func (obj *Object) ShiftDescendants(dx, dy float64) { }) } +// ShiftStart moves the starting point of the route by delta either horizontally or vertically +// if subsequent points are in line with the movement, they will be removed (unless it is the last point) +// start end +// . ├────┼────┼───┼────┼───┤ before +// . ├──dx──► +// . ├──┼───┼────┼───┤ after +func (edge *Edge) ShiftStart(delta float64, isHorizontal bool) { + position := func(p *geo.Point) float64 { + if isHorizontal { + return p.X + } + return p.Y + } + + start := edge.Route[0] + next := edge.Route[1] + isIncreasing := position(start) < position(next) + if isHorizontal { + start.X += delta + } else { + start.Y += delta + } + + if isIncreasing == (delta < 0) { + // nothing more to do when moving away from the next point + return + } + + isAligned := func(p *geo.Point) bool { + if isHorizontal { + return p.Y == start.Y + } + return p.X == start.X + } + isPastStart := func(p *geo.Point) bool { + if delta > 0 { + return position(p) < position(start) + } else { + return position(p) > position(start) + } + } + + needsRemoval := false + toRemove := make([]bool, len(edge.Route)) + for i := 1; i < len(edge.Route)-1; i++ { + if !isAligned(edge.Route[i]) { + break + } + if isPastStart(edge.Route[i]) { + toRemove[i] = true + needsRemoval = true + } + } + if needsRemoval { + edge.Route = geo.RemovePoints(edge.Route, toRemove) + } +} + +// ShiftEnd moves the ending point of the route by delta either horizontally or vertically +// if prior points are in line with the movement, they will be removed (unless it is the first point) +func (edge *Edge) ShiftEnd(delta float64, isHorizontal bool) { + position := func(p *geo.Point) float64 { + if isHorizontal { + return p.X + } + return p.Y + } + + end := edge.Route[len(edge.Route)-1] + prev := edge.Route[len(edge.Route)-2] + isIncreasing := position(prev) < position(end) + if isHorizontal { + end.X += delta + } else { + end.Y += delta + } + + if isIncreasing == (delta > 0) { + // nothing more to do when moving away from the next point + return + } + + isAligned := func(p *geo.Point) bool { + if isHorizontal { + return p.Y == end.Y + } + return p.X == end.X + } + isPastEnd := func(p *geo.Point) bool { + if delta > 0 { + return position(p) < position(end) + } else { + return position(p) > position(end) + } + } + + needsRemoval := false + toRemove := make([]bool, len(edge.Route)) + for i := len(edge.Route) - 2; i > 0; i-- { + if !isAligned(edge.Route[i]) { + break + } + if isPastEnd(edge.Route[i]) { + toRemove[i] = true + needsRemoval = true + } + } + if needsRemoval { + edge.Route = geo.RemovePoints(edge.Route, toRemove) + } +} + // GetModifierElementAdjustments returns width/height adjustments to account for shapes with 3d or multiple func (obj *Object) GetModifierElementAdjustments() (dx, dy float64) { if obj.Is3D() { diff --git a/d2layouts/d2dagrelayout/layout.go b/d2layouts/d2dagrelayout/layout.go index e033c61e7..97734237d 100644 --- a/d2layouts/d2dagrelayout/layout.go +++ b/d2layouts/d2dagrelayout/layout.go @@ -384,7 +384,7 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err if isHorizontal && e.Src.Parent != g.Root && e.Dst.Parent != g.Root { moveWholeEdge = true } else { - e.Route[0].Y += stepSize + e.ShiftStart(stepSize, false) } } } @@ -393,7 +393,7 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err if isHorizontal && e.Dst.Parent != g.Root && e.Src.Parent != g.Root { moveWholeEdge = true } else { - e.Route[len(e.Route)-1].Y += stepSize + e.ShiftEnd(stepSize, false) } } } diff --git a/lib/geo/point.go b/lib/geo/point.go index 0b0a4ff51..ab8e034a0 100644 --- a/lib/geo/point.go +++ b/lib/geo/point.go @@ -305,3 +305,22 @@ func (p *Point) TruncateDecimals() { p.X = TruncateDecimals(p.X) p.Y = TruncateDecimals(p.Y) } + +// RemovePoints returns a new Points slice without the points in toRemove +func RemovePoints(points Points, toRemove []bool) Points { + newLen := len(points) + for _, should := range toRemove { + if should { + newLen-- + } + } + + without := make([]*Point, 0, newLen) + for i := 0; i < len(points); i++ { + if toRemove[i] { + continue + } + without = append(without, points[i]) + } + return without +} From 2c0142abfdb0aba77ea07afe9e5581a107ae58e4 Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Fri, 2 Jun 2023 15:46:30 -0700 Subject: [PATCH 45/62] update test --- .../dagre/board.exp.json | 14 +- .../dagre/sketch.exp.svg | 158 +++++++++--------- 2 files changed, 80 insertions(+), 92 deletions(-) diff --git a/e2etests/testdata/stable/multiple_box_selection/dagre/board.exp.json b/e2etests/testdata/stable/multiple_box_selection/dagre/board.exp.json index edc87a5af..defb282e2 100644 --- a/e2etests/testdata/stable/multiple_box_selection/dagre/board.exp.json +++ b/e2etests/testdata/stable/multiple_box_selection/dagre/board.exp.json @@ -352,19 +352,7 @@ }, { "x": 134, - "y": 444.79998779296875 - }, - { - "x": 134, - "y": 452 - }, - { - "x": 134, - "y": 467 - }, - { - "x": 134, - "y": 482 + "y": 484.79998779296875 }, { "x": 134, diff --git a/e2etests/testdata/stable/multiple_box_selection/dagre/sketch.exp.svg b/e2etests/testdata/stable/multiple_box_selection/dagre/sketch.exp.svg index 07623dea1..cd9d766d3 100644 --- a/e2etests/testdata/stable/multiple_box_selection/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/multiple_box_selection/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -outerstartendvolume groupvolume definitionvolume + .d2-240483443 .fill-N1{fill:#0A0F25;} + .d2-240483443 .fill-N2{fill:#676C7E;} + .d2-240483443 .fill-N3{fill:#9499AB;} + .d2-240483443 .fill-N4{fill:#CFD2DD;} + .d2-240483443 .fill-N5{fill:#DEE1EB;} + .d2-240483443 .fill-N6{fill:#EEF1F8;} + .d2-240483443 .fill-N7{fill:#FFFFFF;} + .d2-240483443 .fill-B1{fill:#0D32B2;} + .d2-240483443 .fill-B2{fill:#0D32B2;} + .d2-240483443 .fill-B3{fill:#E3E9FD;} + .d2-240483443 .fill-B4{fill:#E3E9FD;} + .d2-240483443 .fill-B5{fill:#EDF0FD;} + .d2-240483443 .fill-B6{fill:#F7F8FE;} + .d2-240483443 .fill-AA2{fill:#4A6FF3;} + .d2-240483443 .fill-AA4{fill:#EDF0FD;} + .d2-240483443 .fill-AA5{fill:#F7F8FE;} + .d2-240483443 .fill-AB4{fill:#EDF0FD;} + .d2-240483443 .fill-AB5{fill:#F7F8FE;} + .d2-240483443 .stroke-N1{stroke:#0A0F25;} + .d2-240483443 .stroke-N2{stroke:#676C7E;} + .d2-240483443 .stroke-N3{stroke:#9499AB;} + .d2-240483443 .stroke-N4{stroke:#CFD2DD;} + .d2-240483443 .stroke-N5{stroke:#DEE1EB;} + .d2-240483443 .stroke-N6{stroke:#EEF1F8;} + .d2-240483443 .stroke-N7{stroke:#FFFFFF;} + .d2-240483443 .stroke-B1{stroke:#0D32B2;} + .d2-240483443 .stroke-B2{stroke:#0D32B2;} + .d2-240483443 .stroke-B3{stroke:#E3E9FD;} + .d2-240483443 .stroke-B4{stroke:#E3E9FD;} + .d2-240483443 .stroke-B5{stroke:#EDF0FD;} + .d2-240483443 .stroke-B6{stroke:#F7F8FE;} + .d2-240483443 .stroke-AA2{stroke:#4A6FF3;} + .d2-240483443 .stroke-AA4{stroke:#EDF0FD;} + .d2-240483443 .stroke-AA5{stroke:#F7F8FE;} + .d2-240483443 .stroke-AB4{stroke:#EDF0FD;} + .d2-240483443 .stroke-AB5{stroke:#F7F8FE;} + .d2-240483443 .background-color-N1{background-color:#0A0F25;} + .d2-240483443 .background-color-N2{background-color:#676C7E;} + .d2-240483443 .background-color-N3{background-color:#9499AB;} + .d2-240483443 .background-color-N4{background-color:#CFD2DD;} + .d2-240483443 .background-color-N5{background-color:#DEE1EB;} + .d2-240483443 .background-color-N6{background-color:#EEF1F8;} + .d2-240483443 .background-color-N7{background-color:#FFFFFF;} + .d2-240483443 .background-color-B1{background-color:#0D32B2;} + .d2-240483443 .background-color-B2{background-color:#0D32B2;} + .d2-240483443 .background-color-B3{background-color:#E3E9FD;} + .d2-240483443 .background-color-B4{background-color:#E3E9FD;} + .d2-240483443 .background-color-B5{background-color:#EDF0FD;} + .d2-240483443 .background-color-B6{background-color:#F7F8FE;} + .d2-240483443 .background-color-AA2{background-color:#4A6FF3;} + .d2-240483443 .background-color-AA4{background-color:#EDF0FD;} + .d2-240483443 .background-color-AA5{background-color:#F7F8FE;} + .d2-240483443 .background-color-AB4{background-color:#EDF0FD;} + .d2-240483443 .background-color-AB5{background-color:#F7F8FE;} + .d2-240483443 .color-N1{color:#0A0F25;} + .d2-240483443 .color-N2{color:#676C7E;} + .d2-240483443 .color-N3{color:#9499AB;} + .d2-240483443 .color-N4{color:#CFD2DD;} + .d2-240483443 .color-N5{color:#DEE1EB;} + .d2-240483443 .color-N6{color:#EEF1F8;} + .d2-240483443 .color-N7{color:#FFFFFF;} + .d2-240483443 .color-B1{color:#0D32B2;} + .d2-240483443 .color-B2{color:#0D32B2;} + .d2-240483443 .color-B3{color:#E3E9FD;} + .d2-240483443 .color-B4{color:#E3E9FD;} + .d2-240483443 .color-B5{color:#EDF0FD;} + .d2-240483443 .color-B6{color:#F7F8FE;} + .d2-240483443 .color-AA2{color:#4A6FF3;} + .d2-240483443 .color-AA4{color:#EDF0FD;} + .d2-240483443 .color-AA5{color:#F7F8FE;} + .d2-240483443 .color-AB4{color:#EDF0FD;} + .d2-240483443 .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}]]>outerstartendvolume groupvolume definitionvolume \ No newline at end of file From a2ccb6a3dc093b32eb601aa41c8ae700b7e99e6b Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Fri, 2 Jun 2023 15:48:43 -0700 Subject: [PATCH 46/62] also update ShiftDescendants --- d2graph/layout.go | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/d2graph/layout.go b/d2graph/layout.go index 25b66795b..1bec09adc 100644 --- a/d2graph/layout.go +++ b/d2graph/layout.go @@ -127,11 +127,23 @@ func (obj *Object) ShiftDescendants(dx, dy float64) { p.Y += dy } } else if isSrc { - e.Route[0].X += dx - e.Route[0].Y += dy + if dx == 0 { + e.ShiftStart(dy, false) + } else if dy == 0 { + e.ShiftStart(dx, true) + } else { + e.Route[0].X += dx + e.Route[0].Y += dy + } } else if isDst { - e.Route[len(e.Route)-1].X += dx - e.Route[len(e.Route)-1].Y += dy + if dx == 0 { + e.ShiftEnd(dy, false) + } else if dy == 0 { + e.ShiftEnd(dx, true) + } else { + e.Route[len(e.Route)-1].X += dx + e.Route[len(e.Route)-1].Y += dy + } } if isSrc || isDst { From 171d5357df51994791c4e06056b4544e8934f4cc Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Fri, 2 Jun 2023 15:59:42 -0700 Subject: [PATCH 47/62] changelog --- ci/release/changelogs/next.md | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/release/changelogs/next.md b/ci/release/changelogs/next.md index 0735e46d5..d38d71c61 100644 --- a/ci/release/changelogs/next.md +++ b/ci/release/changelogs/next.md @@ -19,3 +19,4 @@ - When multiple classes are applied changing different attributes of arrowheads, they are all applied instead of only the last one [#1362](https://github.com/terrastruct/d2/pull/1362) - Prevent empty block strings [#1364](https://github.com/terrastruct/d2/pull/1364) +- Fixes dagre mis-aligning a nested shape's connection. [#1370](https://github.com/terrastruct/d2/pull/1370) From 430ff4cab980a48f5c41307b9c0c1734e27d4052 Mon Sep 17 00:00:00 2001 From: satoqz Date: Sat, 3 Jun 2023 13:54:06 +0200 Subject: [PATCH 48/62] join constraints with comma --- d2graph/d2graph.go | 2 +- d2target/sqltable.go | 2 +- .../stable/sql_table_constraints_width/dagre/sketch.exp.svg | 4 ++-- .../stable/sql_table_constraints_width/elk/sketch.exp.svg | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/d2graph/d2graph.go b/d2graph/d2graph.go index e916c9b37..72b48a4ea 100644 --- a/d2graph/d2graph.go +++ b/d2graph/d2graph.go @@ -1037,7 +1037,7 @@ func (obj *Object) GetDefaultSize(mtexts []*d2target.MText, ruler *textmeasure.R maxTypeWidth = go2.Max(maxTypeWidth, typeDims.Width) if l := len(c.Constraint); l > 0 { - // 60 covers UNQ constraint with padding, 40 for further constraints covers UNQ + space + // 60 covers UNQ constraint with padding, 40 for further constraints covers UNQ + comma + space if newWidth := 60 + 40*(l-1); newWidth > constraintWidth { constraintWidth = newWidth } diff --git a/d2target/sqltable.go b/d2target/sqltable.go index f5bc1ee4e..bfb1e45d9 100644 --- a/d2target/sqltable.go +++ b/d2target/sqltable.go @@ -60,5 +60,5 @@ func (c SQLColumn) ConstraintAbbr() string { abbrs = append(abbrs, abbr) } - return strings.Join(abbrs, " ") + return strings.Join(abbrs, ", ") } diff --git a/e2etests/testdata/stable/sql_table_constraints_width/dagre/sketch.exp.svg b/e2etests/testdata/stable/sql_table_constraints_width/dagre/sketch.exp.svg index d294404e2..296755423 100644 --- a/e2etests/testdata/stable/sql_table_constraints_width/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sql_table_constraints_width/dagre/sketch.exp.svg @@ -4,7 +4,7 @@ } @font-face { font-family: d2-645322524-font-regular; - src: url("data:application/font-woff;base64,d09GRgABAAAAAAmIAAoAAAAADtgAAguFAAAAAAAAAAAAAAAAAAAAAAAAAABPUy8yAAAA9AAAAGAAAABgXd/Vo2NtYXAAAAFUAAAAbgAAAIoBtQJnZ2x5ZgAAAcQAAAOoAAAENJy9nFNoZWFkAAAFbAAAADYAAAA2G4Ue32hoZWEAAAWkAAAAJAAAACQKhAXRaG10eAAABcgAAAA8AAAAPB5RA7Nsb2NhAAAGBAAAACAAAAAgBooHqm1heHAAAAYkAAAAIAAAACAAJwD2bmFtZQAABkQAAAMjAAAIFAbDVU1wb3N0AAAJaAAAAB0AAAAg/9EAMgADAgkBkAAFAAACigJYAAAASwKKAlgAAAFeADIBIwAAAgsFAwMEAwICBGAAAvcAAAADAAAAAAAAAABBREJPAEAAIP//Au7/BgAAA9gBESAAAZ8AAAAAAeYClAAAACAAA3icZMxPCgEBAEfhb8z4P2ThAE6jpERxAOUAlk7iDvYichkn+cmslLd8iw+FUoFa5YipiVJlZm5haWVj5+CU8HPXtvbfm3deeeaRe2655pJz4/1XaDVyW0dXT9/AUG1kzAcAAP//AQAA//9SbBoNAAB4nDyST0zb5hvHn/d1sMWPAD83sQ0oKYlfsJvAgNqxDSQLkDQJoEoJuAn5o9G1VAoQVpVWWgXtiqat7S7rrLVSD/t33mHadtkOvVVb1cumHaZJnaZq2qFCmjppVSZNrHGmOGW3V4+e5/t9vp/nhQ4oAWAN3wEKOqEXjgAHoLJBdjgoy4QxVMMgAmXIiGVK6BfbQmgh4tJ11/HE74mdvT1UvIbvNLam365Wv129fNl+98m+raDv9wFBGQD9iC3odPS4IKdyhC2jXfvRwQG20o/T9s8A7T74DFtAtfpUtmxiq3GhXccz2AJ3u64ilfEQiuHKJoXY1e+evvLNNrbsr9HCgb2J8td/eKGFX8IWeJwZj6BKksaqLKFkwvMcWy48zbgoJlv4I+NyMdiyz72j1CLIbFxAH908vh6xPwXsaHRhC7rA66goPM95aUJYVlV0LSIRUr63eD5+Y2vrbMFcKaxiayg/Xz1nP0fzc+mMAQAYIs0KvoQ/hG4IAwwrujMn0pyX5ztESR7DWkTXXyjTDM+rim4INI1ORlcmNovFzYkioiq7/sxWLLO3bF6bn15PC3mNF7v/36tMJa+c2r11a/fUleTjUvJ/xfdf3bi7tHR3Y9UquUdGO1yzdKfD1QeAnmMLmFYKogU5wv72AP36AC+m042vwOlZadbxGLZaN+8Q26y8zja686RplEzW4mYoNTKaDuXim2796gZ6034jW5GkSha9Ze9tXNWdvHX0JXoGAzAEIIiSFtGNiNSKzMhOUI4lMqFpWdENjW5xuP/y0nsfsCPHwov+gLg2XcqdYChxiSdxsnNGcS/M5fLs4CQJeKf40GsV+6dpXzghDt7sjY2HhgHDcrOO/sEPwQMBZ3OZMIRVOabt5XWM2sgZjudRSFwIUExiGQezx06fjZ5Ox7LR1OAsCcy4g34FP7xf9Ms3ts3X46lqObcmBpo+oc1nrFlHn6NnLZYOn/bVBMaJ1opxeLgjs+uxuVp8ItUf5sb9oynZTIrT/FAw545dzC1fjImC7ukbz0+aVb/X8Adbf2S8WUePDjO0mTnisqYewjK0/4z+rpyPnjHC8YDLPMFQvpP9s7HBqaPyjJR2X9/JXoofHTDvNSanfKFU0vYJ4+bkyhog6AFAX6An0A+gGrIq8Lyg6rphqIxAZElquTBMzye3S3Ndfd2uLr4rWrj9cSnTPdDj6u5zJ+z9mifs9YY9tT//2uZHOW5E2Ab4FwAA//8BAAD//7i28pAAAQAAAAILhQm0cblfDzz1AAMD6AAAAADYXaChAAAAAN1mLzb+Ov7bCG8DyAAAAAMAAgAAAAAAAAABAAAD2P7vAAAImP46/joIbwABAAAAAAAAAAAAAAAAAAAADwKNAFkAyAAAAe4AWgEHAFoCQwBaAocAWgI2AFoCmAA0AhgAHAKFAFcB+AA0AikAUgHIAC4CKwAvAb4ADgAAACwALABAAEwAZgCIAKoA7AD+ASIBWgGOAbwB7gIaAAEAAAAPAIwADABmAAcAAQAAAAAAAAAAAAAAAAAEAAN4nJyU3U4bVxSFPwfbbVQ1FxWKyA06l22VjN0IogSuTAmKVYRTj9Mfqao0eMY/Yjwz8gxQqj5Ar/sWfYtc9Tn6EFWvq7O8DTaqFIEQsM6cvfdZZ6+1D7DJv2xQqz8E/mr+YLjGdnPP8AMeNZ8a3uC48bfh+kpMg7jxm+EmXzb6hj/iff0Pwx+zU//Z8EO26keGP+F5fdPwpxuOfww/Yof3C1yDl/xuuMYWheEHbPKT4Q0eYzVrdR7TNtzgM7YNN9kGBkypSJmSMcYxYsqYc+YklIQkzJkyIiHG0aVDSqWvGZGQY/y/XyNCKuZEqjihwpESkhJRMrGKvyor561OHGk1t70OFRMiTpVxRkSGI2dMTkbCmepUVBTs0aJFyVB8CypKAkqmpATkzBnToscRxwyYMKXEcaRKnllIzoiKSyKd7yzCd2ZIQkZprM7JiMXTiV+i7C7HOHoUil2tfLxW4SmO75TtueWK/YpAv26F2fq5SzYRF+pnqq6k2rmUghPt+nM7fCtcsYe7V3/WmXy4R7H+V6p8yrn0j6VUJiYZzm3RIZSDQvcEx4HWXUJ15Hu6DHhDj3cMtO7Qp0+HEwZ0ea3cHn0cX9PjhENldIUXe0dyzAk/4viGrmJ87cT6s1As4RcKc3cpjnPdY0ahnnvmge6a6IZ3V9jPUL7mjlI5Q82Rj3TSL9OcRYzNFYUYztTLpTdK619sjpjpLl7bm30/DRc2e8spviLXDHu3Ljh55RaMPqRqcMszl/oJiIjJOVXEkJwZLSquxPstEeekOA7VvTeakorOdY4/50ouSZiJQZdMdeYU+huZb0LjPlzzvbO3JFa+Z3p2fav7nOLUqxuN3ql7y73QupysKNAyVfMVNw3FNTPvJ5qpVf6hcku9bjnP6JNI9VQ3uP0OPCegzQ677DPROUPtXNgb0dY70eYV++rBGYmiRnJ1YhV2CXjBLru84sVazQ6HHNBj/w4cF1k9Dnh9a2ddp2UVZ3X+FJu2+DqeXa9e3luvz+/gyy80UTcvY1/a+G5fWLUb/58QMfNc3NbqndwTgv8AAAD//wEAAP//B1tMMAB4nGJgZgCD/+cYjBiwAAAAAAD//wEAAP//LwECAwAAAA=="); + src: url("data:application/font-woff;base64,d09GRgABAAAAAAnEAAoAAAAADygAAguFAAAAAAAAAAAAAAAAAAAAAAAAAABPUy8yAAAA9AAAAGAAAABgXd/Vo2NtYXAAAAFUAAAAdQAAAJQCMgJDZ2x5ZgAAAcwAAAPUAAAEdNtYDBdoZWFkAAAFoAAAADYAAAA2G4Ue32hoZWEAAAXYAAAAJAAAACQKhAXSaG10eAAABfwAAABAAAAAQB9KA+Jsb2NhAAAGPAAAACIAAAAiCMQHqm1heHAAAAZgAAAAIAAAACAAKAD2bmFtZQAABoAAAAMjAAAIFAbDVU1wb3N0AAAJpAAAAB0AAAAg/9EAMgADAgkBkAAFAAACigJYAAAASwKKAlgAAAFeADIBIwAAAgsFAwMEAwICBGAAAvcAAAADAAAAAAAAAABBREJPAEAAIP//Au7/BgAAA9gBESAAAZ8AAAAAAeYClAAAACAAA3icbMxLCkFhGIDh5/cfx+24jIwtwDqUlCgWoCyCjdiDuYhsRhbyiZk67/AZvEiyhErhiLGRrDQxNTO3sLS2tXeI4M9XNnZfj1e84xmPuMctrnGJc5x+17qSoYas0FRqaevo6qn0DfgAAAD//wEAAP//laocYwAAAHicPJJbbNtUGMe/c5zaGk1b3MR2W5I18WntJu2aLo7tXkJ6yeK01aSk9ZrmIjq6TuqVae0kpnZjFYJtvDAsNmkP3J5BQsALPOxtgmovIB4Q0hCaEA9TJTQkpiKhsjgo9sqbdfSd///8fp+hAUoAWMV3gIJj0AKtwAEobJjtDssyYXRF14lA6TJimRL61bYQmkp4NM1zcuKPie3dXVS8hu9UN4bfXl7+buHyZfvdx/t2HP2wDwjKAOgnbMExJ48LcwpH2DLasR8eHmLLeGTYvwC4c/A5toCqzyls2cRW9aJ7jkexBV73XEEK4yMUw5VNCrEL3z955dtNbNnfoKlDew3NXf/xeRY+gS3wOXd8giJJKquwhJIJz3NsufAk66GYXOHPrMfDYMs+/058PYHM6kX00c2TKwn7U8BORiO2oBH8Tkqc5zk/TQjLKnFNTUiElO9NX0jd2Ng4VzDnCwvY6pqbXD5vP0OT40ZWBwAMiVoFX8IfQhNEAbrjmnNPpDk/zzeIktyP1YSmPU+mGZ5X4pou0DQ6PTI/sFYsrg0UEVXZCWY3ktndWfPa5PCKIcypvNj0Ykt8KH3lzM6tWztnrqQfldIvFN9/dfXuzMzd1QWr5O3ta/CM0cccrwEA9AxbwNQpiBrmCPv7HvptD08bRvVrcGbmawe4H1v1nTeIriu/8xrN+aRplE6vp8xIprfPiORTa17t6ip6034jV5GkSg69Ze+uXtUc3gP0FXoKHdAFIIiSmtD0hFRHZmQHlGOJTGhajmu6Stc93H955r0P2N6e6HQwJC4Nl/KnGEqc4UmKbC/GvVPj+Tm2c5CE/EN85LWK/fNwIDohdt5sScYi3YBhtnaA/sUPwAch5+UyYQircIzb5XeKXOUMx/MoIk6FKGZiFodzPWfPjZw1krmRTOcYCY16w8E4fnC/GJRvbJqvpzLL5fySGKoFBNdPf+0AfYGe1l06ftytCYyDVsc4Wlzr2EpyfD01kGmPcrFgX0Y20+Iw3xXOe5Nb+dmtpChovrbY3KC5HPTrwXD9H4nVDtDDIwbXmRMuq8qRLF39v+ifyoWRRT2aCnnMUwwVON0+luwcOi6PSob3+nbuUup4h3mvOjgUiGTSdkCImYPzS4CgGQB9iR5DO4Ciy4rA84KiabquMAKRJanewjDNn9wujTe2NXka+caRwu2PS9mmjmZPU5t3wt5f90X9/qhv/a+/N/k+jusVNh0vsVoB9mALWgEEWdNkWiQOgGs/7e8dQJjGbaSrPdRtfDbgG+1BwcBLnYkTY4sA/wEAAP//AQAA//+33fyWAAEAAAACC4WFHY+tXw889QADA+gAAAAA2F2goQAAAADdZi82/jr+2whvA8gAAAADAAIAAAAAAAAAAQAAA9j+7wAACJj+Ov46CG8AAQAAAAAAAAAAAAAAAAAAABACjQBZAMgAAAHuAFoBBwBaAkMAWgKHAFoCNgBaApgANAIYABwChQBXAfgANAIpAFIByAAuAisALwG+AA4A+QAvAAAALAAsAEAATABmAIgAqgDsAP4BIgFaAY4BvAHuAhoCOgAAAAEAAAAQAIwADABmAAcAAQAAAAAAAAAAAAAAAAAEAAN4nJyU3U4bVxSFPwfbbVQ1FxWKyA06l22VjN0IogSuTAmKVYRTj9Mfqao0eMY/Yjwz8gxQqj5Ar/sWfYtc9Tn6EFWvq7O8DTaqFIEQsM6cvfdZZ6+1D7DJv2xQqz8E/mr+YLjGdnPP8AMeNZ8a3uC48bfh+kpMg7jxm+EmXzb6hj/iff0Pwx+zU//Z8EO26keGP+F5fdPwpxuOfww/Yof3C1yDl/xuuMYWheEHbPKT4Q0eYzVrdR7TNtzgM7YNN9kGBkypSJmSMcYxYsqYc+YklIQkzJkyIiHG0aVDSqWvGZGQY/y/XyNCKuZEqjihwpESkhJRMrGKvyor561OHGk1t70OFRMiTpVxRkSGI2dMTkbCmepUVBTs0aJFyVB8CypKAkqmpATkzBnToscRxwyYMKXEcaRKnllIzoiKSyKd7yzCd2ZIQkZprM7JiMXTiV+i7C7HOHoUil2tfLxW4SmO75TtueWK/YpAv26F2fq5SzYRF+pnqq6k2rmUghPt+nM7fCtcsYe7V3/WmXy4R7H+V6p8yrn0j6VUJiYZzm3RIZSDQvcEx4HWXUJ15Hu6DHhDj3cMtO7Qp0+HEwZ0ea3cHn0cX9PjhENldIUXe0dyzAk/4viGrmJ87cT6s1As4RcKc3cpjnPdY0ahnnvmge6a6IZ3V9jPUL7mjlI5Q82Rj3TSL9OcRYzNFYUYztTLpTdK619sjpjpLl7bm30/DRc2e8spviLXDHu3Ljh55RaMPqRqcMszl/oJiIjJOVXEkJwZLSquxPstEeekOA7VvTeakorOdY4/50ouSZiJQZdMdeYU+huZb0LjPlzzvbO3JFa+Z3p2fav7nOLUqxuN3ql7y73QupysKNAyVfMVNw3FNTPvJ5qpVf6hcku9bjnP6JNI9VQ3uP0OPCegzQ677DPROUPtXNgb0dY70eYV++rBGYmiRnJ1YhV2CXjBLru84sVazQ6HHNBj/w4cF1k9Dnh9a2ddp2UVZ3X+FJu2+DqeXa9e3luvz+/gyy80UTcvY1/a+G5fWLUb/58QMfNc3NbqndwTgv8AAAD//wEAAP//B1tMMAB4nGJgZgCD/+cYjBiwAAAAAAD//wEAAP//LwECAwAAAA=="); }]]>axINTUNQbxINTPK FKcxINTFK UNQdxINTPK FK UNQ + .d2-645322524 .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}]]>axINTUNQbxINTPK, FKcxINTFK, UNQdxINTPK, FK, UNQ \ No newline at end of file diff --git a/e2etests/testdata/stable/sql_table_constraints_width/elk/sketch.exp.svg b/e2etests/testdata/stable/sql_table_constraints_width/elk/sketch.exp.svg index f15db75c8..4ebc2069c 100644 --- a/e2etests/testdata/stable/sql_table_constraints_width/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sql_table_constraints_width/elk/sketch.exp.svg @@ -4,7 +4,7 @@ } @font-face { font-family: d2-619706631-font-regular; - src: url("data:application/font-woff;base64,d09GRgABAAAAAAmIAAoAAAAADtgAAguFAAAAAAAAAAAAAAAAAAAAAAAAAABPUy8yAAAA9AAAAGAAAABgXd/Vo2NtYXAAAAFUAAAAbgAAAIoBtQJnZ2x5ZgAAAcQAAAOoAAAENJy9nFNoZWFkAAAFbAAAADYAAAA2G4Ue32hoZWEAAAWkAAAAJAAAACQKhAXRaG10eAAABcgAAAA8AAAAPB5RA7Nsb2NhAAAGBAAAACAAAAAgBooHqm1heHAAAAYkAAAAIAAAACAAJwD2bmFtZQAABkQAAAMjAAAIFAbDVU1wb3N0AAAJaAAAAB0AAAAg/9EAMgADAgkBkAAFAAACigJYAAAASwKKAlgAAAFeADIBIwAAAgsFAwMEAwICBGAAAvcAAAADAAAAAAAAAABBREJPAEAAIP//Au7/BgAAA9gBESAAAZ8AAAAAAeYClAAAACAAA3icZMxPCgEBAEfhb8z4P2ThAE6jpERxAOUAlk7iDvYichkn+cmslLd8iw+FUoFa5YipiVJlZm5haWVj5+CU8HPXtvbfm3deeeaRe2655pJz4/1XaDVyW0dXT9/AUG1kzAcAAP//AQAA//9SbBoNAAB4nDyST0zb5hvHn/d1sMWPAD83sQ0oKYlfsJvAgNqxDSQLkDQJoEoJuAn5o9G1VAoQVpVWWgXtiqat7S7rrLVSD/t33mHadtkOvVVb1cumHaZJnaZq2qFCmjppVSZNrHGmOGW3V4+e5/t9vp/nhQ4oAWAN3wEKOqEXjgAHoLJBdjgoy4QxVMMgAmXIiGVK6BfbQmgh4tJ11/HE74mdvT1UvIbvNLam365Wv129fNl+98m+raDv9wFBGQD9iC3odPS4IKdyhC2jXfvRwQG20o/T9s8A7T74DFtAtfpUtmxiq3GhXccz2AJ3u64ilfEQiuHKJoXY1e+evvLNNrbsr9HCgb2J8td/eKGFX8IWeJwZj6BKksaqLKFkwvMcWy48zbgoJlv4I+NyMdiyz72j1CLIbFxAH908vh6xPwXsaHRhC7rA66goPM95aUJYVlV0LSIRUr63eD5+Y2vrbMFcKaxiayg/Xz1nP0fzc+mMAQAYIs0KvoQ/hG4IAwwrujMn0pyX5ztESR7DWkTXXyjTDM+rim4INI1ORlcmNovFzYkioiq7/sxWLLO3bF6bn15PC3mNF7v/36tMJa+c2r11a/fUleTjUvJ/xfdf3bi7tHR3Y9UquUdGO1yzdKfD1QeAnmMLmFYKogU5wv72AP36AC+m042vwOlZadbxGLZaN+8Q26y8zja686RplEzW4mYoNTKaDuXim2796gZ6034jW5GkSha9Ze9tXNWdvHX0JXoGAzAEIIiSFtGNiNSKzMhOUI4lMqFpWdENjW5xuP/y0nsfsCPHwov+gLg2XcqdYChxiSdxsnNGcS/M5fLs4CQJeKf40GsV+6dpXzghDt7sjY2HhgHDcrOO/sEPwQMBZ3OZMIRVOabt5XWM2sgZjudRSFwIUExiGQezx06fjZ5Ox7LR1OAsCcy4g34FP7xf9Ms3ts3X46lqObcmBpo+oc1nrFlHn6NnLZYOn/bVBMaJ1opxeLgjs+uxuVp8ItUf5sb9oynZTIrT/FAw545dzC1fjImC7ukbz0+aVb/X8Adbf2S8WUePDjO0mTnisqYewjK0/4z+rpyPnjHC8YDLPMFQvpP9s7HBqaPyjJR2X9/JXoofHTDvNSanfKFU0vYJ4+bkyhog6AFAX6An0A+gGrIq8Lyg6rphqIxAZElquTBMzye3S3Ndfd2uLr4rWrj9cSnTPdDj6u5zJ+z9mifs9YY9tT//2uZHOW5E2Ab4FwAA//8BAAD//7i28pAAAQAAAAILhQm0cblfDzz1AAMD6AAAAADYXaChAAAAAN1mLzb+Ov7bCG8DyAAAAAMAAgAAAAAAAAABAAAD2P7vAAAImP46/joIbwABAAAAAAAAAAAAAAAAAAAADwKNAFkAyAAAAe4AWgEHAFoCQwBaAocAWgI2AFoCmAA0AhgAHAKFAFcB+AA0AikAUgHIAC4CKwAvAb4ADgAAACwALABAAEwAZgCIAKoA7AD+ASIBWgGOAbwB7gIaAAEAAAAPAIwADABmAAcAAQAAAAAAAAAAAAAAAAAEAAN4nJyU3U4bVxSFPwfbbVQ1FxWKyA06l22VjN0IogSuTAmKVYRTj9Mfqao0eMY/Yjwz8gxQqj5Ar/sWfYtc9Tn6EFWvq7O8DTaqFIEQsM6cvfdZZ6+1D7DJv2xQqz8E/mr+YLjGdnPP8AMeNZ8a3uC48bfh+kpMg7jxm+EmXzb6hj/iff0Pwx+zU//Z8EO26keGP+F5fdPwpxuOfww/Yof3C1yDl/xuuMYWheEHbPKT4Q0eYzVrdR7TNtzgM7YNN9kGBkypSJmSMcYxYsqYc+YklIQkzJkyIiHG0aVDSqWvGZGQY/y/XyNCKuZEqjihwpESkhJRMrGKvyor561OHGk1t70OFRMiTpVxRkSGI2dMTkbCmepUVBTs0aJFyVB8CypKAkqmpATkzBnToscRxwyYMKXEcaRKnllIzoiKSyKd7yzCd2ZIQkZprM7JiMXTiV+i7C7HOHoUil2tfLxW4SmO75TtueWK/YpAv26F2fq5SzYRF+pnqq6k2rmUghPt+nM7fCtcsYe7V3/WmXy4R7H+V6p8yrn0j6VUJiYZzm3RIZSDQvcEx4HWXUJ15Hu6DHhDj3cMtO7Qp0+HEwZ0ea3cHn0cX9PjhENldIUXe0dyzAk/4viGrmJ87cT6s1As4RcKc3cpjnPdY0ahnnvmge6a6IZ3V9jPUL7mjlI5Q82Rj3TSL9OcRYzNFYUYztTLpTdK619sjpjpLl7bm30/DRc2e8spviLXDHu3Ljh55RaMPqRqcMszl/oJiIjJOVXEkJwZLSquxPstEeekOA7VvTeakorOdY4/50ouSZiJQZdMdeYU+huZb0LjPlzzvbO3JFa+Z3p2fav7nOLUqxuN3ql7y73QupysKNAyVfMVNw3FNTPvJ5qpVf6hcku9bjnP6JNI9VQ3uP0OPCegzQ677DPROUPtXNgb0dY70eYV++rBGYmiRnJ1YhV2CXjBLru84sVazQ6HHNBj/w4cF1k9Dnh9a2ddp2UVZ3X+FJu2+DqeXa9e3luvz+/gyy80UTcvY1/a+G5fWLUb/58QMfNc3NbqndwTgv8AAAD//wEAAP//B1tMMAB4nGJgZgCD/+cYjBiwAAAAAAD//wEAAP//LwECAwAAAA=="); + src: url("data:application/font-woff;base64,d09GRgABAAAAAAnEAAoAAAAADygAAguFAAAAAAAAAAAAAAAAAAAAAAAAAABPUy8yAAAA9AAAAGAAAABgXd/Vo2NtYXAAAAFUAAAAdQAAAJQCMgJDZ2x5ZgAAAcwAAAPUAAAEdNtYDBdoZWFkAAAFoAAAADYAAAA2G4Ue32hoZWEAAAXYAAAAJAAAACQKhAXSaG10eAAABfwAAABAAAAAQB9KA+Jsb2NhAAAGPAAAACIAAAAiCMQHqm1heHAAAAZgAAAAIAAAACAAKAD2bmFtZQAABoAAAAMjAAAIFAbDVU1wb3N0AAAJpAAAAB0AAAAg/9EAMgADAgkBkAAFAAACigJYAAAASwKKAlgAAAFeADIBIwAAAgsFAwMEAwICBGAAAvcAAAADAAAAAAAAAABBREJPAEAAIP//Au7/BgAAA9gBESAAAZ8AAAAAAeYClAAAACAAA3icbMxLCkFhGIDh5/cfx+24jIwtwDqUlCgWoCyCjdiDuYhsRhbyiZk67/AZvEiyhErhiLGRrDQxNTO3sLS2tXeI4M9XNnZfj1e84xmPuMctrnGJc5x+17qSoYas0FRqaevo6qn0DfgAAAD//wEAAP//laocYwAAAHicPJJbbNtUGMe/c5zaGk1b3MR2W5I18WntJu2aLo7tXkJ6yeK01aSk9ZrmIjq6TuqVae0kpnZjFYJtvDAsNmkP3J5BQsALPOxtgmovIB4Q0hCaEA9TJTQkpiKhsjgo9sqbdfSd///8fp+hAUoAWMV3gIJj0AKtwAEobJjtDssyYXRF14lA6TJimRL61bYQmkp4NM1zcuKPie3dXVS8hu9UN4bfXl7+buHyZfvdx/t2HP2wDwjKAOgnbMExJ48LcwpH2DLasR8eHmLLeGTYvwC4c/A5toCqzyls2cRW9aJ7jkexBV73XEEK4yMUw5VNCrEL3z955dtNbNnfoKlDew3NXf/xeRY+gS3wOXd8giJJKquwhJIJz3NsufAk66GYXOHPrMfDYMs+/058PYHM6kX00c2TKwn7U8BORiO2oBH8Tkqc5zk/TQjLKnFNTUiElO9NX0jd2Ng4VzDnCwvY6pqbXD5vP0OT40ZWBwAMiVoFX8IfQhNEAbrjmnNPpDk/zzeIktyP1YSmPU+mGZ5X4pou0DQ6PTI/sFYsrg0UEVXZCWY3ktndWfPa5PCKIcypvNj0Ykt8KH3lzM6tWztnrqQfldIvFN9/dfXuzMzd1QWr5O3ta/CM0cccrwEA9AxbwNQpiBrmCPv7HvptD08bRvVrcGbmawe4H1v1nTeIriu/8xrN+aRplE6vp8xIprfPiORTa17t6ip6034jV5GkSg69Ze+uXtUc3gP0FXoKHdAFIIiSmtD0hFRHZmQHlGOJTGhajmu6Stc93H955r0P2N6e6HQwJC4Nl/KnGEqc4UmKbC/GvVPj+Tm2c5CE/EN85LWK/fNwIDohdt5sScYi3YBhtnaA/sUPwAch5+UyYQircIzb5XeKXOUMx/MoIk6FKGZiFodzPWfPjZw1krmRTOcYCY16w8E4fnC/GJRvbJqvpzLL5fySGKoFBNdPf+0AfYGe1l06ftytCYyDVsc4Wlzr2EpyfD01kGmPcrFgX0Y20+Iw3xXOe5Nb+dmtpChovrbY3KC5HPTrwXD9H4nVDtDDIwbXmRMuq8qRLF39v+ifyoWRRT2aCnnMUwwVON0+luwcOi6PSob3+nbuUup4h3mvOjgUiGTSdkCImYPzS4CgGQB9iR5DO4Ciy4rA84KiabquMAKRJanewjDNn9wujTe2NXka+caRwu2PS9mmjmZPU5t3wt5f90X9/qhv/a+/N/k+jusVNh0vsVoB9mALWgEEWdNkWiQOgGs/7e8dQJjGbaSrPdRtfDbgG+1BwcBLnYkTY4sA/wEAAP//AQAA//+33fyWAAEAAAACC4WFHY+tXw889QADA+gAAAAA2F2goQAAAADdZi82/jr+2whvA8gAAAADAAIAAAAAAAAAAQAAA9j+7wAACJj+Ov46CG8AAQAAAAAAAAAAAAAAAAAAABACjQBZAMgAAAHuAFoBBwBaAkMAWgKHAFoCNgBaApgANAIYABwChQBXAfgANAIpAFIByAAuAisALwG+AA4A+QAvAAAALAAsAEAATABmAIgAqgDsAP4BIgFaAY4BvAHuAhoCOgAAAAEAAAAQAIwADABmAAcAAQAAAAAAAAAAAAAAAAAEAAN4nJyU3U4bVxSFPwfbbVQ1FxWKyA06l22VjN0IogSuTAmKVYRTj9Mfqao0eMY/Yjwz8gxQqj5Ar/sWfYtc9Tn6EFWvq7O8DTaqFIEQsM6cvfdZZ6+1D7DJv2xQqz8E/mr+YLjGdnPP8AMeNZ8a3uC48bfh+kpMg7jxm+EmXzb6hj/iff0Pwx+zU//Z8EO26keGP+F5fdPwpxuOfww/Yof3C1yDl/xuuMYWheEHbPKT4Q0eYzVrdR7TNtzgM7YNN9kGBkypSJmSMcYxYsqYc+YklIQkzJkyIiHG0aVDSqWvGZGQY/y/XyNCKuZEqjihwpESkhJRMrGKvyor561OHGk1t70OFRMiTpVxRkSGI2dMTkbCmepUVBTs0aJFyVB8CypKAkqmpATkzBnToscRxwyYMKXEcaRKnllIzoiKSyKd7yzCd2ZIQkZprM7JiMXTiV+i7C7HOHoUil2tfLxW4SmO75TtueWK/YpAv26F2fq5SzYRF+pnqq6k2rmUghPt+nM7fCtcsYe7V3/WmXy4R7H+V6p8yrn0j6VUJiYZzm3RIZSDQvcEx4HWXUJ15Hu6DHhDj3cMtO7Qp0+HEwZ0ea3cHn0cX9PjhENldIUXe0dyzAk/4viGrmJ87cT6s1As4RcKc3cpjnPdY0ahnnvmge6a6IZ3V9jPUL7mjlI5Q82Rj3TSL9OcRYzNFYUYztTLpTdK619sjpjpLl7bm30/DRc2e8spviLXDHu3Ljh55RaMPqRqcMszl/oJiIjJOVXEkJwZLSquxPstEeekOA7VvTeakorOdY4/50ouSZiJQZdMdeYU+huZb0LjPlzzvbO3JFa+Z3p2fav7nOLUqxuN3ql7y73QupysKNAyVfMVNw3FNTPvJ5qpVf6hcku9bjnP6JNI9VQ3uP0OPCegzQ677DPROUPtXNgb0dY70eYV++rBGYmiRnJ1YhV2CXjBLru84sVazQ6HHNBj/w4cF1k9Dnh9a2ddp2UVZ3X+FJu2+DqeXa9e3luvz+/gyy80UTcvY1/a+G5fWLUb/58QMfNc3NbqndwTgv8AAAD//wEAAP//B1tMMAB4nGJgZgCD/+cYjBiwAAAAAAD//wEAAP//LwECAwAAAA=="); }]]>axINTUNQbxINTPK FKcxINTFK UNQdxINTPK FK UNQ + .d2-619706631 .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}]]>axINTUNQbxINTPK, FKcxINTFK, UNQdxINTPK, FK, UNQ \ No newline at end of file From 665844db393a661fa9d5f1365df9122dd8813acd Mon Sep 17 00:00:00 2001 From: satoqz Date: Sat, 3 Jun 2023 14:05:18 +0200 Subject: [PATCH 49/62] TA=1 --- .../sketch.exp.svg | 160 ++--- .../d2sketch/testdata/opacity/sketch.exp.svg | 560 ++++++++--------- .../testdata/opacity_dark/sketch.exp.svg | 560 ++++++++--------- .../testdata/sql_tables/sketch.exp.svg | 154 ++--- .../testdata/sql_tables_dark/sketch.exp.svg | 154 ++--- .../testdata/opacity/dark_theme.exp.svg | 560 ++++++++--------- .../testdata/sql_tables/dark_theme.exp.svg | 152 ++--- .../TestCLI_E2E/internal_linked_pdf.exp.pdf | Bin 79993 -> 79993 bytes .../patterns/real-lines/dagre/board.exp.json | 20 +- .../patterns/real-lines/dagre/sketch.exp.svg | 166 ++--- .../dagre/board.exp.json | 2 +- .../dagre/sketch.exp.svg | 158 ++--- .../elk/board.exp.json | 2 +- .../elk/sketch.exp.svg | 158 ++--- .../sql_table_overflow/dagre/board.exp.json | 12 +- .../sql_table_overflow/dagre/sketch.exp.svg | 152 ++--- .../sql_table_overflow/elk/board.exp.json | 12 +- .../sql_table_overflow/elk/sketch.exp.svg | 152 ++--- .../dagre/board.exp.json | 10 +- .../dagre/sketch.exp.svg | 166 ++--- .../elk/board.exp.json | 10 +- .../elk/sketch.exp.svg | 166 ++--- .../stable/array-classes/dagre/board.exp.json | 8 + .../stable/array-classes/dagre/sketch.exp.svg | 152 ++--- .../stable/array-classes/elk/board.exp.json | 8 + .../stable/array-classes/elk/sketch.exp.svg | 152 ++--- .../dagre/board.exp.json | 14 +- .../dagre/sketch.exp.svg | 158 ++--- .../elk/board.exp.json | 14 +- .../elk/sketch.exp.svg | 158 ++--- .../stable/ent2d2_basic/dagre/board.exp.json | 50 +- .../stable/ent2d2_basic/dagre/sketch.exp.svg | 158 ++--- .../stable/ent2d2_basic/elk/board.exp.json | 50 +- .../stable/ent2d2_basic/elk/sketch.exp.svg | 158 ++--- .../stable/ent2d2_right/dagre/board.exp.json | 50 +- .../stable/ent2d2_right/dagre/sketch.exp.svg | 158 ++--- .../stable/ent2d2_right/elk/board.exp.json | 50 +- .../stable/ent2d2_right/elk/sketch.exp.svg | 158 ++--- .../stable/grid_nested/dagre/board.exp.json | 20 + .../stable/grid_nested/dagre/sketch.exp.svg | 158 ++--- .../stable/grid_nested/elk/board.exp.json | 20 + .../stable/grid_nested/elk/sketch.exp.svg | 158 ++--- .../dagre/board.exp.json | 4 +- .../dagre/sketch.exp.svg | 172 +++--- .../elk/board.exp.json | 4 +- .../elk/sketch.exp.svg | 172 +++--- .../dagre/board.exp.json | 8 +- .../dagre/sketch.exp.svg | 158 ++--- .../elk/board.exp.json | 8 +- .../elk/sketch.exp.svg | 158 ++--- .../dagre/sketch.exp.svg | 4 +- .../elk/sketch.exp.svg | 4 +- .../dagre/board.exp.json | 4 +- .../dagre/sketch.exp.svg | 154 ++--- .../elk/board.exp.json | 4 +- .../elk/sketch.exp.svg | 154 ++--- .../stable/sql_tables/dagre/board.exp.json | 34 +- .../stable/sql_tables/dagre/sketch.exp.svg | 152 ++--- .../stable/sql_tables/elk/board.exp.json | 34 +- .../stable/sql_tables/elk/sketch.exp.svg | 152 ++--- .../unnamed_only_height/dagre/board.exp.json | 10 +- .../unnamed_only_height/dagre/sketch.exp.svg | 166 ++--- .../unnamed_only_height/elk/board.exp.json | 10 +- .../unnamed_only_height/elk/sketch.exp.svg | 166 ++--- .../unnamed_only_width/dagre/board.exp.json | 10 +- .../unnamed_only_width/dagre/sketch.exp.svg | 166 ++--- .../unnamed_only_width/elk/board.exp.json | 10 +- .../unnamed_only_width/elk/sketch.exp.svg | 166 ++--- .../dagre/board.exp.json | 10 +- .../dagre/sketch.exp.svg | 572 +++++++++--------- .../elk/board.exp.json | 10 +- .../elk/sketch.exp.svg | 572 +++++++++--------- .../themes/terminal/dagre/board.exp.json | 10 +- .../themes/terminal/dagre/sketch.exp.svg | 566 ++++++++--------- .../themes/terminal/elk/board.exp.json | 10 +- .../themes/terminal/elk/sketch.exp.svg | 566 ++++++++--------- .../dagre/board.exp.json | 10 +- .../dagre/sketch.exp.svg | 566 ++++++++--------- .../shape_set_width_height/elk/board.exp.json | 10 +- .../shape_set_width_height/elk/sketch.exp.svg | 566 ++++++++--------- .../TestCompile/array-classes.exp.json | 28 +- .../TestCompile/basic_icon.exp.json | 8 +- .../TestCompile/basic_sequence.exp.json | 8 +- .../TestCompile/basic_shape.exp.json | 8 +- .../TestCompile/basic_style.exp.json | 8 +- .../TestCompile/class-shape-class.exp.json | 8 +- .../TestCompile/class_paren.exp.json | 8 +- .../TestCompile/class_style.exp.json | 8 +- .../d2compiler/TestCompile/classes.exp.json | 20 +- .../TestCompile/constraint_label.exp.json | 10 +- .../TestCompile/default_direction.exp.json | 8 +- .../TestCompile/dimension_with_style.exp.json | 8 +- .../dimensions_on_containers.exp.json | 40 +- .../dimensions_on_nonimage.exp.json | 8 +- testdata/d2compiler/TestCompile/edge.exp.json | 16 +- .../edge_arrowhead_fields.exp.json | 24 +- .../edge_arrowhead_primary.exp.json | 20 +- .../TestCompile/edge_chain.exp.json | 24 +- .../TestCompile/edge_chain_map.exp.json | 24 +- .../TestCompile/edge_column_index.exp.json | 24 +- .../TestCompile/edge_exclusive_style.exp.json | 16 +- .../TestCompile/edge_flat_arrowhead.exp.json | 20 +- .../edge_flat_label_arrowhead.exp.json | 20 +- .../TestCompile/edge_index.exp.json | 16 +- .../TestCompile/edge_index_map.exp.json | 16 +- .../TestCompile/edge_index_nested.exp.json | 20 +- .../edge_index_nested_cross_scope.exp.json | 20 +- .../edge_key_group_flat_nested.exp.json | 20 +- ..._key_group_flat_nested_underscore.exp.json | 20 +- ..._group_map_flat_nested_underscore.exp.json | 20 +- ...e_key_group_map_nested_underscore.exp.json | 20 +- .../TestCompile/edge_label_map.exp.json | 16 +- .../d2compiler/TestCompile/edge_map.exp.json | 16 +- .../TestCompile/edge_map_arrowhead.exp.json | 20 +- .../TestCompile/edge_map_group_flat.exp.json | 16 +- .../edge_map_group_semiflat.exp.json | 16 +- .../TestCompile/edge_map_nested.exp.json | 16 +- .../TestCompile/edge_map_nested_flat.exp.json | 16 +- .../TestCompile/edge_mixed_arrowhead.exp.json | 24 +- .../edge_non_shape_arrowhead.exp.json | 20 +- .../edge_semiflat_arrowhead.exp.json | 20 +- .../TestCompile/escaped_id.exp.json | 8 +- .../TestCompile/fill-pattern.exp.json | 8 +- testdata/d2compiler/TestCompile/grid.exp.json | 8 +- .../TestCompile/grid_nested.exp.json | 40 +- .../TestCompile/image_style.exp.json | 8 +- .../link-board-key-nested.exp.json | 20 +- .../TestCompile/link-board-mixed.exp.json | 32 +- .../TestCompile/link-board-nested.exp.json | 20 +- .../TestCompile/link-board-ok.exp.json | 16 +- .../link-board-underscore.exp.json | 28 +- .../TestCompile/missing-class.exp.json | 8 +- .../TestCompile/near_constant.exp.json | 8 +- .../TestCompile/nested-array-classes.exp.json | 36 +- .../TestCompile/nested_sql.exp.json | 16 +- .../nil_scope_obj_regression.exp.json | 12 +- testdata/d2compiler/TestCompile/null.exp.json | 8 +- .../d2compiler/TestCompile/path_link.exp.json | 8 +- .../d2compiler/TestCompile/positions.exp.json | 8 +- .../TestCompile/reordered-classes.exp.json | 8 +- .../reserved_icon_near_style.exp.json | 12 +- .../TestCompile/root_direction.exp.json | 4 +- .../TestCompile/root_sequence.exp.json | 4 +- .../TestCompile/self-referencing.exp.json | 12 +- .../TestCompile/sequence-timestamp.exp.json | 28 +- .../TestCompile/sequence_container.exp.json | 40 +- .../TestCompile/sequence_container_2.exp.json | 40 +- .../sequence_grouped_note.exp.json | 20 +- .../TestCompile/sequence_scoping.exp.json | 44 +- .../TestCompile/set_direction.exp.json | 8 +- .../single_dimension_on_circle.exp.json | 8 +- .../TestCompile/sql-constraints.exp.json | 372 ++++++++++++ .../TestCompile/sql-regression.exp.json | 18 +- .../d2compiler/TestCompile/sql_paren.exp.json | 12 +- .../TestCompile/stroke-width.exp.json | 8 +- .../table_connection_attr.exp.json | 20 +- .../TestCompile/table_style.exp.json | 10 +- .../TestCompile/table_style_map.exp.json | 10 +- .../TestCompile/text-transform.exp.json | 16 +- .../underscore_connection.exp.json | 24 +- .../TestCompile/underscore_edge.exp.json | 16 +- .../underscore_edge_chain.exp.json | 24 +- .../underscore_edge_existing.exp.json | 24 +- .../underscore_edge_index.exp.json | 20 +- .../underscore_edge_nested.exp.json | 20 +- .../underscore_parent_create.exp.json | 12 +- .../underscore_parent_not_root.exp.json | 16 +- .../underscore_parent_preference_1.exp.json | 12 +- .../underscore_parent_preference_2.exp.json | 12 +- .../underscore_parent_squared.exp.json | 16 +- .../underscore_unresolved_obj.exp.json | 12 +- .../TestCompile/unescaped_id_cr.exp.json | 8 +- .../d2compiler/TestCompile/url_link.exp.json | 8 +- ..._and_not_url_tooltip_concurrently.exp.json | 8 +- .../TestCompile/url_tooltip.exp.json | 8 +- .../TestCompile/wrong_column_index.exp.json | 44 +- .../TestCompile2/boards/isFolderOnly.exp.json | 36 +- .../TestCompile2/boards/recursive.exp.json | 52 +- .../TestCompile2/boards/root.exp.json | 24 +- .../boards/scenarios_edge_index.exp.json | 32 +- testdata/d2oracle/TestCreate/base.exp.json | 8 +- .../d2oracle/TestCreate/container.exp.json | 12 +- .../TestCreate/container_edge.exp.json | 20 +- .../TestCreate/container_edge_label.exp.json | 20 +- testdata/d2oracle/TestCreate/edge.exp.json | 16 +- .../d2oracle/TestCreate/edge_nested.exp.json | 20 +- .../d2oracle/TestCreate/edge_scope.exp.json | 20 +- .../TestCreate/edge_scope_flat.exp.json | 20 +- .../TestCreate/edge_scope_nested.exp.json | 24 +- .../d2oracle/TestCreate/edge_unique.exp.json | 40 +- testdata/d2oracle/TestCreate/gen_key.exp.json | 12 +- .../d2oracle/TestCreate/gen_key_n.exp.json | 60 +- .../TestCreate/gen_key_nested.exp.json | 24 +- .../TestCreate/gen_key_scope.exp.json | 24 +- .../TestCreate/gen_key_suffix.exp.json | 12 +- .../TestCreate/make_scope_multiline.exp.json | 12 +- .../make_scope_multiline_spacing_1.exp.json | 20 +- .../make_scope_multiline_spacing_2.exp.json | 20 +- testdata/d2oracle/TestCreate/nested.exp.json | 16 +- testdata/d2oracle/TestCreate/scope.exp.json | 20 +- .../d2oracle/TestDelete/arrowhead.exp.json | 16 +- .../TestDelete/arrowhead_label.exp.json | 20 +- .../TestDelete/arrowhead_map.exp.json | 16 +- .../TestDelete/arrowhead_shape.exp.json | 16 +- .../TestDelete/breakup_arrowhead.exp.json | 8 +- testdata/d2oracle/TestDelete/chaos_1.exp.json | 24 +- .../d2oracle/TestDelete/children.exp.json | 20 +- .../TestDelete/children_conflicts.exp.json | 12 +- .../children_edge_conflicts.exp.json | 20 +- .../children_edges_flat_conflicts.exp.json | 32 +- .../children_flat_conflicts.exp.json | 12 +- .../children_multiple_conflicts.exp.json | 24 +- .../children_nested_conflicts.exp.json | 16 +- ...ldren_nested_referenced_conflicts.exp.json | 16 +- .../children_no_self_conflict.exp.json | 8 +- .../TestDelete/children_order.exp.json | 20 +- .../children_referenced_conflicts.exp.json | 12 +- .../TestDelete/children_scope.exp.json | 28 +- .../d2oracle/TestDelete/class_refs.exp.json | 4 +- .../TestDelete/conflicts_generated.exp.json | 20 +- .../TestDelete/conflicts_generated_3.exp.json | 20 +- .../conflicts_generated_continued.exp.json | 16 +- .../TestDelete/container_near.exp.json | 16 +- .../delete_container_of_near.exp.json | 84 +-- .../d2oracle/TestDelete/delete_icon.exp.json | 12 +- .../d2oracle/TestDelete/delete_link.exp.json | 8 +- .../d2oracle/TestDelete/delete_near.exp.json | 12 +- .../delete_needed_flat_near.exp.json | 12 +- .../delete_redundant_flat_near.exp.json | 12 +- .../TestDelete/delete_tooltip.exp.json | 8 +- .../d2oracle/TestDelete/drop_value.exp.json | 12 +- .../drop_value_with_primary.exp.json | 8 +- .../TestDelete/duplicate_generated.exp.json | 28 +- .../TestDelete/edge-only-style.exp.json | 16 +- .../edge_both_identical_childs.exp.json | 24 +- .../d2oracle/TestDelete/edge_common.exp.json | 16 +- .../TestDelete/edge_common_2.exp.json | 16 +- .../TestDelete/edge_common_3.exp.json | 16 +- .../TestDelete/edge_common_4.exp.json | 16 +- .../TestDelete/edge_conflict.exp.json | 24 +- .../TestDelete/edge_decrement.exp.json | 28 +- .../d2oracle/TestDelete/edge_first.exp.json | 40 +- .../TestDelete/edge_flat_style.exp.json | 8 +- .../TestDelete/edge_identical_child.exp.json | 28 +- .../TestDelete/edge_key_style.exp.json | 16 +- .../d2oracle/TestDelete/edge_last.exp.json | 48 +- .../TestDelete/edge_map_style.exp.json | 16 +- .../d2oracle/TestDelete/edge_middle.exp.json | 48 +- .../d2oracle/TestDelete/empty_map.exp.json | 12 +- testdata/d2oracle/TestDelete/flat.exp.json | 4 +- .../TestDelete/flat_reserved.exp.json | 16 +- .../TestDelete/hoist_children.exp.json | 12 +- .../TestDelete/hoist_edge_children.exp.json | 20 +- .../TestDelete/key_with_edges.exp.json | 16 +- .../TestDelete/key_with_edges_2.exp.json | 12 +- .../TestDelete/key_with_edges_3.exp.json | 12 +- .../TestDelete/key_with_edges_4.exp.json | 16 +- testdata/d2oracle/TestDelete/left.exp.json | 8 +- .../d2oracle/TestDelete/multi_near.exp.json | 20 +- .../multi_path_map_conflict.exp.json | 16 +- .../multi_path_map_no_conflict.exp.json | 16 +- .../multiple_flat_middle_container.exp.json | 16 +- .../TestDelete/multiple_flat_style.exp.json | 8 +- .../TestDelete/multiple_map_styles.exp.json | 8 +- testdata/d2oracle/TestDelete/near.exp.json | 8 +- testdata/d2oracle/TestDelete/nested.exp.json | 16 +- .../d2oracle/TestDelete/nested_2.exp.json | 16 +- .../TestDelete/nested_edge_key_style.exp.json | 20 +- .../TestDelete/nested_flat_style.exp.json | 8 +- .../TestDelete/nested_reserved.exp.json | 16 +- .../nested_underscore_update.exp.json | 12 +- .../d2oracle/TestDelete/node_in_edge.exp.json | 36 +- .../TestDelete/node_in_edge_last.exp.json | 44 +- .../only-underscore-nested.exp.json | 16 +- .../TestDelete/only-underscore.exp.json | 12 +- .../only_delete_edge_reserved.exp.json | 16 +- .../only_delete_obj_reserved.exp.json | 16 +- testdata/d2oracle/TestDelete/order_1.exp.json | 20 +- testdata/d2oracle/TestDelete/order_2.exp.json | 12 +- testdata/d2oracle/TestDelete/order_3.exp.json | 12 +- testdata/d2oracle/TestDelete/order_4.exp.json | 8 +- testdata/d2oracle/TestDelete/order_5.exp.json | 32 +- testdata/d2oracle/TestDelete/order_6.exp.json | 20 +- testdata/d2oracle/TestDelete/order_7.exp.json | 24 +- testdata/d2oracle/TestDelete/order_8.exp.json | 24 +- .../d2oracle/TestDelete/save_map.exp.json | 8 +- .../TestDelete/save_map_with_primary.exp.json | 8 +- .../d2oracle/TestDelete/shape_class.exp.json | 8 +- .../TestDelete/shape_sql_table.exp.json | 24 +- .../TestDelete/singular_flat_style.exp.json | 8 +- .../TestDelete/singular_map_style.exp.json | 8 +- .../d2oracle/TestDelete/table_refs.exp.json | 10 +- .../underscore_no_conflict.exp.json | 16 +- .../TestDelete/underscore_remove.exp.json | 32 +- testdata/d2oracle/TestDelete/width.exp.json | 8 +- .../TestMove/append_multiple_styles.exp.json | 12 +- testdata/d2oracle/TestMove/basic.exp.json | 8 +- .../d2oracle/TestMove/basic_nested.exp.json | 12 +- .../TestMove/basic_out_of_container.exp.json | 12 +- .../TestMove/between_containers.exp.json | 16 +- .../TestMove/chain_connected_nested.exp.json | 24 +- ..._connected_nested_no_extra_create.exp.json | 28 +- .../TestMove/connected_nested.exp.json | 20 +- .../container_conflicts_generated.exp.json | 20 +- ...ner_multiple_refs_with_underscore.exp.json | 12 +- .../d2oracle/TestMove/container_near.exp.json | 28 +- testdata/d2oracle/TestMove/duplicate.exp.json | 12 +- .../TestMove/duplicate_generated.exp.json | 32 +- .../TestMove/edge_across_containers.exp.json | 24 +- .../d2oracle/TestMove/edge_basic.exp.json | 16 +- .../TestMove/edge_chain_basic.exp.json | 24 +- .../TestMove/edge_chain_circular.exp.json | 24 +- .../edge_chain_into_container.exp.json | 28 +- .../edge_chain_out_container.exp.json | 28 +- .../d2oracle/TestMove/edge_conflict.exp.json | 28 +- .../TestMove/edge_into_container.exp.json | 24 +- .../TestMove/edge_nested_basic.exp.json | 20 +- .../TestMove/edge_out_of_container.exp.json | 20 +- .../d2oracle/TestMove/extend_map.exp.json | 20 +- .../TestMove/extend_stationary_path.exp.json | 16 +- .../TestMove/flat_between_containers.exp.json | 16 +- .../d2oracle/TestMove/flat_merge.exp.json | 20 +- .../TestMove/flat_middle_container.exp.json | 20 +- testdata/d2oracle/TestMove/flat_near.exp.json | 16 +- .../TestMove/flat_nested_merge.exp.json | 44 +- .../flat_nested_merge_multiple_refs.exp.json | 36 +- .../flat_reparent_with_map_value.exp.json | 12 +- ...lat_reparent_with_mixed_map_value.exp.json | 16 +- .../flat_reparent_with_value.exp.json | 12 +- .../d2oracle/TestMove/flat_style.exp.json | 12 +- .../TestMove/full_edge_slice.exp.json | 28 +- .../d2oracle/TestMove/full_slice.exp.json | 16 +- testdata/d2oracle/TestMove/gnarly_1.exp.json | 64 +- .../hoist_container_children.exp.json | 20 +- .../include_descendants_conflict.exp.json | 20 +- .../include_descendants_edge_child.exp.json | 24 +- .../include_descendants_edge_ref_1.exp.json | 24 +- .../include_descendants_edge_ref_2.exp.json | 20 +- .../include_descendants_edge_ref_3.exp.json | 24 +- .../include_descendants_edge_ref_4.exp.json | 28 +- .../include_descendants_edge_ref_5.exp.json | 32 +- .../include_descendants_edge_ref_6.exp.json | 20 +- .../include_descendants_edge_ref_7.exp.json | 24 +- ...e_descendants_edge_ref_underscore.exp.json | 32 +- .../include_descendants_flat_1.exp.json | 16 +- .../include_descendants_flat_2.exp.json | 20 +- .../include_descendants_flat_3.exp.json | 20 +- .../include_descendants_flat_4.exp.json | 20 +- .../include_descendants_grandchild.exp.json | 24 +- .../include_descendants_map_1.exp.json | 16 +- .../include_descendants_map_2.exp.json | 24 +- .../include_descendants_move_out.exp.json | 20 +- .../include_descendants_near.exp.json | 20 +- .../include_descendants_nested_1.exp.json | 16 +- .../include_descendants_nested_2.exp.json | 16 +- ...ude_descendants_nested_reserved_2.exp.json | 16 +- ...ude_descendants_nested_reserved_3.exp.json | 16 +- .../include_descendants_non_conflict.exp.json | 24 +- .../TestMove/include_descendants_sql.exp.json | 14 +- .../include_descendants_underscore.exp.json | 36 +- .../include_descendants_underscore_2.exp.json | 16 +- .../include_descendants_underscore_3.exp.json | 32 +- ...descendants_underscore_regression.exp.json | 12 +- ...scendants_underscore_regression_2.exp.json | 16 +- .../into_container_existing_map.exp.json | 16 +- .../into_container_nonexisting_map.exp.json | 12 +- .../into_container_with_flat_keys.exp.json | 12 +- .../into_container_with_flat_style.exp.json | 12 +- .../d2oracle/TestMove/map_transplant.exp.json | 20 +- .../d2oracle/TestMove/map_with_label.exp.json | 16 +- .../TestMove/merge_nested_maps.exp.json | 36 +- .../d2oracle/TestMove/merge_reserved.exp.json | 28 +- .../TestMove/middle_container.exp.json | 16 +- ...ddle_container_generated_conflict.exp.json | 36 +- .../TestMove/move_container_children.exp.json | 24 +- .../move_container_conflict_children.exp.json | 24 +- .../move_into_key_with_value.exp.json | 12 +- .../TestMove/move_out_of_edge.exp.json | 32 +- .../TestMove/move_out_of_nested_edge.exp.json | 32 +- .../TestMove/multiple_nesting_levels.exp.json | 32 +- testdata/d2oracle/TestMove/near.exp.json | 16 +- .../nested-underscore-move-out.exp.json | 16 +- .../TestMove/nested_reserved_2.exp.json | 16 +- .../TestMove/nested_reserved_3.exp.json | 20 +- .../d2oracle/TestMove/nhooyr_one.exp.json | 20 +- .../d2oracle/TestMove/nhooyr_two.exp.json | 32 +- .../out_of_newline_container.exp.json | 12 +- .../d2oracle/TestMove/parentheses.exp.json | 20 +- .../TestMove/partial_edge_slice.exp.json | 20 +- .../d2oracle/TestMove/partial_slice.exp.json | 12 +- testdata/d2oracle/TestMove/rename_2.exp.json | 24 +- testdata/d2oracle/TestMove/reuse_map.exp.json | 24 +- .../d2oracle/TestMove/slice_style.exp.json | 12 +- .../TestMove/underscore-connection.exp.json | 24 +- .../TestMove/underscore_children.exp.json | 12 +- .../underscore_edge_children.exp.json | 20 +- .../underscore_edge_container_1.exp.json | 20 +- .../underscore_edge_container_2.exp.json | 20 +- .../underscore_edge_container_3.exp.json | 20 +- .../underscore_edge_container_4.exp.json | 20 +- .../underscore_edge_container_5.exp.json | 20 +- .../underscore_edge_container_6.exp.json | 24 +- .../TestMove/underscore_edge_split.exp.json | 28 +- .../TestMove/underscore_merge.exp.json | 16 +- .../TestMove/underscore_split.exp.json | 20 +- .../TestMove/underscore_split_out.exp.json | 24 +- .../TestMove/underscore_transplant.exp.json | 16 +- .../d2oracle/TestMove/unique_name.exp.json | 20 +- .../unique_name_with_references.exp.json | 28 +- .../d2oracle/TestReconnectEdge/basic.exp.json | 20 +- .../d2oracle/TestReconnectEdge/both.exp.json | 20 +- .../TestReconnectEdge/contained.exp.json | 24 +- .../TestReconnectEdge/in_chain_3.exp.json | 28 +- .../TestReconnectEdge/in_chain_4.exp.json | 28 +- .../TestReconnectEdge/indexed_ref.exp.json | 20 +- .../d2oracle/TestReconnectEdge/loop.exp.json | 16 +- .../TestReconnectEdge/middle_chain.exp.json | 28 +- .../middle_chain_both.exp.json | 36 +- .../middle_chain_first.exp.json | 36 +- .../middle_chain_last.exp.json | 36 +- .../middle_chain_src.exp.json | 28 +- .../preserve_old_obj.exp.json | 20 +- .../TestReconnectEdge/reverse.exp.json | 16 +- .../TestReconnectEdge/scope_inner.exp.json | 28 +- .../TestReconnectEdge/scope_outer.exp.json | 24 +- .../TestReconnectEdge/second_index.exp.json | 24 +- .../d2oracle/TestReconnectEdge/src.exp.json | 20 +- testdata/d2oracle/TestRename/arrows.exp.json | 16 +- .../d2oracle/TestRename/arrows_chain.exp.json | 32 +- .../TestRename/arrows_complex.exp.json | 24 +- .../TestRename/arrows_trim_common.exp.json | 36 +- .../TestRename/arrows_trim_common_2.exp.json | 36 +- .../TestRename/complex_edge_1.exp.json | 24 +- .../TestRename/complex_edge_2.exp.json | 24 +- .../d2oracle/TestRename/conflict.exp.json | 12 +- .../d2oracle/TestRename/conflict_2.exp.json | 24 +- .../TestRename/conflict_with_dots.exp.json | 12 +- .../TestRename/conflict_with_numbers.exp.json | 12 +- .../d2oracle/TestRename/container.exp.json | 96 +-- testdata/d2oracle/TestRename/edges.exp.json | 60 +- testdata/d2oracle/TestRename/flat.exp.json | 8 +- .../TestRename/generated-conflict.exp.json | 12 +- .../d2oracle/TestRename/generated.exp.json | 8 +- testdata/d2oracle/TestRename/near.exp.json | 12 +- testdata/d2oracle/TestRename/nested.exp.json | 24 +- testdata/d2oracle/TestSet/base.exp.json | 8 +- .../TestSet/block_string_multiline.exp.json | 8 +- .../TestSet/block_string_oneline.exp.json | 8 +- .../d2oracle/TestSet/classes-style.exp.json | 8 +- .../TestSet/dupe-classes-style.exp.json | 8 +- testdata/d2oracle/TestSet/edge.exp.json | 16 +- .../TestSet/edge_append_style.exp.json | 16 +- testdata/d2oracle/TestSet/edge_chain.exp.json | 28 +- .../TestSet/edge_chain_append_style.exp.json | 24 +- .../edge_chain_existing_style.exp.json | 24 +- .../TestSet/edge_chain_nested_set.exp.json | 28 +- .../edge_flat_merge_arrowhead.exp.json | 28 +- .../d2oracle/TestSet/edge_index_case.exp.json | 36 +- .../TestSet/edge_index_merge_style.exp.json | 24 +- .../TestSet/edge_index_nested.exp.json | 20 +- .../TestSet/edge_key_and_key.exp.json | 20 +- testdata/d2oracle/TestSet/edge_label.exp.json | 16 +- .../TestSet/edge_merge_arrowhead.exp.json | 20 +- .../TestSet/edge_merge_style.exp.json | 16 +- .../TestSet/edge_nested_label_set.exp.json | 20 +- .../TestSet/edge_nested_style_set.exp.json | 20 +- .../TestSet/edge_replace_arrowhead.exp.json | 20 +- .../edge_replace_arrowhead_indexed.exp.json | 20 +- .../TestSet/edge_set_arrowhead.exp.json | 20 +- .../TestSet/expanded_map_style.exp.json | 8 +- testdata/d2oracle/TestSet/icon.exp.json | 8 +- .../d2oracle/TestSet/inline_style.exp.json | 8 +- testdata/d2oracle/TestSet/label.exp.json | 8 +- .../d2oracle/TestSet/label_primary.exp.json | 20 +- .../d2oracle/TestSet/label_replace.exp.json | 8 +- .../d2oracle/TestSet/label_unset.exp.json | 8 +- .../d2oracle/TestSet/map_key_missing.exp.json | 16 +- .../d2oracle/TestSet/nested_alex.exp.json | 20 +- testdata/d2oracle/TestSet/new_style.exp.json | 8 +- .../TestSet/replace_arrowhead.exp.json | 20 +- .../TestSet/replace_arrowhead_map.exp.json | 20 +- .../TestSet/replace_dimensions.exp.json | 8 +- .../TestSet/replace_edge_style.exp.json | 16 +- .../TestSet/replace_edge_style_map.exp.json | 16 +- .../TestSet/replace_fill_pattern.exp.json | 8 +- .../d2oracle/TestSet/replace_link.exp.json | 8 +- .../TestSet/replace_position.exp.json | 8 +- .../d2oracle/TestSet/replace_shape.exp.json | 8 +- .../d2oracle/TestSet/replace_style.exp.json | 8 +- .../TestSet/replace_style_edgecase.exp.json | 8 +- .../d2oracle/TestSet/replace_tooltip.exp.json | 8 +- .../d2oracle/TestSet/set_dimensions.exp.json | 8 +- .../TestSet/set_fill_pattern.exp.json | 8 +- .../d2oracle/TestSet/set_position.exp.json | 8 +- .../d2oracle/TestSet/set_tooltip.exp.json | 8 +- testdata/d2oracle/TestSet/shape.exp.json | 8 +- .../TestSet/shape_nested_style_set.exp.json | 8 +- .../unapplied-classes-style-2.exp.json | 8 +- .../TestSet/unapplied-classes-style.exp.json | 8 +- 499 files changed, 7929 insertions(+), 11285 deletions(-) create mode 100644 testdata/d2compiler/TestCompile/sql-constraints.exp.json diff --git a/d2renderers/d2sketch/testdata/class_and_sqlTable_border_radius/sketch.exp.svg b/d2renderers/d2sketch/testdata/class_and_sqlTable_border_radius/sketch.exp.svg index 39ac09ab7..d7640b75f 100644 --- a/d2renderers/d2sketch/testdata/class_and_sqlTable_border_radius/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/class_and_sqlTable_border_radius/sketch.exp.svg @@ -1,16 +1,16 @@ - + .d2-3181790551 .fill-N1{fill:#0A0F25;} + .d2-3181790551 .fill-N2{fill:#676C7E;} + .d2-3181790551 .fill-N3{fill:#9499AB;} + .d2-3181790551 .fill-N4{fill:#CFD2DD;} + .d2-3181790551 .fill-N5{fill:#DEE1EB;} + .d2-3181790551 .fill-N6{fill:#EEF1F8;} + .d2-3181790551 .fill-N7{fill:#FFFFFF;} + .d2-3181790551 .fill-B1{fill:#0D32B2;} + .d2-3181790551 .fill-B2{fill:#0D32B2;} + .d2-3181790551 .fill-B3{fill:#E3E9FD;} + .d2-3181790551 .fill-B4{fill:#E3E9FD;} + .d2-3181790551 .fill-B5{fill:#EDF0FD;} + .d2-3181790551 .fill-B6{fill:#F7F8FE;} + .d2-3181790551 .fill-AA2{fill:#4A6FF3;} + .d2-3181790551 .fill-AA4{fill:#EDF0FD;} + .d2-3181790551 .fill-AA5{fill:#F7F8FE;} + .d2-3181790551 .fill-AB4{fill:#EDF0FD;} + .d2-3181790551 .fill-AB5{fill:#F7F8FE;} + .d2-3181790551 .stroke-N1{stroke:#0A0F25;} + .d2-3181790551 .stroke-N2{stroke:#676C7E;} + .d2-3181790551 .stroke-N3{stroke:#9499AB;} + .d2-3181790551 .stroke-N4{stroke:#CFD2DD;} + .d2-3181790551 .stroke-N5{stroke:#DEE1EB;} + .d2-3181790551 .stroke-N6{stroke:#EEF1F8;} + .d2-3181790551 .stroke-N7{stroke:#FFFFFF;} + .d2-3181790551 .stroke-B1{stroke:#0D32B2;} + .d2-3181790551 .stroke-B2{stroke:#0D32B2;} + .d2-3181790551 .stroke-B3{stroke:#E3E9FD;} + .d2-3181790551 .stroke-B4{stroke:#E3E9FD;} + .d2-3181790551 .stroke-B5{stroke:#EDF0FD;} + .d2-3181790551 .stroke-B6{stroke:#F7F8FE;} + .d2-3181790551 .stroke-AA2{stroke:#4A6FF3;} + .d2-3181790551 .stroke-AA4{stroke:#EDF0FD;} + .d2-3181790551 .stroke-AA5{stroke:#F7F8FE;} + .d2-3181790551 .stroke-AB4{stroke:#EDF0FD;} + .d2-3181790551 .stroke-AB5{stroke:#F7F8FE;} + .d2-3181790551 .background-color-N1{background-color:#0A0F25;} + .d2-3181790551 .background-color-N2{background-color:#676C7E;} + .d2-3181790551 .background-color-N3{background-color:#9499AB;} + .d2-3181790551 .background-color-N4{background-color:#CFD2DD;} + .d2-3181790551 .background-color-N5{background-color:#DEE1EB;} + .d2-3181790551 .background-color-N6{background-color:#EEF1F8;} + .d2-3181790551 .background-color-N7{background-color:#FFFFFF;} + .d2-3181790551 .background-color-B1{background-color:#0D32B2;} + .d2-3181790551 .background-color-B2{background-color:#0D32B2;} + .d2-3181790551 .background-color-B3{background-color:#E3E9FD;} + .d2-3181790551 .background-color-B4{background-color:#E3E9FD;} + .d2-3181790551 .background-color-B5{background-color:#EDF0FD;} + .d2-3181790551 .background-color-B6{background-color:#F7F8FE;} + .d2-3181790551 .background-color-AA2{background-color:#4A6FF3;} + .d2-3181790551 .background-color-AA4{background-color:#EDF0FD;} + .d2-3181790551 .background-color-AA5{background-color:#F7F8FE;} + .d2-3181790551 .background-color-AB4{background-color:#EDF0FD;} + .d2-3181790551 .background-color-AB5{background-color:#F7F8FE;} + .d2-3181790551 .color-N1{color:#0A0F25;} + .d2-3181790551 .color-N2{color:#676C7E;} + .d2-3181790551 .color-N3{color:#9499AB;} + .d2-3181790551 .color-N4{color:#CFD2DD;} + .d2-3181790551 .color-N5{color:#DEE1EB;} + .d2-3181790551 .color-N6{color:#EEF1F8;} + .d2-3181790551 .color-N7{color:#FFFFFF;} + .d2-3181790551 .color-B1{color:#0D32B2;} + .d2-3181790551 .color-B2{color:#0D32B2;} + .d2-3181790551 .color-B3{color:#E3E9FD;} + .d2-3181790551 .color-B4{color:#E3E9FD;} + .d2-3181790551 .color-B5{color:#EDF0FD;} + .d2-3181790551 .color-B6{color:#F7F8FE;} + .d2-3181790551 .color-AA2{color:#4A6FF3;} + .d2-3181790551 .color-AA4{color:#EDF0FD;} + .d2-3181790551 .color-AA5{color:#F7F8FE;} + .d2-3181790551 .color-AB4{color:#EDF0FD;} + .d2-3181790551 .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}]]> @@ -112,7 +112,7 @@ -aidintPKdiskintFKjsonjsonbUNQlast_updatedtimestamp with time zoneb+field[]string+method(a uint64)(x, y int)cd +aidintPKdiskintFKjsonjsonbUNQlast_updatedtimestamp with time zoneb+field[]string+method(a uint64)(x, y int)cd \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/opacity/sketch.exp.svg b/d2renderers/d2sketch/testdata/opacity/sketch.exp.svg index d7bdd1a13..0bd69edd7 100644 --- a/d2renderers/d2sketch/testdata/opacity/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/opacity/sketch.exp.svg @@ -1,27 +1,27 @@ - @@ -852,7 +852,7 @@ x

linux: because a PC is a terrible thing to waste

-
auserslast_logindatetime You don't have to know how the computer works,just how to work the computer. +
auserslast_logindatetime You don't have to know how the computer works,just how to work the computer. \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/opacity_dark/sketch.exp.svg b/d2renderers/d2sketch/testdata/opacity_dark/sketch.exp.svg index 96345685e..75cdd729b 100644 --- a/d2renderers/d2sketch/testdata/opacity_dark/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/opacity_dark/sketch.exp.svg @@ -1,27 +1,27 @@ - @@ -850,7 +850,7 @@ x

linux: because a PC is a terrible thing to waste

-
auserslast_logindatetime You don't have to know how the computer works,just how to work the computer. +
auserslast_logindatetime You don't have to know how the computer works,just how to work the computer. \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/sql_tables/sketch.exp.svg b/d2renderers/d2sketch/testdata/sql_tables/sketch.exp.svg index 9f5f94909..56ec37a37 100644 --- a/d2renderers/d2sketch/testdata/sql_tables/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/sql_tables/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-456305260 .fill-N1{fill:#0A0F25;} + .d2-456305260 .fill-N2{fill:#676C7E;} + .d2-456305260 .fill-N3{fill:#9499AB;} + .d2-456305260 .fill-N4{fill:#CFD2DD;} + .d2-456305260 .fill-N5{fill:#DEE1EB;} + .d2-456305260 .fill-N6{fill:#EEF1F8;} + .d2-456305260 .fill-N7{fill:#FFFFFF;} + .d2-456305260 .fill-B1{fill:#0D32B2;} + .d2-456305260 .fill-B2{fill:#0D32B2;} + .d2-456305260 .fill-B3{fill:#E3E9FD;} + .d2-456305260 .fill-B4{fill:#E3E9FD;} + .d2-456305260 .fill-B5{fill:#EDF0FD;} + .d2-456305260 .fill-B6{fill:#F7F8FE;} + .d2-456305260 .fill-AA2{fill:#4A6FF3;} + .d2-456305260 .fill-AA4{fill:#EDF0FD;} + .d2-456305260 .fill-AA5{fill:#F7F8FE;} + .d2-456305260 .fill-AB4{fill:#EDF0FD;} + .d2-456305260 .fill-AB5{fill:#F7F8FE;} + .d2-456305260 .stroke-N1{stroke:#0A0F25;} + .d2-456305260 .stroke-N2{stroke:#676C7E;} + .d2-456305260 .stroke-N3{stroke:#9499AB;} + .d2-456305260 .stroke-N4{stroke:#CFD2DD;} + .d2-456305260 .stroke-N5{stroke:#DEE1EB;} + .d2-456305260 .stroke-N6{stroke:#EEF1F8;} + .d2-456305260 .stroke-N7{stroke:#FFFFFF;} + .d2-456305260 .stroke-B1{stroke:#0D32B2;} + .d2-456305260 .stroke-B2{stroke:#0D32B2;} + .d2-456305260 .stroke-B3{stroke:#E3E9FD;} + .d2-456305260 .stroke-B4{stroke:#E3E9FD;} + .d2-456305260 .stroke-B5{stroke:#EDF0FD;} + .d2-456305260 .stroke-B6{stroke:#F7F8FE;} + .d2-456305260 .stroke-AA2{stroke:#4A6FF3;} + .d2-456305260 .stroke-AA4{stroke:#EDF0FD;} + .d2-456305260 .stroke-AA5{stroke:#F7F8FE;} + .d2-456305260 .stroke-AB4{stroke:#EDF0FD;} + .d2-456305260 .stroke-AB5{stroke:#F7F8FE;} + .d2-456305260 .background-color-N1{background-color:#0A0F25;} + .d2-456305260 .background-color-N2{background-color:#676C7E;} + .d2-456305260 .background-color-N3{background-color:#9499AB;} + .d2-456305260 .background-color-N4{background-color:#CFD2DD;} + .d2-456305260 .background-color-N5{background-color:#DEE1EB;} + .d2-456305260 .background-color-N6{background-color:#EEF1F8;} + .d2-456305260 .background-color-N7{background-color:#FFFFFF;} + .d2-456305260 .background-color-B1{background-color:#0D32B2;} + .d2-456305260 .background-color-B2{background-color:#0D32B2;} + .d2-456305260 .background-color-B3{background-color:#E3E9FD;} + .d2-456305260 .background-color-B4{background-color:#E3E9FD;} + .d2-456305260 .background-color-B5{background-color:#EDF0FD;} + .d2-456305260 .background-color-B6{background-color:#F7F8FE;} + .d2-456305260 .background-color-AA2{background-color:#4A6FF3;} + .d2-456305260 .background-color-AA4{background-color:#EDF0FD;} + .d2-456305260 .background-color-AA5{background-color:#F7F8FE;} + .d2-456305260 .background-color-AB4{background-color:#EDF0FD;} + .d2-456305260 .background-color-AB5{background-color:#F7F8FE;} + .d2-456305260 .color-N1{color:#0A0F25;} + .d2-456305260 .color-N2{color:#676C7E;} + .d2-456305260 .color-N3{color:#9499AB;} + .d2-456305260 .color-N4{color:#CFD2DD;} + .d2-456305260 .color-N5{color:#DEE1EB;} + .d2-456305260 .color-N6{color:#EEF1F8;} + .d2-456305260 .color-N7{color:#FFFFFF;} + .d2-456305260 .color-B1{color:#0D32B2;} + .d2-456305260 .color-B2{color:#0D32B2;} + .d2-456305260 .color-B3{color:#E3E9FD;} + .d2-456305260 .color-B4{color:#E3E9FD;} + .d2-456305260 .color-B5{color:#EDF0FD;} + .d2-456305260 .color-B6{color:#F7F8FE;} + .d2-456305260 .color-AA2{color:#4A6FF3;} + .d2-456305260 .color-AA4{color:#EDF0FD;} + .d2-456305260 .color-AA5{color:#F7F8FE;} + .d2-456305260 .color-AB4{color:#EDF0FD;} + .d2-456305260 .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}]]> @@ -97,7 +97,7 @@ -usersidintnamestringemailstringpasswordstringlast_logindatetimeproductsidintpricedecimalskustringnamestringordersidintuser_idintproduct_idintshipmentsidintorder_idinttracking_numberstringPKstatusstring +usersidintnamestringemailstringpasswordstringlast_logindatetimeproductsidintpricedecimalskustringnamestringordersidintuser_idintproduct_idintshipmentsidintorder_idinttracking_numberstringPKstatusstring \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/sql_tables_dark/sketch.exp.svg b/d2renderers/d2sketch/testdata/sql_tables_dark/sketch.exp.svg index 641f51c9e..5bcf0a0cf 100644 --- a/d2renderers/d2sketch/testdata/sql_tables_dark/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/sql_tables_dark/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-456305260 .fill-N1{fill:#CDD6F4;} + .d2-456305260 .fill-N2{fill:#BAC2DE;} + .d2-456305260 .fill-N3{fill:#A6ADC8;} + .d2-456305260 .fill-N4{fill:#585B70;} + .d2-456305260 .fill-N5{fill:#45475A;} + .d2-456305260 .fill-N6{fill:#313244;} + .d2-456305260 .fill-N7{fill:#1E1E2E;} + .d2-456305260 .fill-B1{fill:#CBA6f7;} + .d2-456305260 .fill-B2{fill:#CBA6f7;} + .d2-456305260 .fill-B3{fill:#6C7086;} + .d2-456305260 .fill-B4{fill:#585B70;} + .d2-456305260 .fill-B5{fill:#45475A;} + .d2-456305260 .fill-B6{fill:#313244;} + .d2-456305260 .fill-AA2{fill:#f38BA8;} + .d2-456305260 .fill-AA4{fill:#45475A;} + .d2-456305260 .fill-AA5{fill:#313244;} + .d2-456305260 .fill-AB4{fill:#45475A;} + .d2-456305260 .fill-AB5{fill:#313244;} + .d2-456305260 .stroke-N1{stroke:#CDD6F4;} + .d2-456305260 .stroke-N2{stroke:#BAC2DE;} + .d2-456305260 .stroke-N3{stroke:#A6ADC8;} + .d2-456305260 .stroke-N4{stroke:#585B70;} + .d2-456305260 .stroke-N5{stroke:#45475A;} + .d2-456305260 .stroke-N6{stroke:#313244;} + .d2-456305260 .stroke-N7{stroke:#1E1E2E;} + .d2-456305260 .stroke-B1{stroke:#CBA6f7;} + .d2-456305260 .stroke-B2{stroke:#CBA6f7;} + .d2-456305260 .stroke-B3{stroke:#6C7086;} + .d2-456305260 .stroke-B4{stroke:#585B70;} + .d2-456305260 .stroke-B5{stroke:#45475A;} + .d2-456305260 .stroke-B6{stroke:#313244;} + .d2-456305260 .stroke-AA2{stroke:#f38BA8;} + .d2-456305260 .stroke-AA4{stroke:#45475A;} + .d2-456305260 .stroke-AA5{stroke:#313244;} + .d2-456305260 .stroke-AB4{stroke:#45475A;} + .d2-456305260 .stroke-AB5{stroke:#313244;} + .d2-456305260 .background-color-N1{background-color:#CDD6F4;} + .d2-456305260 .background-color-N2{background-color:#BAC2DE;} + .d2-456305260 .background-color-N3{background-color:#A6ADC8;} + .d2-456305260 .background-color-N4{background-color:#585B70;} + .d2-456305260 .background-color-N5{background-color:#45475A;} + .d2-456305260 .background-color-N6{background-color:#313244;} + .d2-456305260 .background-color-N7{background-color:#1E1E2E;} + .d2-456305260 .background-color-B1{background-color:#CBA6f7;} + .d2-456305260 .background-color-B2{background-color:#CBA6f7;} + .d2-456305260 .background-color-B3{background-color:#6C7086;} + .d2-456305260 .background-color-B4{background-color:#585B70;} + .d2-456305260 .background-color-B5{background-color:#45475A;} + .d2-456305260 .background-color-B6{background-color:#313244;} + .d2-456305260 .background-color-AA2{background-color:#f38BA8;} + .d2-456305260 .background-color-AA4{background-color:#45475A;} + .d2-456305260 .background-color-AA5{background-color:#313244;} + .d2-456305260 .background-color-AB4{background-color:#45475A;} + .d2-456305260 .background-color-AB5{background-color:#313244;} + .d2-456305260 .color-N1{color:#CDD6F4;} + .d2-456305260 .color-N2{color:#BAC2DE;} + .d2-456305260 .color-N3{color:#A6ADC8;} + .d2-456305260 .color-N4{color:#585B70;} + .d2-456305260 .color-N5{color:#45475A;} + .d2-456305260 .color-N6{color:#313244;} + .d2-456305260 .color-N7{color:#1E1E2E;} + .d2-456305260 .color-B1{color:#CBA6f7;} + .d2-456305260 .color-B2{color:#CBA6f7;} + .d2-456305260 .color-B3{color:#6C7086;} + .d2-456305260 .color-B4{color:#585B70;} + .d2-456305260 .color-B5{color:#45475A;} + .d2-456305260 .color-B6{color:#313244;} + .d2-456305260 .color-AA2{color:#f38BA8;} + .d2-456305260 .color-AA4{color:#45475A;} + .d2-456305260 .color-AA5{color:#313244;} + .d2-456305260 .color-AB4{color:#45475A;} + .d2-456305260 .color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker);mix-blend-mode:lighten}.light-code{display: none}.dark-code{display: block}]]> -usersidintnamestringemailstringpasswordstringlast_logindatetimeproductsidintpricedecimalskustringnamestringordersidintuser_idintproduct_idintshipmentsidintorder_idinttracking_numberstringPKstatusstring +usersidintnamestringemailstringpasswordstringlast_logindatetimeproductsidintpricedecimalskustringnamestringordersidintuser_idintproduct_idintshipmentsidintorder_idinttracking_numberstringPKstatusstring \ No newline at end of file diff --git a/d2renderers/d2svg/dark_theme/testdata/opacity/dark_theme.exp.svg b/d2renderers/d2svg/dark_theme/testdata/opacity/dark_theme.exp.svg index 6e5e9a169..1a8b468be 100644 --- a/d2renderers/d2svg/dark_theme/testdata/opacity/dark_theme.exp.svg +++ b/d2renderers/d2svg/dark_theme/testdata/opacity/dark_theme.exp.svg @@ -1,27 +1,27 @@ -x

linux: because a PC is a terrible thing to waste

-
auserslast_logindatetime You don't have to know how the computer works,just how to work the computer. +
auserslast_logindatetime You don't have to know how the computer works,just how to work the computer. \ No newline at end of file diff --git a/d2renderers/d2svg/dark_theme/testdata/sql_tables/dark_theme.exp.svg b/d2renderers/d2svg/dark_theme/testdata/sql_tables/dark_theme.exp.svg index 4113e95fe..8348b75ca 100644 --- a/d2renderers/d2svg/dark_theme/testdata/sql_tables/dark_theme.exp.svg +++ b/d2renderers/d2svg/dark_theme/testdata/sql_tables/dark_theme.exp.svg @@ -1,9 +1,9 @@ -usersidintnamestringemailstringpasswordstringlast_logindatetimeproductsidintpricedecimalskustringnamestringordersidintuser_idintproduct_idintshipmentsidintorder_idinttracking_numberstringPKstatusstring + .d2-456305260 .fill-N1{fill:#CDD6F4;} + .d2-456305260 .fill-N2{fill:#BAC2DE;} + .d2-456305260 .fill-N3{fill:#A6ADC8;} + .d2-456305260 .fill-N4{fill:#585B70;} + .d2-456305260 .fill-N5{fill:#45475A;} + .d2-456305260 .fill-N6{fill:#313244;} + .d2-456305260 .fill-N7{fill:#1E1E2E;} + .d2-456305260 .fill-B1{fill:#CBA6f7;} + .d2-456305260 .fill-B2{fill:#CBA6f7;} + .d2-456305260 .fill-B3{fill:#6C7086;} + .d2-456305260 .fill-B4{fill:#585B70;} + .d2-456305260 .fill-B5{fill:#45475A;} + .d2-456305260 .fill-B6{fill:#313244;} + .d2-456305260 .fill-AA2{fill:#f38BA8;} + .d2-456305260 .fill-AA4{fill:#45475A;} + .d2-456305260 .fill-AA5{fill:#313244;} + .d2-456305260 .fill-AB4{fill:#45475A;} + .d2-456305260 .fill-AB5{fill:#313244;} + .d2-456305260 .stroke-N1{stroke:#CDD6F4;} + .d2-456305260 .stroke-N2{stroke:#BAC2DE;} + .d2-456305260 .stroke-N3{stroke:#A6ADC8;} + .d2-456305260 .stroke-N4{stroke:#585B70;} + .d2-456305260 .stroke-N5{stroke:#45475A;} + .d2-456305260 .stroke-N6{stroke:#313244;} + .d2-456305260 .stroke-N7{stroke:#1E1E2E;} + .d2-456305260 .stroke-B1{stroke:#CBA6f7;} + .d2-456305260 .stroke-B2{stroke:#CBA6f7;} + .d2-456305260 .stroke-B3{stroke:#6C7086;} + .d2-456305260 .stroke-B4{stroke:#585B70;} + .d2-456305260 .stroke-B5{stroke:#45475A;} + .d2-456305260 .stroke-B6{stroke:#313244;} + .d2-456305260 .stroke-AA2{stroke:#f38BA8;} + .d2-456305260 .stroke-AA4{stroke:#45475A;} + .d2-456305260 .stroke-AA5{stroke:#313244;} + .d2-456305260 .stroke-AB4{stroke:#45475A;} + .d2-456305260 .stroke-AB5{stroke:#313244;} + .d2-456305260 .background-color-N1{background-color:#CDD6F4;} + .d2-456305260 .background-color-N2{background-color:#BAC2DE;} + .d2-456305260 .background-color-N3{background-color:#A6ADC8;} + .d2-456305260 .background-color-N4{background-color:#585B70;} + .d2-456305260 .background-color-N5{background-color:#45475A;} + .d2-456305260 .background-color-N6{background-color:#313244;} + .d2-456305260 .background-color-N7{background-color:#1E1E2E;} + .d2-456305260 .background-color-B1{background-color:#CBA6f7;} + .d2-456305260 .background-color-B2{background-color:#CBA6f7;} + .d2-456305260 .background-color-B3{background-color:#6C7086;} + .d2-456305260 .background-color-B4{background-color:#585B70;} + .d2-456305260 .background-color-B5{background-color:#45475A;} + .d2-456305260 .background-color-B6{background-color:#313244;} + .d2-456305260 .background-color-AA2{background-color:#f38BA8;} + .d2-456305260 .background-color-AA4{background-color:#45475A;} + .d2-456305260 .background-color-AA5{background-color:#313244;} + .d2-456305260 .background-color-AB4{background-color:#45475A;} + .d2-456305260 .background-color-AB5{background-color:#313244;} + .d2-456305260 .color-N1{color:#CDD6F4;} + .d2-456305260 .color-N2{color:#BAC2DE;} + .d2-456305260 .color-N3{color:#A6ADC8;} + .d2-456305260 .color-N4{color:#585B70;} + .d2-456305260 .color-N5{color:#45475A;} + .d2-456305260 .color-N6{color:#313244;} + .d2-456305260 .color-N7{color:#1E1E2E;} + .d2-456305260 .color-B1{color:#CBA6f7;} + .d2-456305260 .color-B2{color:#CBA6f7;} + .d2-456305260 .color-B3{color:#6C7086;} + .d2-456305260 .color-B4{color:#585B70;} + .d2-456305260 .color-B5{color:#45475A;} + .d2-456305260 .color-B6{color:#313244;} + .d2-456305260 .color-AA2{color:#f38BA8;} + .d2-456305260 .color-AA4{color:#45475A;} + .d2-456305260 .color-AA5{color:#313244;} + .d2-456305260 .color-AB4{color:#45475A;} + .d2-456305260 .color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker);mix-blend-mode:lighten}.light-code{display: none}.dark-code{display: block}]]>usersidintnamestringemailstringpasswordstringlast_logindatetimeproductsidintpricedecimalskustringnamestringordersidintuser_idintproduct_idintshipmentsidintorder_idinttracking_numberstringPKstatusstring \ No newline at end of file diff --git a/e2etests-cli/testdata/TestCLI_E2E/internal_linked_pdf.exp.pdf b/e2etests-cli/testdata/TestCLI_E2E/internal_linked_pdf.exp.pdf index f329d7c852dc3ec03d58bd6fb68897b34982f745..30d233b92b320b9a855aa13b9d7c1090bc6e32fb 100644 GIT binary patch delta 70 zcmezQf#v51mWC~i+fAmwG+{KDzSV@$Xu6~+V}h!gfw7^9fr){!CYQc%eu_(CNveW| TiZu>k_#@kE)Z<`gZ delta 70 zcmezQf#v51mWC~i+fAmwG+{KDzSV@$Xu6~+V}h!wv7w=vshNq9CYQc%eu_(CNveW| TiZu>k_#@kE)anlvW diff --git a/e2etests/testdata/patterns/real-lines/dagre/board.exp.json b/e2etests/testdata/patterns/real-lines/dagre/board.exp.json index 4d6823694..50ee233e6 100644 --- a/e2etests/testdata/patterns/real-lines/dagre/board.exp.json +++ b/e2etests/testdata/patterns/real-lines/dagre/board.exp.json @@ -222,7 +222,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -250,7 +252,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -278,7 +280,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -306,7 +308,7 @@ "labelWidth": 91, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], @@ -379,7 +381,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -407,7 +411,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -435,7 +439,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -463,7 +467,7 @@ "labelWidth": 91, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], diff --git a/e2etests/testdata/patterns/real-lines/dagre/sketch.exp.svg b/e2etests/testdata/patterns/real-lines/dagre/sketch.exp.svg index 6559dcfd9..fa533964a 100644 --- a/e2etests/testdata/patterns/real-lines/dagre/sketch.exp.svg +++ b/e2etests/testdata/patterns/real-lines/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ -RefreshAuthorizationPolicyProtocolServerSideTranslatorProtocolBufferRefreshAuthorizationPolicyCacheRefreshAuthorizationPolicyCacheok + .d2-3940939446 .fill-N1{fill:#0A0F25;} + .d2-3940939446 .fill-N2{fill:#676C7E;} + .d2-3940939446 .fill-N3{fill:#9499AB;} + .d2-3940939446 .fill-N4{fill:#CFD2DD;} + .d2-3940939446 .fill-N5{fill:#DEE1EB;} + .d2-3940939446 .fill-N6{fill:#EEF1F8;} + .d2-3940939446 .fill-N7{fill:#FFFFFF;} + .d2-3940939446 .fill-B1{fill:#0D32B2;} + .d2-3940939446 .fill-B2{fill:#0D32B2;} + .d2-3940939446 .fill-B3{fill:#E3E9FD;} + .d2-3940939446 .fill-B4{fill:#E3E9FD;} + .d2-3940939446 .fill-B5{fill:#EDF0FD;} + .d2-3940939446 .fill-B6{fill:#F7F8FE;} + .d2-3940939446 .fill-AA2{fill:#4A6FF3;} + .d2-3940939446 .fill-AA4{fill:#EDF0FD;} + .d2-3940939446 .fill-AA5{fill:#F7F8FE;} + .d2-3940939446 .fill-AB4{fill:#EDF0FD;} + .d2-3940939446 .fill-AB5{fill:#F7F8FE;} + .d2-3940939446 .stroke-N1{stroke:#0A0F25;} + .d2-3940939446 .stroke-N2{stroke:#676C7E;} + .d2-3940939446 .stroke-N3{stroke:#9499AB;} + .d2-3940939446 .stroke-N4{stroke:#CFD2DD;} + .d2-3940939446 .stroke-N5{stroke:#DEE1EB;} + .d2-3940939446 .stroke-N6{stroke:#EEF1F8;} + .d2-3940939446 .stroke-N7{stroke:#FFFFFF;} + .d2-3940939446 .stroke-B1{stroke:#0D32B2;} + .d2-3940939446 .stroke-B2{stroke:#0D32B2;} + .d2-3940939446 .stroke-B3{stroke:#E3E9FD;} + .d2-3940939446 .stroke-B4{stroke:#E3E9FD;} + .d2-3940939446 .stroke-B5{stroke:#EDF0FD;} + .d2-3940939446 .stroke-B6{stroke:#F7F8FE;} + .d2-3940939446 .stroke-AA2{stroke:#4A6FF3;} + .d2-3940939446 .stroke-AA4{stroke:#EDF0FD;} + .d2-3940939446 .stroke-AA5{stroke:#F7F8FE;} + .d2-3940939446 .stroke-AB4{stroke:#EDF0FD;} + .d2-3940939446 .stroke-AB5{stroke:#F7F8FE;} + .d2-3940939446 .background-color-N1{background-color:#0A0F25;} + .d2-3940939446 .background-color-N2{background-color:#676C7E;} + .d2-3940939446 .background-color-N3{background-color:#9499AB;} + .d2-3940939446 .background-color-N4{background-color:#CFD2DD;} + .d2-3940939446 .background-color-N5{background-color:#DEE1EB;} + .d2-3940939446 .background-color-N6{background-color:#EEF1F8;} + .d2-3940939446 .background-color-N7{background-color:#FFFFFF;} + .d2-3940939446 .background-color-B1{background-color:#0D32B2;} + .d2-3940939446 .background-color-B2{background-color:#0D32B2;} + .d2-3940939446 .background-color-B3{background-color:#E3E9FD;} + .d2-3940939446 .background-color-B4{background-color:#E3E9FD;} + .d2-3940939446 .background-color-B5{background-color:#EDF0FD;} + .d2-3940939446 .background-color-B6{background-color:#F7F8FE;} + .d2-3940939446 .background-color-AA2{background-color:#4A6FF3;} + .d2-3940939446 .background-color-AA4{background-color:#EDF0FD;} + .d2-3940939446 .background-color-AA5{background-color:#F7F8FE;} + .d2-3940939446 .background-color-AB4{background-color:#EDF0FD;} + .d2-3940939446 .background-color-AB5{background-color:#F7F8FE;} + .d2-3940939446 .color-N1{color:#0A0F25;} + .d2-3940939446 .color-N2{color:#676C7E;} + .d2-3940939446 .color-N3{color:#9499AB;} + .d2-3940939446 .color-N4{color:#CFD2DD;} + .d2-3940939446 .color-N5{color:#DEE1EB;} + .d2-3940939446 .color-N6{color:#EEF1F8;} + .d2-3940939446 .color-N7{color:#FFFFFF;} + .d2-3940939446 .color-B1{color:#0D32B2;} + .d2-3940939446 .color-B2{color:#0D32B2;} + .d2-3940939446 .color-B3{color:#E3E9FD;} + .d2-3940939446 .color-B4{color:#E3E9FD;} + .d2-3940939446 .color-B5{color:#EDF0FD;} + .d2-3940939446 .color-B6{color:#F7F8FE;} + .d2-3940939446 .color-AA2{color:#4A6FF3;} + .d2-3940939446 .color-AA4{color:#EDF0FD;} + .d2-3940939446 .color-AA5{color:#F7F8FE;} + .d2-3940939446 .color-AB4{color:#EDF0FD;} + .d2-3940939446 .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}]]>RefreshAuthorizationPolicyProtocolServerSideTranslatorProtocolBufferRefreshAuthorizationPolicyCacheRefreshAuthorizationPolicyCacheok \ No newline at end of file diff --git a/e2etests/testdata/regression/only_header_class_table/elk/board.exp.json b/e2etests/testdata/regression/only_header_class_table/elk/board.exp.json index d30ca4428..978739f12 100644 --- a/e2etests/testdata/regression/only_header_class_table/elk/board.exp.json +++ b/e2etests/testdata/regression/only_header_class_table/elk/board.exp.json @@ -141,7 +141,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "", + "constraint": null, "reference": "" } ], diff --git a/e2etests/testdata/regression/only_header_class_table/elk/sketch.exp.svg b/e2etests/testdata/regression/only_header_class_table/elk/sketch.exp.svg index fa9b04273..6fc820c58 100644 --- a/e2etests/testdata/regression/only_header_class_table/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/only_header_class_table/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -RefreshAuthorizationPolicyProtocolServerSideTranslatorProtocolBufferRefreshAuthorizationPolicyCacheRefreshAuthorizationPolicyCacheok + .d2-3935436195 .fill-N1{fill:#0A0F25;} + .d2-3935436195 .fill-N2{fill:#676C7E;} + .d2-3935436195 .fill-N3{fill:#9499AB;} + .d2-3935436195 .fill-N4{fill:#CFD2DD;} + .d2-3935436195 .fill-N5{fill:#DEE1EB;} + .d2-3935436195 .fill-N6{fill:#EEF1F8;} + .d2-3935436195 .fill-N7{fill:#FFFFFF;} + .d2-3935436195 .fill-B1{fill:#0D32B2;} + .d2-3935436195 .fill-B2{fill:#0D32B2;} + .d2-3935436195 .fill-B3{fill:#E3E9FD;} + .d2-3935436195 .fill-B4{fill:#E3E9FD;} + .d2-3935436195 .fill-B5{fill:#EDF0FD;} + .d2-3935436195 .fill-B6{fill:#F7F8FE;} + .d2-3935436195 .fill-AA2{fill:#4A6FF3;} + .d2-3935436195 .fill-AA4{fill:#EDF0FD;} + .d2-3935436195 .fill-AA5{fill:#F7F8FE;} + .d2-3935436195 .fill-AB4{fill:#EDF0FD;} + .d2-3935436195 .fill-AB5{fill:#F7F8FE;} + .d2-3935436195 .stroke-N1{stroke:#0A0F25;} + .d2-3935436195 .stroke-N2{stroke:#676C7E;} + .d2-3935436195 .stroke-N3{stroke:#9499AB;} + .d2-3935436195 .stroke-N4{stroke:#CFD2DD;} + .d2-3935436195 .stroke-N5{stroke:#DEE1EB;} + .d2-3935436195 .stroke-N6{stroke:#EEF1F8;} + .d2-3935436195 .stroke-N7{stroke:#FFFFFF;} + .d2-3935436195 .stroke-B1{stroke:#0D32B2;} + .d2-3935436195 .stroke-B2{stroke:#0D32B2;} + .d2-3935436195 .stroke-B3{stroke:#E3E9FD;} + .d2-3935436195 .stroke-B4{stroke:#E3E9FD;} + .d2-3935436195 .stroke-B5{stroke:#EDF0FD;} + .d2-3935436195 .stroke-B6{stroke:#F7F8FE;} + .d2-3935436195 .stroke-AA2{stroke:#4A6FF3;} + .d2-3935436195 .stroke-AA4{stroke:#EDF0FD;} + .d2-3935436195 .stroke-AA5{stroke:#F7F8FE;} + .d2-3935436195 .stroke-AB4{stroke:#EDF0FD;} + .d2-3935436195 .stroke-AB5{stroke:#F7F8FE;} + .d2-3935436195 .background-color-N1{background-color:#0A0F25;} + .d2-3935436195 .background-color-N2{background-color:#676C7E;} + .d2-3935436195 .background-color-N3{background-color:#9499AB;} + .d2-3935436195 .background-color-N4{background-color:#CFD2DD;} + .d2-3935436195 .background-color-N5{background-color:#DEE1EB;} + .d2-3935436195 .background-color-N6{background-color:#EEF1F8;} + .d2-3935436195 .background-color-N7{background-color:#FFFFFF;} + .d2-3935436195 .background-color-B1{background-color:#0D32B2;} + .d2-3935436195 .background-color-B2{background-color:#0D32B2;} + .d2-3935436195 .background-color-B3{background-color:#E3E9FD;} + .d2-3935436195 .background-color-B4{background-color:#E3E9FD;} + .d2-3935436195 .background-color-B5{background-color:#EDF0FD;} + .d2-3935436195 .background-color-B6{background-color:#F7F8FE;} + .d2-3935436195 .background-color-AA2{background-color:#4A6FF3;} + .d2-3935436195 .background-color-AA4{background-color:#EDF0FD;} + .d2-3935436195 .background-color-AA5{background-color:#F7F8FE;} + .d2-3935436195 .background-color-AB4{background-color:#EDF0FD;} + .d2-3935436195 .background-color-AB5{background-color:#F7F8FE;} + .d2-3935436195 .color-N1{color:#0A0F25;} + .d2-3935436195 .color-N2{color:#676C7E;} + .d2-3935436195 .color-N3{color:#9499AB;} + .d2-3935436195 .color-N4{color:#CFD2DD;} + .d2-3935436195 .color-N5{color:#DEE1EB;} + .d2-3935436195 .color-N6{color:#EEF1F8;} + .d2-3935436195 .color-N7{color:#FFFFFF;} + .d2-3935436195 .color-B1{color:#0D32B2;} + .d2-3935436195 .color-B2{color:#0D32B2;} + .d2-3935436195 .color-B3{color:#E3E9FD;} + .d2-3935436195 .color-B4{color:#E3E9FD;} + .d2-3935436195 .color-B5{color:#EDF0FD;} + .d2-3935436195 .color-B6{color:#F7F8FE;} + .d2-3935436195 .color-AA2{color:#4A6FF3;} + .d2-3935436195 .color-AA4{color:#EDF0FD;} + .d2-3935436195 .color-AA5{color:#F7F8FE;} + .d2-3935436195 .color-AB4{color:#EDF0FD;} + .d2-3935436195 .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}]]>RefreshAuthorizationPolicyProtocolServerSideTranslatorProtocolBufferRefreshAuthorizationPolicyCacheRefreshAuthorizationPolicyCacheok \ No newline at end of file diff --git a/e2etests/testdata/regression/sql_table_overflow/dagre/board.exp.json b/e2etests/testdata/regression/sql_table_overflow/dagre/board.exp.json index 4433d76ae..937116c15 100644 --- a/e2etests/testdata/regression/sql_table_overflow/dagre/board.exp.json +++ b/e2etests/testdata/regression/sql_table_overflow/dagre/board.exp.json @@ -55,7 +55,7 @@ "labelWidth": 242, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -83,7 +83,7 @@ "labelWidth": 45, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], @@ -155,7 +155,9 @@ "labelWidth": 242, "labelHeight": 26 }, - "constraint": "unique", + "constraint": [ + "unique" + ], "reference": "" }, { @@ -183,7 +185,9 @@ "labelWidth": 45, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" } ], diff --git a/e2etests/testdata/regression/sql_table_overflow/dagre/sketch.exp.svg b/e2etests/testdata/regression/sql_table_overflow/dagre/sketch.exp.svg index b7d17612a..144f930fe 100644 --- a/e2etests/testdata/regression/sql_table_overflow/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/sql_table_overflow/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -sql_table_overflowshortloooooooooooooooooooongloooooooooooooooooooongshortsql_table_constrained_overflowshortloooooooooooooooooooongUNQloooooooooooooooooooongshortFK + .d2-2606580960 .fill-N1{fill:#0A0F25;} + .d2-2606580960 .fill-N2{fill:#676C7E;} + .d2-2606580960 .fill-N3{fill:#9499AB;} + .d2-2606580960 .fill-N4{fill:#CFD2DD;} + .d2-2606580960 .fill-N5{fill:#DEE1EB;} + .d2-2606580960 .fill-N6{fill:#EEF1F8;} + .d2-2606580960 .fill-N7{fill:#FFFFFF;} + .d2-2606580960 .fill-B1{fill:#0D32B2;} + .d2-2606580960 .fill-B2{fill:#0D32B2;} + .d2-2606580960 .fill-B3{fill:#E3E9FD;} + .d2-2606580960 .fill-B4{fill:#E3E9FD;} + .d2-2606580960 .fill-B5{fill:#EDF0FD;} + .d2-2606580960 .fill-B6{fill:#F7F8FE;} + .d2-2606580960 .fill-AA2{fill:#4A6FF3;} + .d2-2606580960 .fill-AA4{fill:#EDF0FD;} + .d2-2606580960 .fill-AA5{fill:#F7F8FE;} + .d2-2606580960 .fill-AB4{fill:#EDF0FD;} + .d2-2606580960 .fill-AB5{fill:#F7F8FE;} + .d2-2606580960 .stroke-N1{stroke:#0A0F25;} + .d2-2606580960 .stroke-N2{stroke:#676C7E;} + .d2-2606580960 .stroke-N3{stroke:#9499AB;} + .d2-2606580960 .stroke-N4{stroke:#CFD2DD;} + .d2-2606580960 .stroke-N5{stroke:#DEE1EB;} + .d2-2606580960 .stroke-N6{stroke:#EEF1F8;} + .d2-2606580960 .stroke-N7{stroke:#FFFFFF;} + .d2-2606580960 .stroke-B1{stroke:#0D32B2;} + .d2-2606580960 .stroke-B2{stroke:#0D32B2;} + .d2-2606580960 .stroke-B3{stroke:#E3E9FD;} + .d2-2606580960 .stroke-B4{stroke:#E3E9FD;} + .d2-2606580960 .stroke-B5{stroke:#EDF0FD;} + .d2-2606580960 .stroke-B6{stroke:#F7F8FE;} + .d2-2606580960 .stroke-AA2{stroke:#4A6FF3;} + .d2-2606580960 .stroke-AA4{stroke:#EDF0FD;} + .d2-2606580960 .stroke-AA5{stroke:#F7F8FE;} + .d2-2606580960 .stroke-AB4{stroke:#EDF0FD;} + .d2-2606580960 .stroke-AB5{stroke:#F7F8FE;} + .d2-2606580960 .background-color-N1{background-color:#0A0F25;} + .d2-2606580960 .background-color-N2{background-color:#676C7E;} + .d2-2606580960 .background-color-N3{background-color:#9499AB;} + .d2-2606580960 .background-color-N4{background-color:#CFD2DD;} + .d2-2606580960 .background-color-N5{background-color:#DEE1EB;} + .d2-2606580960 .background-color-N6{background-color:#EEF1F8;} + .d2-2606580960 .background-color-N7{background-color:#FFFFFF;} + .d2-2606580960 .background-color-B1{background-color:#0D32B2;} + .d2-2606580960 .background-color-B2{background-color:#0D32B2;} + .d2-2606580960 .background-color-B3{background-color:#E3E9FD;} + .d2-2606580960 .background-color-B4{background-color:#E3E9FD;} + .d2-2606580960 .background-color-B5{background-color:#EDF0FD;} + .d2-2606580960 .background-color-B6{background-color:#F7F8FE;} + .d2-2606580960 .background-color-AA2{background-color:#4A6FF3;} + .d2-2606580960 .background-color-AA4{background-color:#EDF0FD;} + .d2-2606580960 .background-color-AA5{background-color:#F7F8FE;} + .d2-2606580960 .background-color-AB4{background-color:#EDF0FD;} + .d2-2606580960 .background-color-AB5{background-color:#F7F8FE;} + .d2-2606580960 .color-N1{color:#0A0F25;} + .d2-2606580960 .color-N2{color:#676C7E;} + .d2-2606580960 .color-N3{color:#9499AB;} + .d2-2606580960 .color-N4{color:#CFD2DD;} + .d2-2606580960 .color-N5{color:#DEE1EB;} + .d2-2606580960 .color-N6{color:#EEF1F8;} + .d2-2606580960 .color-N7{color:#FFFFFF;} + .d2-2606580960 .color-B1{color:#0D32B2;} + .d2-2606580960 .color-B2{color:#0D32B2;} + .d2-2606580960 .color-B3{color:#E3E9FD;} + .d2-2606580960 .color-B4{color:#E3E9FD;} + .d2-2606580960 .color-B5{color:#EDF0FD;} + .d2-2606580960 .color-B6{color:#F7F8FE;} + .d2-2606580960 .color-AA2{color:#4A6FF3;} + .d2-2606580960 .color-AA4{color:#EDF0FD;} + .d2-2606580960 .color-AA5{color:#F7F8FE;} + .d2-2606580960 .color-AB4{color:#EDF0FD;} + .d2-2606580960 .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}]]>sql_table_overflowshortloooooooooooooooooooongloooooooooooooooooooongshortsql_table_constrained_overflowshortloooooooooooooooooooongUNQloooooooooooooooooooongshortFK \ No newline at end of file diff --git a/e2etests/testdata/regression/sql_table_overflow/elk/board.exp.json b/e2etests/testdata/regression/sql_table_overflow/elk/board.exp.json index b68be23ec..c4ddc7c1b 100644 --- a/e2etests/testdata/regression/sql_table_overflow/elk/board.exp.json +++ b/e2etests/testdata/regression/sql_table_overflow/elk/board.exp.json @@ -55,7 +55,7 @@ "labelWidth": 242, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -83,7 +83,7 @@ "labelWidth": 45, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], @@ -155,7 +155,9 @@ "labelWidth": 242, "labelHeight": 26 }, - "constraint": "unique", + "constraint": [ + "unique" + ], "reference": "" }, { @@ -183,7 +185,9 @@ "labelWidth": 45, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" } ], diff --git a/e2etests/testdata/regression/sql_table_overflow/elk/sketch.exp.svg b/e2etests/testdata/regression/sql_table_overflow/elk/sketch.exp.svg index e0461bb9b..194ca57cd 100644 --- a/e2etests/testdata/regression/sql_table_overflow/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/sql_table_overflow/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -sql_table_overflowshortloooooooooooooooooooongloooooooooooooooooooongshortsql_table_constrained_overflowshortloooooooooooooooooooongUNQloooooooooooooooooooongshortFK + .d2-3947134090 .fill-N1{fill:#0A0F25;} + .d2-3947134090 .fill-N2{fill:#676C7E;} + .d2-3947134090 .fill-N3{fill:#9499AB;} + .d2-3947134090 .fill-N4{fill:#CFD2DD;} + .d2-3947134090 .fill-N5{fill:#DEE1EB;} + .d2-3947134090 .fill-N6{fill:#EEF1F8;} + .d2-3947134090 .fill-N7{fill:#FFFFFF;} + .d2-3947134090 .fill-B1{fill:#0D32B2;} + .d2-3947134090 .fill-B2{fill:#0D32B2;} + .d2-3947134090 .fill-B3{fill:#E3E9FD;} + .d2-3947134090 .fill-B4{fill:#E3E9FD;} + .d2-3947134090 .fill-B5{fill:#EDF0FD;} + .d2-3947134090 .fill-B6{fill:#F7F8FE;} + .d2-3947134090 .fill-AA2{fill:#4A6FF3;} + .d2-3947134090 .fill-AA4{fill:#EDF0FD;} + .d2-3947134090 .fill-AA5{fill:#F7F8FE;} + .d2-3947134090 .fill-AB4{fill:#EDF0FD;} + .d2-3947134090 .fill-AB5{fill:#F7F8FE;} + .d2-3947134090 .stroke-N1{stroke:#0A0F25;} + .d2-3947134090 .stroke-N2{stroke:#676C7E;} + .d2-3947134090 .stroke-N3{stroke:#9499AB;} + .d2-3947134090 .stroke-N4{stroke:#CFD2DD;} + .d2-3947134090 .stroke-N5{stroke:#DEE1EB;} + .d2-3947134090 .stroke-N6{stroke:#EEF1F8;} + .d2-3947134090 .stroke-N7{stroke:#FFFFFF;} + .d2-3947134090 .stroke-B1{stroke:#0D32B2;} + .d2-3947134090 .stroke-B2{stroke:#0D32B2;} + .d2-3947134090 .stroke-B3{stroke:#E3E9FD;} + .d2-3947134090 .stroke-B4{stroke:#E3E9FD;} + .d2-3947134090 .stroke-B5{stroke:#EDF0FD;} + .d2-3947134090 .stroke-B6{stroke:#F7F8FE;} + .d2-3947134090 .stroke-AA2{stroke:#4A6FF3;} + .d2-3947134090 .stroke-AA4{stroke:#EDF0FD;} + .d2-3947134090 .stroke-AA5{stroke:#F7F8FE;} + .d2-3947134090 .stroke-AB4{stroke:#EDF0FD;} + .d2-3947134090 .stroke-AB5{stroke:#F7F8FE;} + .d2-3947134090 .background-color-N1{background-color:#0A0F25;} + .d2-3947134090 .background-color-N2{background-color:#676C7E;} + .d2-3947134090 .background-color-N3{background-color:#9499AB;} + .d2-3947134090 .background-color-N4{background-color:#CFD2DD;} + .d2-3947134090 .background-color-N5{background-color:#DEE1EB;} + .d2-3947134090 .background-color-N6{background-color:#EEF1F8;} + .d2-3947134090 .background-color-N7{background-color:#FFFFFF;} + .d2-3947134090 .background-color-B1{background-color:#0D32B2;} + .d2-3947134090 .background-color-B2{background-color:#0D32B2;} + .d2-3947134090 .background-color-B3{background-color:#E3E9FD;} + .d2-3947134090 .background-color-B4{background-color:#E3E9FD;} + .d2-3947134090 .background-color-B5{background-color:#EDF0FD;} + .d2-3947134090 .background-color-B6{background-color:#F7F8FE;} + .d2-3947134090 .background-color-AA2{background-color:#4A6FF3;} + .d2-3947134090 .background-color-AA4{background-color:#EDF0FD;} + .d2-3947134090 .background-color-AA5{background-color:#F7F8FE;} + .d2-3947134090 .background-color-AB4{background-color:#EDF0FD;} + .d2-3947134090 .background-color-AB5{background-color:#F7F8FE;} + .d2-3947134090 .color-N1{color:#0A0F25;} + .d2-3947134090 .color-N2{color:#676C7E;} + .d2-3947134090 .color-N3{color:#9499AB;} + .d2-3947134090 .color-N4{color:#CFD2DD;} + .d2-3947134090 .color-N5{color:#DEE1EB;} + .d2-3947134090 .color-N6{color:#EEF1F8;} + .d2-3947134090 .color-N7{color:#FFFFFF;} + .d2-3947134090 .color-B1{color:#0D32B2;} + .d2-3947134090 .color-B2{color:#0D32B2;} + .d2-3947134090 .color-B3{color:#E3E9FD;} + .d2-3947134090 .color-B4{color:#E3E9FD;} + .d2-3947134090 .color-B5{color:#EDF0FD;} + .d2-3947134090 .color-B6{color:#F7F8FE;} + .d2-3947134090 .color-AA2{color:#4A6FF3;} + .d2-3947134090 .color-AA4{color:#EDF0FD;} + .d2-3947134090 .color-AA5{color:#F7F8FE;} + .d2-3947134090 .color-AB4{color:#EDF0FD;} + .d2-3947134090 .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}]]>sql_table_overflowshortloooooooooooooooooooongloooooooooooooooooooongshortsql_table_constrained_overflowshortloooooooooooooooooooongUNQloooooooooooooooooooongshortFK \ No newline at end of file diff --git a/e2etests/testdata/regression/unnamed_class_table_code/dagre/board.exp.json b/e2etests/testdata/regression/unnamed_class_table_code/dagre/board.exp.json index 74fa3cf47..1f783180d 100644 --- a/e2etests/testdata/regression/unnamed_class_table_code/dagre/board.exp.json +++ b/e2etests/testdata/regression/unnamed_class_table_code/dagre/board.exp.json @@ -130,7 +130,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -158,7 +158,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -186,7 +186,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -214,7 +214,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -242,7 +242,7 @@ "labelWidth": 77, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], diff --git a/e2etests/testdata/regression/unnamed_class_table_code/dagre/sketch.exp.svg b/e2etests/testdata/regression/unnamed_class_table_code/dagre/sketch.exp.svg index 83c59f09c..19e8c557e 100644 --- a/e2etests/testdata/regression/unnamed_class_table_code/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/unnamed_class_table_code/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ --numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetimea := 5 + .d2-4221205655 .fill-N1{fill:#0A0F25;} + .d2-4221205655 .fill-N2{fill:#676C7E;} + .d2-4221205655 .fill-N3{fill:#9499AB;} + .d2-4221205655 .fill-N4{fill:#CFD2DD;} + .d2-4221205655 .fill-N5{fill:#DEE1EB;} + .d2-4221205655 .fill-N6{fill:#EEF1F8;} + .d2-4221205655 .fill-N7{fill:#FFFFFF;} + .d2-4221205655 .fill-B1{fill:#0D32B2;} + .d2-4221205655 .fill-B2{fill:#0D32B2;} + .d2-4221205655 .fill-B3{fill:#E3E9FD;} + .d2-4221205655 .fill-B4{fill:#E3E9FD;} + .d2-4221205655 .fill-B5{fill:#EDF0FD;} + .d2-4221205655 .fill-B6{fill:#F7F8FE;} + .d2-4221205655 .fill-AA2{fill:#4A6FF3;} + .d2-4221205655 .fill-AA4{fill:#EDF0FD;} + .d2-4221205655 .fill-AA5{fill:#F7F8FE;} + .d2-4221205655 .fill-AB4{fill:#EDF0FD;} + .d2-4221205655 .fill-AB5{fill:#F7F8FE;} + .d2-4221205655 .stroke-N1{stroke:#0A0F25;} + .d2-4221205655 .stroke-N2{stroke:#676C7E;} + .d2-4221205655 .stroke-N3{stroke:#9499AB;} + .d2-4221205655 .stroke-N4{stroke:#CFD2DD;} + .d2-4221205655 .stroke-N5{stroke:#DEE1EB;} + .d2-4221205655 .stroke-N6{stroke:#EEF1F8;} + .d2-4221205655 .stroke-N7{stroke:#FFFFFF;} + .d2-4221205655 .stroke-B1{stroke:#0D32B2;} + .d2-4221205655 .stroke-B2{stroke:#0D32B2;} + .d2-4221205655 .stroke-B3{stroke:#E3E9FD;} + .d2-4221205655 .stroke-B4{stroke:#E3E9FD;} + .d2-4221205655 .stroke-B5{stroke:#EDF0FD;} + .d2-4221205655 .stroke-B6{stroke:#F7F8FE;} + .d2-4221205655 .stroke-AA2{stroke:#4A6FF3;} + .d2-4221205655 .stroke-AA4{stroke:#EDF0FD;} + .d2-4221205655 .stroke-AA5{stroke:#F7F8FE;} + .d2-4221205655 .stroke-AB4{stroke:#EDF0FD;} + .d2-4221205655 .stroke-AB5{stroke:#F7F8FE;} + .d2-4221205655 .background-color-N1{background-color:#0A0F25;} + .d2-4221205655 .background-color-N2{background-color:#676C7E;} + .d2-4221205655 .background-color-N3{background-color:#9499AB;} + .d2-4221205655 .background-color-N4{background-color:#CFD2DD;} + .d2-4221205655 .background-color-N5{background-color:#DEE1EB;} + .d2-4221205655 .background-color-N6{background-color:#EEF1F8;} + .d2-4221205655 .background-color-N7{background-color:#FFFFFF;} + .d2-4221205655 .background-color-B1{background-color:#0D32B2;} + .d2-4221205655 .background-color-B2{background-color:#0D32B2;} + .d2-4221205655 .background-color-B3{background-color:#E3E9FD;} + .d2-4221205655 .background-color-B4{background-color:#E3E9FD;} + .d2-4221205655 .background-color-B5{background-color:#EDF0FD;} + .d2-4221205655 .background-color-B6{background-color:#F7F8FE;} + .d2-4221205655 .background-color-AA2{background-color:#4A6FF3;} + .d2-4221205655 .background-color-AA4{background-color:#EDF0FD;} + .d2-4221205655 .background-color-AA5{background-color:#F7F8FE;} + .d2-4221205655 .background-color-AB4{background-color:#EDF0FD;} + .d2-4221205655 .background-color-AB5{background-color:#F7F8FE;} + .d2-4221205655 .color-N1{color:#0A0F25;} + .d2-4221205655 .color-N2{color:#676C7E;} + .d2-4221205655 .color-N3{color:#9499AB;} + .d2-4221205655 .color-N4{color:#CFD2DD;} + .d2-4221205655 .color-N5{color:#DEE1EB;} + .d2-4221205655 .color-N6{color:#EEF1F8;} + .d2-4221205655 .color-N7{color:#FFFFFF;} + .d2-4221205655 .color-B1{color:#0D32B2;} + .d2-4221205655 .color-B2{color:#0D32B2;} + .d2-4221205655 .color-B3{color:#E3E9FD;} + .d2-4221205655 .color-B4{color:#E3E9FD;} + .d2-4221205655 .color-B5{color:#EDF0FD;} + .d2-4221205655 .color-B6{color:#F7F8FE;} + .d2-4221205655 .color-AA2{color:#4A6FF3;} + .d2-4221205655 .color-AA4{color:#EDF0FD;} + .d2-4221205655 .color-AA5{color:#F7F8FE;} + .d2-4221205655 .color-AB4{color:#EDF0FD;} + .d2-4221205655 .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}]]>-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetimea := 5 b := a + 7 fmt.Printf("%d", b)a := 5 b := a + 7 -fmt.Printf("%d", b) +fmt.Printf("%d", b) \ No newline at end of file diff --git a/e2etests/testdata/regression/unnamed_class_table_code/elk/board.exp.json b/e2etests/testdata/regression/unnamed_class_table_code/elk/board.exp.json index 377e5f144..115ff55e5 100644 --- a/e2etests/testdata/regression/unnamed_class_table_code/elk/board.exp.json +++ b/e2etests/testdata/regression/unnamed_class_table_code/elk/board.exp.json @@ -130,7 +130,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -158,7 +158,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -186,7 +186,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -214,7 +214,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -242,7 +242,7 @@ "labelWidth": 77, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], diff --git a/e2etests/testdata/regression/unnamed_class_table_code/elk/sketch.exp.svg b/e2etests/testdata/regression/unnamed_class_table_code/elk/sketch.exp.svg index 482df24a6..9aa261bd2 100644 --- a/e2etests/testdata/regression/unnamed_class_table_code/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/unnamed_class_table_code/elk/sketch.exp.svg @@ -1,23 +1,23 @@ --numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetimea := 5 + .d2-2359991916 .fill-N1{fill:#0A0F25;} + .d2-2359991916 .fill-N2{fill:#676C7E;} + .d2-2359991916 .fill-N3{fill:#9499AB;} + .d2-2359991916 .fill-N4{fill:#CFD2DD;} + .d2-2359991916 .fill-N5{fill:#DEE1EB;} + .d2-2359991916 .fill-N6{fill:#EEF1F8;} + .d2-2359991916 .fill-N7{fill:#FFFFFF;} + .d2-2359991916 .fill-B1{fill:#0D32B2;} + .d2-2359991916 .fill-B2{fill:#0D32B2;} + .d2-2359991916 .fill-B3{fill:#E3E9FD;} + .d2-2359991916 .fill-B4{fill:#E3E9FD;} + .d2-2359991916 .fill-B5{fill:#EDF0FD;} + .d2-2359991916 .fill-B6{fill:#F7F8FE;} + .d2-2359991916 .fill-AA2{fill:#4A6FF3;} + .d2-2359991916 .fill-AA4{fill:#EDF0FD;} + .d2-2359991916 .fill-AA5{fill:#F7F8FE;} + .d2-2359991916 .fill-AB4{fill:#EDF0FD;} + .d2-2359991916 .fill-AB5{fill:#F7F8FE;} + .d2-2359991916 .stroke-N1{stroke:#0A0F25;} + .d2-2359991916 .stroke-N2{stroke:#676C7E;} + .d2-2359991916 .stroke-N3{stroke:#9499AB;} + .d2-2359991916 .stroke-N4{stroke:#CFD2DD;} + .d2-2359991916 .stroke-N5{stroke:#DEE1EB;} + .d2-2359991916 .stroke-N6{stroke:#EEF1F8;} + .d2-2359991916 .stroke-N7{stroke:#FFFFFF;} + .d2-2359991916 .stroke-B1{stroke:#0D32B2;} + .d2-2359991916 .stroke-B2{stroke:#0D32B2;} + .d2-2359991916 .stroke-B3{stroke:#E3E9FD;} + .d2-2359991916 .stroke-B4{stroke:#E3E9FD;} + .d2-2359991916 .stroke-B5{stroke:#EDF0FD;} + .d2-2359991916 .stroke-B6{stroke:#F7F8FE;} + .d2-2359991916 .stroke-AA2{stroke:#4A6FF3;} + .d2-2359991916 .stroke-AA4{stroke:#EDF0FD;} + .d2-2359991916 .stroke-AA5{stroke:#F7F8FE;} + .d2-2359991916 .stroke-AB4{stroke:#EDF0FD;} + .d2-2359991916 .stroke-AB5{stroke:#F7F8FE;} + .d2-2359991916 .background-color-N1{background-color:#0A0F25;} + .d2-2359991916 .background-color-N2{background-color:#676C7E;} + .d2-2359991916 .background-color-N3{background-color:#9499AB;} + .d2-2359991916 .background-color-N4{background-color:#CFD2DD;} + .d2-2359991916 .background-color-N5{background-color:#DEE1EB;} + .d2-2359991916 .background-color-N6{background-color:#EEF1F8;} + .d2-2359991916 .background-color-N7{background-color:#FFFFFF;} + .d2-2359991916 .background-color-B1{background-color:#0D32B2;} + .d2-2359991916 .background-color-B2{background-color:#0D32B2;} + .d2-2359991916 .background-color-B3{background-color:#E3E9FD;} + .d2-2359991916 .background-color-B4{background-color:#E3E9FD;} + .d2-2359991916 .background-color-B5{background-color:#EDF0FD;} + .d2-2359991916 .background-color-B6{background-color:#F7F8FE;} + .d2-2359991916 .background-color-AA2{background-color:#4A6FF3;} + .d2-2359991916 .background-color-AA4{background-color:#EDF0FD;} + .d2-2359991916 .background-color-AA5{background-color:#F7F8FE;} + .d2-2359991916 .background-color-AB4{background-color:#EDF0FD;} + .d2-2359991916 .background-color-AB5{background-color:#F7F8FE;} + .d2-2359991916 .color-N1{color:#0A0F25;} + .d2-2359991916 .color-N2{color:#676C7E;} + .d2-2359991916 .color-N3{color:#9499AB;} + .d2-2359991916 .color-N4{color:#CFD2DD;} + .d2-2359991916 .color-N5{color:#DEE1EB;} + .d2-2359991916 .color-N6{color:#EEF1F8;} + .d2-2359991916 .color-N7{color:#FFFFFF;} + .d2-2359991916 .color-B1{color:#0D32B2;} + .d2-2359991916 .color-B2{color:#0D32B2;} + .d2-2359991916 .color-B3{color:#E3E9FD;} + .d2-2359991916 .color-B4{color:#E3E9FD;} + .d2-2359991916 .color-B5{color:#EDF0FD;} + .d2-2359991916 .color-B6{color:#F7F8FE;} + .d2-2359991916 .color-AA2{color:#4A6FF3;} + .d2-2359991916 .color-AA4{color:#EDF0FD;} + .d2-2359991916 .color-AA5{color:#F7F8FE;} + .d2-2359991916 .color-AB4{color:#EDF0FD;} + .d2-2359991916 .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}]]>-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetimea := 5 b := a + 7 fmt.Printf("%d", b)a := 5 b := a + 7 -fmt.Printf("%d", b) +fmt.Printf("%d", b) \ No newline at end of file diff --git a/e2etests/testdata/stable/array-classes/dagre/board.exp.json b/e2etests/testdata/stable/array-classes/dagre/board.exp.json index b3149b051..ffb9d427e 100644 --- a/e2etests/testdata/stable/array-classes/dagre/board.exp.json +++ b/e2etests/testdata/stable/array-classes/dagre/board.exp.json @@ -6,6 +6,10 @@ { "id": "yay", "type": "rectangle", + "classes": [ + "button", + "success" + ], "pos": { "x": 0, "y": 0 @@ -47,6 +51,10 @@ { "id": "nay", "type": "rectangle", + "classes": [ + "button", + "error" + ], "pos": { "x": 180, "y": 0 diff --git a/e2etests/testdata/stable/array-classes/dagre/sketch.exp.svg b/e2etests/testdata/stable/array-classes/dagre/sketch.exp.svg index 650107129..51c35541a 100644 --- a/e2etests/testdata/stable/array-classes/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/array-classes/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -SuccessfulFailure + .d2-2236180231 .fill-N1{fill:#0A0F25;} + .d2-2236180231 .fill-N2{fill:#676C7E;} + .d2-2236180231 .fill-N3{fill:#9499AB;} + .d2-2236180231 .fill-N4{fill:#CFD2DD;} + .d2-2236180231 .fill-N5{fill:#DEE1EB;} + .d2-2236180231 .fill-N6{fill:#EEF1F8;} + .d2-2236180231 .fill-N7{fill:#FFFFFF;} + .d2-2236180231 .fill-B1{fill:#0D32B2;} + .d2-2236180231 .fill-B2{fill:#0D32B2;} + .d2-2236180231 .fill-B3{fill:#E3E9FD;} + .d2-2236180231 .fill-B4{fill:#E3E9FD;} + .d2-2236180231 .fill-B5{fill:#EDF0FD;} + .d2-2236180231 .fill-B6{fill:#F7F8FE;} + .d2-2236180231 .fill-AA2{fill:#4A6FF3;} + .d2-2236180231 .fill-AA4{fill:#EDF0FD;} + .d2-2236180231 .fill-AA5{fill:#F7F8FE;} + .d2-2236180231 .fill-AB4{fill:#EDF0FD;} + .d2-2236180231 .fill-AB5{fill:#F7F8FE;} + .d2-2236180231 .stroke-N1{stroke:#0A0F25;} + .d2-2236180231 .stroke-N2{stroke:#676C7E;} + .d2-2236180231 .stroke-N3{stroke:#9499AB;} + .d2-2236180231 .stroke-N4{stroke:#CFD2DD;} + .d2-2236180231 .stroke-N5{stroke:#DEE1EB;} + .d2-2236180231 .stroke-N6{stroke:#EEF1F8;} + .d2-2236180231 .stroke-N7{stroke:#FFFFFF;} + .d2-2236180231 .stroke-B1{stroke:#0D32B2;} + .d2-2236180231 .stroke-B2{stroke:#0D32B2;} + .d2-2236180231 .stroke-B3{stroke:#E3E9FD;} + .d2-2236180231 .stroke-B4{stroke:#E3E9FD;} + .d2-2236180231 .stroke-B5{stroke:#EDF0FD;} + .d2-2236180231 .stroke-B6{stroke:#F7F8FE;} + .d2-2236180231 .stroke-AA2{stroke:#4A6FF3;} + .d2-2236180231 .stroke-AA4{stroke:#EDF0FD;} + .d2-2236180231 .stroke-AA5{stroke:#F7F8FE;} + .d2-2236180231 .stroke-AB4{stroke:#EDF0FD;} + .d2-2236180231 .stroke-AB5{stroke:#F7F8FE;} + .d2-2236180231 .background-color-N1{background-color:#0A0F25;} + .d2-2236180231 .background-color-N2{background-color:#676C7E;} + .d2-2236180231 .background-color-N3{background-color:#9499AB;} + .d2-2236180231 .background-color-N4{background-color:#CFD2DD;} + .d2-2236180231 .background-color-N5{background-color:#DEE1EB;} + .d2-2236180231 .background-color-N6{background-color:#EEF1F8;} + .d2-2236180231 .background-color-N7{background-color:#FFFFFF;} + .d2-2236180231 .background-color-B1{background-color:#0D32B2;} + .d2-2236180231 .background-color-B2{background-color:#0D32B2;} + .d2-2236180231 .background-color-B3{background-color:#E3E9FD;} + .d2-2236180231 .background-color-B4{background-color:#E3E9FD;} + .d2-2236180231 .background-color-B5{background-color:#EDF0FD;} + .d2-2236180231 .background-color-B6{background-color:#F7F8FE;} + .d2-2236180231 .background-color-AA2{background-color:#4A6FF3;} + .d2-2236180231 .background-color-AA4{background-color:#EDF0FD;} + .d2-2236180231 .background-color-AA5{background-color:#F7F8FE;} + .d2-2236180231 .background-color-AB4{background-color:#EDF0FD;} + .d2-2236180231 .background-color-AB5{background-color:#F7F8FE;} + .d2-2236180231 .color-N1{color:#0A0F25;} + .d2-2236180231 .color-N2{color:#676C7E;} + .d2-2236180231 .color-N3{color:#9499AB;} + .d2-2236180231 .color-N4{color:#CFD2DD;} + .d2-2236180231 .color-N5{color:#DEE1EB;} + .d2-2236180231 .color-N6{color:#EEF1F8;} + .d2-2236180231 .color-N7{color:#FFFFFF;} + .d2-2236180231 .color-B1{color:#0D32B2;} + .d2-2236180231 .color-B2{color:#0D32B2;} + .d2-2236180231 .color-B3{color:#E3E9FD;} + .d2-2236180231 .color-B4{color:#E3E9FD;} + .d2-2236180231 .color-B5{color:#EDF0FD;} + .d2-2236180231 .color-B6{color:#F7F8FE;} + .d2-2236180231 .color-AA2{color:#4A6FF3;} + .d2-2236180231 .color-AA4{color:#EDF0FD;} + .d2-2236180231 .color-AA5{color:#F7F8FE;} + .d2-2236180231 .color-AB4{color:#EDF0FD;} + .d2-2236180231 .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}]]>SuccessfulFailure \ No newline at end of file diff --git a/e2etests/testdata/stable/array-classes/elk/board.exp.json b/e2etests/testdata/stable/array-classes/elk/board.exp.json index c1e181894..9d1326c7a 100644 --- a/e2etests/testdata/stable/array-classes/elk/board.exp.json +++ b/e2etests/testdata/stable/array-classes/elk/board.exp.json @@ -6,6 +6,10 @@ { "id": "yay", "type": "rectangle", + "classes": [ + "button", + "success" + ], "pos": { "x": 12, "y": 12 @@ -47,6 +51,10 @@ { "id": "nay", "type": "rectangle", + "classes": [ + "button", + "error" + ], "pos": { "x": 152, "y": 12 diff --git a/e2etests/testdata/stable/array-classes/elk/sketch.exp.svg b/e2etests/testdata/stable/array-classes/elk/sketch.exp.svg index d316dc827..5d216f6b2 100644 --- a/e2etests/testdata/stable/array-classes/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/array-classes/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -SuccessfulFailure + .d2-2397487381 .fill-N1{fill:#0A0F25;} + .d2-2397487381 .fill-N2{fill:#676C7E;} + .d2-2397487381 .fill-N3{fill:#9499AB;} + .d2-2397487381 .fill-N4{fill:#CFD2DD;} + .d2-2397487381 .fill-N5{fill:#DEE1EB;} + .d2-2397487381 .fill-N6{fill:#EEF1F8;} + .d2-2397487381 .fill-N7{fill:#FFFFFF;} + .d2-2397487381 .fill-B1{fill:#0D32B2;} + .d2-2397487381 .fill-B2{fill:#0D32B2;} + .d2-2397487381 .fill-B3{fill:#E3E9FD;} + .d2-2397487381 .fill-B4{fill:#E3E9FD;} + .d2-2397487381 .fill-B5{fill:#EDF0FD;} + .d2-2397487381 .fill-B6{fill:#F7F8FE;} + .d2-2397487381 .fill-AA2{fill:#4A6FF3;} + .d2-2397487381 .fill-AA4{fill:#EDF0FD;} + .d2-2397487381 .fill-AA5{fill:#F7F8FE;} + .d2-2397487381 .fill-AB4{fill:#EDF0FD;} + .d2-2397487381 .fill-AB5{fill:#F7F8FE;} + .d2-2397487381 .stroke-N1{stroke:#0A0F25;} + .d2-2397487381 .stroke-N2{stroke:#676C7E;} + .d2-2397487381 .stroke-N3{stroke:#9499AB;} + .d2-2397487381 .stroke-N4{stroke:#CFD2DD;} + .d2-2397487381 .stroke-N5{stroke:#DEE1EB;} + .d2-2397487381 .stroke-N6{stroke:#EEF1F8;} + .d2-2397487381 .stroke-N7{stroke:#FFFFFF;} + .d2-2397487381 .stroke-B1{stroke:#0D32B2;} + .d2-2397487381 .stroke-B2{stroke:#0D32B2;} + .d2-2397487381 .stroke-B3{stroke:#E3E9FD;} + .d2-2397487381 .stroke-B4{stroke:#E3E9FD;} + .d2-2397487381 .stroke-B5{stroke:#EDF0FD;} + .d2-2397487381 .stroke-B6{stroke:#F7F8FE;} + .d2-2397487381 .stroke-AA2{stroke:#4A6FF3;} + .d2-2397487381 .stroke-AA4{stroke:#EDF0FD;} + .d2-2397487381 .stroke-AA5{stroke:#F7F8FE;} + .d2-2397487381 .stroke-AB4{stroke:#EDF0FD;} + .d2-2397487381 .stroke-AB5{stroke:#F7F8FE;} + .d2-2397487381 .background-color-N1{background-color:#0A0F25;} + .d2-2397487381 .background-color-N2{background-color:#676C7E;} + .d2-2397487381 .background-color-N3{background-color:#9499AB;} + .d2-2397487381 .background-color-N4{background-color:#CFD2DD;} + .d2-2397487381 .background-color-N5{background-color:#DEE1EB;} + .d2-2397487381 .background-color-N6{background-color:#EEF1F8;} + .d2-2397487381 .background-color-N7{background-color:#FFFFFF;} + .d2-2397487381 .background-color-B1{background-color:#0D32B2;} + .d2-2397487381 .background-color-B2{background-color:#0D32B2;} + .d2-2397487381 .background-color-B3{background-color:#E3E9FD;} + .d2-2397487381 .background-color-B4{background-color:#E3E9FD;} + .d2-2397487381 .background-color-B5{background-color:#EDF0FD;} + .d2-2397487381 .background-color-B6{background-color:#F7F8FE;} + .d2-2397487381 .background-color-AA2{background-color:#4A6FF3;} + .d2-2397487381 .background-color-AA4{background-color:#EDF0FD;} + .d2-2397487381 .background-color-AA5{background-color:#F7F8FE;} + .d2-2397487381 .background-color-AB4{background-color:#EDF0FD;} + .d2-2397487381 .background-color-AB5{background-color:#F7F8FE;} + .d2-2397487381 .color-N1{color:#0A0F25;} + .d2-2397487381 .color-N2{color:#676C7E;} + .d2-2397487381 .color-N3{color:#9499AB;} + .d2-2397487381 .color-N4{color:#CFD2DD;} + .d2-2397487381 .color-N5{color:#DEE1EB;} + .d2-2397487381 .color-N6{color:#EEF1F8;} + .d2-2397487381 .color-N7{color:#FFFFFF;} + .d2-2397487381 .color-B1{color:#0D32B2;} + .d2-2397487381 .color-B2{color:#0D32B2;} + .d2-2397487381 .color-B3{color:#E3E9FD;} + .d2-2397487381 .color-B4{color:#E3E9FD;} + .d2-2397487381 .color-B5{color:#EDF0FD;} + .d2-2397487381 .color-B6{color:#F7F8FE;} + .d2-2397487381 .color-AA2{color:#4A6FF3;} + .d2-2397487381 .color-AA4{color:#EDF0FD;} + .d2-2397487381 .color-AA5{color:#F7F8FE;} + .d2-2397487381 .color-AB4{color:#EDF0FD;} + .d2-2397487381 .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}]]>SuccessfulFailure \ No newline at end of file diff --git a/e2etests/testdata/stable/class_and_sqlTable_border_radius/dagre/board.exp.json b/e2etests/testdata/stable/class_and_sqlTable_border_radius/dagre/board.exp.json index 0836aabed..3d9ed2ba9 100644 --- a/e2etests/testdata/stable/class_and_sqlTable_border_radius/dagre/board.exp.json +++ b/e2etests/testdata/stable/class_and_sqlTable_border_radius/dagre/board.exp.json @@ -55,7 +55,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -83,7 +85,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" }, { @@ -111,7 +115,9 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "unique", + "constraint": [ + "unique" + ], "reference": "" }, { @@ -139,7 +145,7 @@ "labelWidth": 219, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], diff --git a/e2etests/testdata/stable/class_and_sqlTable_border_radius/dagre/sketch.exp.svg b/e2etests/testdata/stable/class_and_sqlTable_border_radius/dagre/sketch.exp.svg index 916f23b6e..730a87272 100644 --- a/e2etests/testdata/stable/class_and_sqlTable_border_radius/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/class_and_sqlTable_border_radius/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ - aidintPKdiskintFKjsonjsonbUNQlast_updatedtimestamp with time zone b+field[]string+method(a uint64)(x, y int) c d + .d2-3002275928 .fill-N1{fill:#0A0F25;} + .d2-3002275928 .fill-N2{fill:#676C7E;} + .d2-3002275928 .fill-N3{fill:#9499AB;} + .d2-3002275928 .fill-N4{fill:#CFD2DD;} + .d2-3002275928 .fill-N5{fill:#DEE1EB;} + .d2-3002275928 .fill-N6{fill:#EEF1F8;} + .d2-3002275928 .fill-N7{fill:#FFFFFF;} + .d2-3002275928 .fill-B1{fill:#0D32B2;} + .d2-3002275928 .fill-B2{fill:#0D32B2;} + .d2-3002275928 .fill-B3{fill:#E3E9FD;} + .d2-3002275928 .fill-B4{fill:#E3E9FD;} + .d2-3002275928 .fill-B5{fill:#EDF0FD;} + .d2-3002275928 .fill-B6{fill:#F7F8FE;} + .d2-3002275928 .fill-AA2{fill:#4A6FF3;} + .d2-3002275928 .fill-AA4{fill:#EDF0FD;} + .d2-3002275928 .fill-AA5{fill:#F7F8FE;} + .d2-3002275928 .fill-AB4{fill:#EDF0FD;} + .d2-3002275928 .fill-AB5{fill:#F7F8FE;} + .d2-3002275928 .stroke-N1{stroke:#0A0F25;} + .d2-3002275928 .stroke-N2{stroke:#676C7E;} + .d2-3002275928 .stroke-N3{stroke:#9499AB;} + .d2-3002275928 .stroke-N4{stroke:#CFD2DD;} + .d2-3002275928 .stroke-N5{stroke:#DEE1EB;} + .d2-3002275928 .stroke-N6{stroke:#EEF1F8;} + .d2-3002275928 .stroke-N7{stroke:#FFFFFF;} + .d2-3002275928 .stroke-B1{stroke:#0D32B2;} + .d2-3002275928 .stroke-B2{stroke:#0D32B2;} + .d2-3002275928 .stroke-B3{stroke:#E3E9FD;} + .d2-3002275928 .stroke-B4{stroke:#E3E9FD;} + .d2-3002275928 .stroke-B5{stroke:#EDF0FD;} + .d2-3002275928 .stroke-B6{stroke:#F7F8FE;} + .d2-3002275928 .stroke-AA2{stroke:#4A6FF3;} + .d2-3002275928 .stroke-AA4{stroke:#EDF0FD;} + .d2-3002275928 .stroke-AA5{stroke:#F7F8FE;} + .d2-3002275928 .stroke-AB4{stroke:#EDF0FD;} + .d2-3002275928 .stroke-AB5{stroke:#F7F8FE;} + .d2-3002275928 .background-color-N1{background-color:#0A0F25;} + .d2-3002275928 .background-color-N2{background-color:#676C7E;} + .d2-3002275928 .background-color-N3{background-color:#9499AB;} + .d2-3002275928 .background-color-N4{background-color:#CFD2DD;} + .d2-3002275928 .background-color-N5{background-color:#DEE1EB;} + .d2-3002275928 .background-color-N6{background-color:#EEF1F8;} + .d2-3002275928 .background-color-N7{background-color:#FFFFFF;} + .d2-3002275928 .background-color-B1{background-color:#0D32B2;} + .d2-3002275928 .background-color-B2{background-color:#0D32B2;} + .d2-3002275928 .background-color-B3{background-color:#E3E9FD;} + .d2-3002275928 .background-color-B4{background-color:#E3E9FD;} + .d2-3002275928 .background-color-B5{background-color:#EDF0FD;} + .d2-3002275928 .background-color-B6{background-color:#F7F8FE;} + .d2-3002275928 .background-color-AA2{background-color:#4A6FF3;} + .d2-3002275928 .background-color-AA4{background-color:#EDF0FD;} + .d2-3002275928 .background-color-AA5{background-color:#F7F8FE;} + .d2-3002275928 .background-color-AB4{background-color:#EDF0FD;} + .d2-3002275928 .background-color-AB5{background-color:#F7F8FE;} + .d2-3002275928 .color-N1{color:#0A0F25;} + .d2-3002275928 .color-N2{color:#676C7E;} + .d2-3002275928 .color-N3{color:#9499AB;} + .d2-3002275928 .color-N4{color:#CFD2DD;} + .d2-3002275928 .color-N5{color:#DEE1EB;} + .d2-3002275928 .color-N6{color:#EEF1F8;} + .d2-3002275928 .color-N7{color:#FFFFFF;} + .d2-3002275928 .color-B1{color:#0D32B2;} + .d2-3002275928 .color-B2{color:#0D32B2;} + .d2-3002275928 .color-B3{color:#E3E9FD;} + .d2-3002275928 .color-B4{color:#E3E9FD;} + .d2-3002275928 .color-B5{color:#EDF0FD;} + .d2-3002275928 .color-B6{color:#F7F8FE;} + .d2-3002275928 .color-AA2{color:#4A6FF3;} + .d2-3002275928 .color-AA4{color:#EDF0FD;} + .d2-3002275928 .color-AA5{color:#F7F8FE;} + .d2-3002275928 .color-AB4{color:#EDF0FD;} + .d2-3002275928 .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}]]> aidintPKdiskintFKjsonjsonbUNQlast_updatedtimestamp with time zone b+field[]string+method(a uint64)(x, y int) c d \ No newline at end of file diff --git a/e2etests/testdata/stable/class_and_sqlTable_border_radius/elk/board.exp.json b/e2etests/testdata/stable/class_and_sqlTable_border_radius/elk/board.exp.json index 557561b09..1b5822a06 100644 --- a/e2etests/testdata/stable/class_and_sqlTable_border_radius/elk/board.exp.json +++ b/e2etests/testdata/stable/class_and_sqlTable_border_radius/elk/board.exp.json @@ -55,7 +55,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -83,7 +85,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" }, { @@ -111,7 +115,9 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "unique", + "constraint": [ + "unique" + ], "reference": "" }, { @@ -139,7 +145,7 @@ "labelWidth": 219, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], diff --git a/e2etests/testdata/stable/class_and_sqlTable_border_radius/elk/sketch.exp.svg b/e2etests/testdata/stable/class_and_sqlTable_border_radius/elk/sketch.exp.svg index f8af9686a..8a41dd530 100644 --- a/e2etests/testdata/stable/class_and_sqlTable_border_radius/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/class_and_sqlTable_border_radius/elk/sketch.exp.svg @@ -1,16 +1,16 @@ - aidintPKdiskintFKjsonjsonbUNQlast_updatedtimestamp with time zone b+field[]string+method(a uint64)(x, y int) c d + .d2-3551662305 .fill-N1{fill:#0A0F25;} + .d2-3551662305 .fill-N2{fill:#676C7E;} + .d2-3551662305 .fill-N3{fill:#9499AB;} + .d2-3551662305 .fill-N4{fill:#CFD2DD;} + .d2-3551662305 .fill-N5{fill:#DEE1EB;} + .d2-3551662305 .fill-N6{fill:#EEF1F8;} + .d2-3551662305 .fill-N7{fill:#FFFFFF;} + .d2-3551662305 .fill-B1{fill:#0D32B2;} + .d2-3551662305 .fill-B2{fill:#0D32B2;} + .d2-3551662305 .fill-B3{fill:#E3E9FD;} + .d2-3551662305 .fill-B4{fill:#E3E9FD;} + .d2-3551662305 .fill-B5{fill:#EDF0FD;} + .d2-3551662305 .fill-B6{fill:#F7F8FE;} + .d2-3551662305 .fill-AA2{fill:#4A6FF3;} + .d2-3551662305 .fill-AA4{fill:#EDF0FD;} + .d2-3551662305 .fill-AA5{fill:#F7F8FE;} + .d2-3551662305 .fill-AB4{fill:#EDF0FD;} + .d2-3551662305 .fill-AB5{fill:#F7F8FE;} + .d2-3551662305 .stroke-N1{stroke:#0A0F25;} + .d2-3551662305 .stroke-N2{stroke:#676C7E;} + .d2-3551662305 .stroke-N3{stroke:#9499AB;} + .d2-3551662305 .stroke-N4{stroke:#CFD2DD;} + .d2-3551662305 .stroke-N5{stroke:#DEE1EB;} + .d2-3551662305 .stroke-N6{stroke:#EEF1F8;} + .d2-3551662305 .stroke-N7{stroke:#FFFFFF;} + .d2-3551662305 .stroke-B1{stroke:#0D32B2;} + .d2-3551662305 .stroke-B2{stroke:#0D32B2;} + .d2-3551662305 .stroke-B3{stroke:#E3E9FD;} + .d2-3551662305 .stroke-B4{stroke:#E3E9FD;} + .d2-3551662305 .stroke-B5{stroke:#EDF0FD;} + .d2-3551662305 .stroke-B6{stroke:#F7F8FE;} + .d2-3551662305 .stroke-AA2{stroke:#4A6FF3;} + .d2-3551662305 .stroke-AA4{stroke:#EDF0FD;} + .d2-3551662305 .stroke-AA5{stroke:#F7F8FE;} + .d2-3551662305 .stroke-AB4{stroke:#EDF0FD;} + .d2-3551662305 .stroke-AB5{stroke:#F7F8FE;} + .d2-3551662305 .background-color-N1{background-color:#0A0F25;} + .d2-3551662305 .background-color-N2{background-color:#676C7E;} + .d2-3551662305 .background-color-N3{background-color:#9499AB;} + .d2-3551662305 .background-color-N4{background-color:#CFD2DD;} + .d2-3551662305 .background-color-N5{background-color:#DEE1EB;} + .d2-3551662305 .background-color-N6{background-color:#EEF1F8;} + .d2-3551662305 .background-color-N7{background-color:#FFFFFF;} + .d2-3551662305 .background-color-B1{background-color:#0D32B2;} + .d2-3551662305 .background-color-B2{background-color:#0D32B2;} + .d2-3551662305 .background-color-B3{background-color:#E3E9FD;} + .d2-3551662305 .background-color-B4{background-color:#E3E9FD;} + .d2-3551662305 .background-color-B5{background-color:#EDF0FD;} + .d2-3551662305 .background-color-B6{background-color:#F7F8FE;} + .d2-3551662305 .background-color-AA2{background-color:#4A6FF3;} + .d2-3551662305 .background-color-AA4{background-color:#EDF0FD;} + .d2-3551662305 .background-color-AA5{background-color:#F7F8FE;} + .d2-3551662305 .background-color-AB4{background-color:#EDF0FD;} + .d2-3551662305 .background-color-AB5{background-color:#F7F8FE;} + .d2-3551662305 .color-N1{color:#0A0F25;} + .d2-3551662305 .color-N2{color:#676C7E;} + .d2-3551662305 .color-N3{color:#9499AB;} + .d2-3551662305 .color-N4{color:#CFD2DD;} + .d2-3551662305 .color-N5{color:#DEE1EB;} + .d2-3551662305 .color-N6{color:#EEF1F8;} + .d2-3551662305 .color-N7{color:#FFFFFF;} + .d2-3551662305 .color-B1{color:#0D32B2;} + .d2-3551662305 .color-B2{color:#0D32B2;} + .d2-3551662305 .color-B3{color:#E3E9FD;} + .d2-3551662305 .color-B4{color:#E3E9FD;} + .d2-3551662305 .color-B5{color:#EDF0FD;} + .d2-3551662305 .color-B6{color:#F7F8FE;} + .d2-3551662305 .color-AA2{color:#4A6FF3;} + .d2-3551662305 .color-AA4{color:#EDF0FD;} + .d2-3551662305 .color-AA5{color:#F7F8FE;} + .d2-3551662305 .color-AB4{color:#EDF0FD;} + .d2-3551662305 .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}]]> aidintPKdiskintFKjsonjsonbUNQlast_updatedtimestamp with time zone b+field[]string+method(a uint64)(x, y int) c d \ No newline at end of file diff --git a/e2etests/testdata/stable/ent2d2_basic/dagre/board.exp.json b/e2etests/testdata/stable/ent2d2_basic/dagre/board.exp.json index ec32a6e81..d0f85ab2f 100644 --- a/e2etests/testdata/stable/ent2d2_basic/dagre/board.exp.json +++ b/e2etests/testdata/stable/ent2d2_basic/dagre/board.exp.json @@ -55,7 +55,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -83,7 +85,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" }, { @@ -111,7 +115,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" } ], @@ -183,7 +189,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -211,7 +219,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" } ], @@ -283,7 +293,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -311,7 +323,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" } ], @@ -383,7 +397,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -411,7 +427,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -439,7 +455,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" } ], @@ -511,7 +529,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -539,7 +559,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], @@ -611,7 +631,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -639,7 +661,7 @@ "labelWidth": 149, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], diff --git a/e2etests/testdata/stable/ent2d2_basic/dagre/sketch.exp.svg b/e2etests/testdata/stable/ent2d2_basic/dagre/sketch.exp.svg index 5dcea3c9b..1a1803f42 100644 --- a/e2etests/testdata/stable/ent2d2_basic/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/ent2d2_basic/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -UseridintPKparent_idintFKspouse_idintFKPetidintPKowner_idintFKCardidintPKowner_idintFKPostidintPKtextstringauthor_idintFKMetadataidintPKageintInfoidintPKcontentjson.RawMessage spouse children/parent/ancestorpets/ownercard/ownerposts/authormetadata/userinfo/user + .d2-3599590547 .fill-N1{fill:#0A0F25;} + .d2-3599590547 .fill-N2{fill:#676C7E;} + .d2-3599590547 .fill-N3{fill:#9499AB;} + .d2-3599590547 .fill-N4{fill:#CFD2DD;} + .d2-3599590547 .fill-N5{fill:#DEE1EB;} + .d2-3599590547 .fill-N6{fill:#EEF1F8;} + .d2-3599590547 .fill-N7{fill:#FFFFFF;} + .d2-3599590547 .fill-B1{fill:#0D32B2;} + .d2-3599590547 .fill-B2{fill:#0D32B2;} + .d2-3599590547 .fill-B3{fill:#E3E9FD;} + .d2-3599590547 .fill-B4{fill:#E3E9FD;} + .d2-3599590547 .fill-B5{fill:#EDF0FD;} + .d2-3599590547 .fill-B6{fill:#F7F8FE;} + .d2-3599590547 .fill-AA2{fill:#4A6FF3;} + .d2-3599590547 .fill-AA4{fill:#EDF0FD;} + .d2-3599590547 .fill-AA5{fill:#F7F8FE;} + .d2-3599590547 .fill-AB4{fill:#EDF0FD;} + .d2-3599590547 .fill-AB5{fill:#F7F8FE;} + .d2-3599590547 .stroke-N1{stroke:#0A0F25;} + .d2-3599590547 .stroke-N2{stroke:#676C7E;} + .d2-3599590547 .stroke-N3{stroke:#9499AB;} + .d2-3599590547 .stroke-N4{stroke:#CFD2DD;} + .d2-3599590547 .stroke-N5{stroke:#DEE1EB;} + .d2-3599590547 .stroke-N6{stroke:#EEF1F8;} + .d2-3599590547 .stroke-N7{stroke:#FFFFFF;} + .d2-3599590547 .stroke-B1{stroke:#0D32B2;} + .d2-3599590547 .stroke-B2{stroke:#0D32B2;} + .d2-3599590547 .stroke-B3{stroke:#E3E9FD;} + .d2-3599590547 .stroke-B4{stroke:#E3E9FD;} + .d2-3599590547 .stroke-B5{stroke:#EDF0FD;} + .d2-3599590547 .stroke-B6{stroke:#F7F8FE;} + .d2-3599590547 .stroke-AA2{stroke:#4A6FF3;} + .d2-3599590547 .stroke-AA4{stroke:#EDF0FD;} + .d2-3599590547 .stroke-AA5{stroke:#F7F8FE;} + .d2-3599590547 .stroke-AB4{stroke:#EDF0FD;} + .d2-3599590547 .stroke-AB5{stroke:#F7F8FE;} + .d2-3599590547 .background-color-N1{background-color:#0A0F25;} + .d2-3599590547 .background-color-N2{background-color:#676C7E;} + .d2-3599590547 .background-color-N3{background-color:#9499AB;} + .d2-3599590547 .background-color-N4{background-color:#CFD2DD;} + .d2-3599590547 .background-color-N5{background-color:#DEE1EB;} + .d2-3599590547 .background-color-N6{background-color:#EEF1F8;} + .d2-3599590547 .background-color-N7{background-color:#FFFFFF;} + .d2-3599590547 .background-color-B1{background-color:#0D32B2;} + .d2-3599590547 .background-color-B2{background-color:#0D32B2;} + .d2-3599590547 .background-color-B3{background-color:#E3E9FD;} + .d2-3599590547 .background-color-B4{background-color:#E3E9FD;} + .d2-3599590547 .background-color-B5{background-color:#EDF0FD;} + .d2-3599590547 .background-color-B6{background-color:#F7F8FE;} + .d2-3599590547 .background-color-AA2{background-color:#4A6FF3;} + .d2-3599590547 .background-color-AA4{background-color:#EDF0FD;} + .d2-3599590547 .background-color-AA5{background-color:#F7F8FE;} + .d2-3599590547 .background-color-AB4{background-color:#EDF0FD;} + .d2-3599590547 .background-color-AB5{background-color:#F7F8FE;} + .d2-3599590547 .color-N1{color:#0A0F25;} + .d2-3599590547 .color-N2{color:#676C7E;} + .d2-3599590547 .color-N3{color:#9499AB;} + .d2-3599590547 .color-N4{color:#CFD2DD;} + .d2-3599590547 .color-N5{color:#DEE1EB;} + .d2-3599590547 .color-N6{color:#EEF1F8;} + .d2-3599590547 .color-N7{color:#FFFFFF;} + .d2-3599590547 .color-B1{color:#0D32B2;} + .d2-3599590547 .color-B2{color:#0D32B2;} + .d2-3599590547 .color-B3{color:#E3E9FD;} + .d2-3599590547 .color-B4{color:#E3E9FD;} + .d2-3599590547 .color-B5{color:#EDF0FD;} + .d2-3599590547 .color-B6{color:#F7F8FE;} + .d2-3599590547 .color-AA2{color:#4A6FF3;} + .d2-3599590547 .color-AA4{color:#EDF0FD;} + .d2-3599590547 .color-AA5{color:#F7F8FE;} + .d2-3599590547 .color-AB4{color:#EDF0FD;} + .d2-3599590547 .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}]]>UseridintPKparent_idintFKspouse_idintFKPetidintPKowner_idintFKCardidintPKowner_idintFKPostidintPKtextstringauthor_idintFKMetadataidintPKageintInfoidintPKcontentjson.RawMessage spouse children/parent/ancestorpets/ownercard/ownerposts/authormetadata/userinfo/user diff --git a/e2etests/testdata/stable/ent2d2_basic/elk/board.exp.json b/e2etests/testdata/stable/ent2d2_basic/elk/board.exp.json index 17bfd3cda..71a37ae1e 100644 --- a/e2etests/testdata/stable/ent2d2_basic/elk/board.exp.json +++ b/e2etests/testdata/stable/ent2d2_basic/elk/board.exp.json @@ -55,7 +55,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -83,7 +85,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" }, { @@ -111,7 +115,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" } ], @@ -183,7 +189,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -211,7 +219,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" } ], @@ -283,7 +293,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -311,7 +323,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" } ], @@ -383,7 +397,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -411,7 +427,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -439,7 +455,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" } ], @@ -511,7 +529,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -539,7 +559,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], @@ -611,7 +631,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -639,7 +661,7 @@ "labelWidth": 149, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], diff --git a/e2etests/testdata/stable/ent2d2_basic/elk/sketch.exp.svg b/e2etests/testdata/stable/ent2d2_basic/elk/sketch.exp.svg index 205bb2374..0abb785da 100644 --- a/e2etests/testdata/stable/ent2d2_basic/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/ent2d2_basic/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -UseridintPKparent_idintFKspouse_idintFKPetidintPKowner_idintFKCardidintPKowner_idintFKPostidintPKtextstringauthor_idintFKMetadataidintPKageintInfoidintPKcontentjson.RawMessage spouse children/parent/ancestorpets/ownercard/ownerposts/authormetadata/userinfo/user + .d2-165492064 .fill-N1{fill:#0A0F25;} + .d2-165492064 .fill-N2{fill:#676C7E;} + .d2-165492064 .fill-N3{fill:#9499AB;} + .d2-165492064 .fill-N4{fill:#CFD2DD;} + .d2-165492064 .fill-N5{fill:#DEE1EB;} + .d2-165492064 .fill-N6{fill:#EEF1F8;} + .d2-165492064 .fill-N7{fill:#FFFFFF;} + .d2-165492064 .fill-B1{fill:#0D32B2;} + .d2-165492064 .fill-B2{fill:#0D32B2;} + .d2-165492064 .fill-B3{fill:#E3E9FD;} + .d2-165492064 .fill-B4{fill:#E3E9FD;} + .d2-165492064 .fill-B5{fill:#EDF0FD;} + .d2-165492064 .fill-B6{fill:#F7F8FE;} + .d2-165492064 .fill-AA2{fill:#4A6FF3;} + .d2-165492064 .fill-AA4{fill:#EDF0FD;} + .d2-165492064 .fill-AA5{fill:#F7F8FE;} + .d2-165492064 .fill-AB4{fill:#EDF0FD;} + .d2-165492064 .fill-AB5{fill:#F7F8FE;} + .d2-165492064 .stroke-N1{stroke:#0A0F25;} + .d2-165492064 .stroke-N2{stroke:#676C7E;} + .d2-165492064 .stroke-N3{stroke:#9499AB;} + .d2-165492064 .stroke-N4{stroke:#CFD2DD;} + .d2-165492064 .stroke-N5{stroke:#DEE1EB;} + .d2-165492064 .stroke-N6{stroke:#EEF1F8;} + .d2-165492064 .stroke-N7{stroke:#FFFFFF;} + .d2-165492064 .stroke-B1{stroke:#0D32B2;} + .d2-165492064 .stroke-B2{stroke:#0D32B2;} + .d2-165492064 .stroke-B3{stroke:#E3E9FD;} + .d2-165492064 .stroke-B4{stroke:#E3E9FD;} + .d2-165492064 .stroke-B5{stroke:#EDF0FD;} + .d2-165492064 .stroke-B6{stroke:#F7F8FE;} + .d2-165492064 .stroke-AA2{stroke:#4A6FF3;} + .d2-165492064 .stroke-AA4{stroke:#EDF0FD;} + .d2-165492064 .stroke-AA5{stroke:#F7F8FE;} + .d2-165492064 .stroke-AB4{stroke:#EDF0FD;} + .d2-165492064 .stroke-AB5{stroke:#F7F8FE;} + .d2-165492064 .background-color-N1{background-color:#0A0F25;} + .d2-165492064 .background-color-N2{background-color:#676C7E;} + .d2-165492064 .background-color-N3{background-color:#9499AB;} + .d2-165492064 .background-color-N4{background-color:#CFD2DD;} + .d2-165492064 .background-color-N5{background-color:#DEE1EB;} + .d2-165492064 .background-color-N6{background-color:#EEF1F8;} + .d2-165492064 .background-color-N7{background-color:#FFFFFF;} + .d2-165492064 .background-color-B1{background-color:#0D32B2;} + .d2-165492064 .background-color-B2{background-color:#0D32B2;} + .d2-165492064 .background-color-B3{background-color:#E3E9FD;} + .d2-165492064 .background-color-B4{background-color:#E3E9FD;} + .d2-165492064 .background-color-B5{background-color:#EDF0FD;} + .d2-165492064 .background-color-B6{background-color:#F7F8FE;} + .d2-165492064 .background-color-AA2{background-color:#4A6FF3;} + .d2-165492064 .background-color-AA4{background-color:#EDF0FD;} + .d2-165492064 .background-color-AA5{background-color:#F7F8FE;} + .d2-165492064 .background-color-AB4{background-color:#EDF0FD;} + .d2-165492064 .background-color-AB5{background-color:#F7F8FE;} + .d2-165492064 .color-N1{color:#0A0F25;} + .d2-165492064 .color-N2{color:#676C7E;} + .d2-165492064 .color-N3{color:#9499AB;} + .d2-165492064 .color-N4{color:#CFD2DD;} + .d2-165492064 .color-N5{color:#DEE1EB;} + .d2-165492064 .color-N6{color:#EEF1F8;} + .d2-165492064 .color-N7{color:#FFFFFF;} + .d2-165492064 .color-B1{color:#0D32B2;} + .d2-165492064 .color-B2{color:#0D32B2;} + .d2-165492064 .color-B3{color:#E3E9FD;} + .d2-165492064 .color-B4{color:#E3E9FD;} + .d2-165492064 .color-B5{color:#EDF0FD;} + .d2-165492064 .color-B6{color:#F7F8FE;} + .d2-165492064 .color-AA2{color:#4A6FF3;} + .d2-165492064 .color-AA4{color:#EDF0FD;} + .d2-165492064 .color-AA5{color:#F7F8FE;} + .d2-165492064 .color-AB4{color:#EDF0FD;} + .d2-165492064 .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}]]>UseridintPKparent_idintFKspouse_idintFKPetidintPKowner_idintFKCardidintPKowner_idintFKPostidintPKtextstringauthor_idintFKMetadataidintPKageintInfoidintPKcontentjson.RawMessage spouse children/parent/ancestorpets/ownercard/ownerposts/authormetadata/userinfo/user diff --git a/e2etests/testdata/stable/ent2d2_right/dagre/board.exp.json b/e2etests/testdata/stable/ent2d2_right/dagre/board.exp.json index 0ce03b06d..120d47a63 100644 --- a/e2etests/testdata/stable/ent2d2_right/dagre/board.exp.json +++ b/e2etests/testdata/stable/ent2d2_right/dagre/board.exp.json @@ -55,7 +55,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -83,7 +85,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" }, { @@ -111,7 +115,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" } ], @@ -183,7 +189,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -211,7 +219,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" } ], @@ -283,7 +293,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -311,7 +323,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" } ], @@ -383,7 +397,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -411,7 +427,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -439,7 +455,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" } ], @@ -511,7 +529,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -539,7 +559,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], @@ -611,7 +631,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -639,7 +661,7 @@ "labelWidth": 149, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], diff --git a/e2etests/testdata/stable/ent2d2_right/dagre/sketch.exp.svg b/e2etests/testdata/stable/ent2d2_right/dagre/sketch.exp.svg index b593b9671..584add315 100644 --- a/e2etests/testdata/stable/ent2d2_right/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/ent2d2_right/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -UseridintPKparent_idintFKspouse_idintFKPetidintPKowner_idintFKCardidintPKowner_idintFKPostidintPKtextstringauthor_idintFKMetadataidintPKageintInfoidintPKcontentjson.RawMessage spousespouse childrenparentyowhoaheypets/ownercard/ownerposts/authormetadata/userinfo/user + .d2-2463336698 .fill-N1{fill:#0A0F25;} + .d2-2463336698 .fill-N2{fill:#676C7E;} + .d2-2463336698 .fill-N3{fill:#9499AB;} + .d2-2463336698 .fill-N4{fill:#CFD2DD;} + .d2-2463336698 .fill-N5{fill:#DEE1EB;} + .d2-2463336698 .fill-N6{fill:#EEF1F8;} + .d2-2463336698 .fill-N7{fill:#FFFFFF;} + .d2-2463336698 .fill-B1{fill:#0D32B2;} + .d2-2463336698 .fill-B2{fill:#0D32B2;} + .d2-2463336698 .fill-B3{fill:#E3E9FD;} + .d2-2463336698 .fill-B4{fill:#E3E9FD;} + .d2-2463336698 .fill-B5{fill:#EDF0FD;} + .d2-2463336698 .fill-B6{fill:#F7F8FE;} + .d2-2463336698 .fill-AA2{fill:#4A6FF3;} + .d2-2463336698 .fill-AA4{fill:#EDF0FD;} + .d2-2463336698 .fill-AA5{fill:#F7F8FE;} + .d2-2463336698 .fill-AB4{fill:#EDF0FD;} + .d2-2463336698 .fill-AB5{fill:#F7F8FE;} + .d2-2463336698 .stroke-N1{stroke:#0A0F25;} + .d2-2463336698 .stroke-N2{stroke:#676C7E;} + .d2-2463336698 .stroke-N3{stroke:#9499AB;} + .d2-2463336698 .stroke-N4{stroke:#CFD2DD;} + .d2-2463336698 .stroke-N5{stroke:#DEE1EB;} + .d2-2463336698 .stroke-N6{stroke:#EEF1F8;} + .d2-2463336698 .stroke-N7{stroke:#FFFFFF;} + .d2-2463336698 .stroke-B1{stroke:#0D32B2;} + .d2-2463336698 .stroke-B2{stroke:#0D32B2;} + .d2-2463336698 .stroke-B3{stroke:#E3E9FD;} + .d2-2463336698 .stroke-B4{stroke:#E3E9FD;} + .d2-2463336698 .stroke-B5{stroke:#EDF0FD;} + .d2-2463336698 .stroke-B6{stroke:#F7F8FE;} + .d2-2463336698 .stroke-AA2{stroke:#4A6FF3;} + .d2-2463336698 .stroke-AA4{stroke:#EDF0FD;} + .d2-2463336698 .stroke-AA5{stroke:#F7F8FE;} + .d2-2463336698 .stroke-AB4{stroke:#EDF0FD;} + .d2-2463336698 .stroke-AB5{stroke:#F7F8FE;} + .d2-2463336698 .background-color-N1{background-color:#0A0F25;} + .d2-2463336698 .background-color-N2{background-color:#676C7E;} + .d2-2463336698 .background-color-N3{background-color:#9499AB;} + .d2-2463336698 .background-color-N4{background-color:#CFD2DD;} + .d2-2463336698 .background-color-N5{background-color:#DEE1EB;} + .d2-2463336698 .background-color-N6{background-color:#EEF1F8;} + .d2-2463336698 .background-color-N7{background-color:#FFFFFF;} + .d2-2463336698 .background-color-B1{background-color:#0D32B2;} + .d2-2463336698 .background-color-B2{background-color:#0D32B2;} + .d2-2463336698 .background-color-B3{background-color:#E3E9FD;} + .d2-2463336698 .background-color-B4{background-color:#E3E9FD;} + .d2-2463336698 .background-color-B5{background-color:#EDF0FD;} + .d2-2463336698 .background-color-B6{background-color:#F7F8FE;} + .d2-2463336698 .background-color-AA2{background-color:#4A6FF3;} + .d2-2463336698 .background-color-AA4{background-color:#EDF0FD;} + .d2-2463336698 .background-color-AA5{background-color:#F7F8FE;} + .d2-2463336698 .background-color-AB4{background-color:#EDF0FD;} + .d2-2463336698 .background-color-AB5{background-color:#F7F8FE;} + .d2-2463336698 .color-N1{color:#0A0F25;} + .d2-2463336698 .color-N2{color:#676C7E;} + .d2-2463336698 .color-N3{color:#9499AB;} + .d2-2463336698 .color-N4{color:#CFD2DD;} + .d2-2463336698 .color-N5{color:#DEE1EB;} + .d2-2463336698 .color-N6{color:#EEF1F8;} + .d2-2463336698 .color-N7{color:#FFFFFF;} + .d2-2463336698 .color-B1{color:#0D32B2;} + .d2-2463336698 .color-B2{color:#0D32B2;} + .d2-2463336698 .color-B3{color:#E3E9FD;} + .d2-2463336698 .color-B4{color:#E3E9FD;} + .d2-2463336698 .color-B5{color:#EDF0FD;} + .d2-2463336698 .color-B6{color:#F7F8FE;} + .d2-2463336698 .color-AA2{color:#4A6FF3;} + .d2-2463336698 .color-AA4{color:#EDF0FD;} + .d2-2463336698 .color-AA5{color:#F7F8FE;} + .d2-2463336698 .color-AB4{color:#EDF0FD;} + .d2-2463336698 .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}]]>UseridintPKparent_idintFKspouse_idintFKPetidintPKowner_idintFKCardidintPKowner_idintFKPostidintPKtextstringauthor_idintFKMetadataidintPKageintInfoidintPKcontentjson.RawMessage spousespouse childrenparentyowhoaheypets/ownercard/ownerposts/authormetadata/userinfo/user diff --git a/e2etests/testdata/stable/ent2d2_right/elk/board.exp.json b/e2etests/testdata/stable/ent2d2_right/elk/board.exp.json index c3f32eced..aea57d64d 100644 --- a/e2etests/testdata/stable/ent2d2_right/elk/board.exp.json +++ b/e2etests/testdata/stable/ent2d2_right/elk/board.exp.json @@ -55,7 +55,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -83,7 +85,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" }, { @@ -111,7 +115,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" } ], @@ -183,7 +189,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -211,7 +219,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" } ], @@ -283,7 +293,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -311,7 +323,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" } ], @@ -383,7 +397,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -411,7 +427,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -439,7 +455,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" } ], @@ -511,7 +529,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -539,7 +559,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], @@ -611,7 +631,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -639,7 +661,7 @@ "labelWidth": 149, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], diff --git a/e2etests/testdata/stable/ent2d2_right/elk/sketch.exp.svg b/e2etests/testdata/stable/ent2d2_right/elk/sketch.exp.svg index 8a77d825b..c4891ae55 100644 --- a/e2etests/testdata/stable/ent2d2_right/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/ent2d2_right/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -UseridintPKparent_idintFKspouse_idintFKPetidintPKowner_idintFKCardidintPKowner_idintFKPostidintPKtextstringauthor_idintFKMetadataidintPKageintInfoidintPKcontentjson.RawMessage spousespouse childrenparentyowhoaheypets/ownercard/ownerposts/authormetadata/userinfo/user + .d2-3472882822 .fill-N1{fill:#0A0F25;} + .d2-3472882822 .fill-N2{fill:#676C7E;} + .d2-3472882822 .fill-N3{fill:#9499AB;} + .d2-3472882822 .fill-N4{fill:#CFD2DD;} + .d2-3472882822 .fill-N5{fill:#DEE1EB;} + .d2-3472882822 .fill-N6{fill:#EEF1F8;} + .d2-3472882822 .fill-N7{fill:#FFFFFF;} + .d2-3472882822 .fill-B1{fill:#0D32B2;} + .d2-3472882822 .fill-B2{fill:#0D32B2;} + .d2-3472882822 .fill-B3{fill:#E3E9FD;} + .d2-3472882822 .fill-B4{fill:#E3E9FD;} + .d2-3472882822 .fill-B5{fill:#EDF0FD;} + .d2-3472882822 .fill-B6{fill:#F7F8FE;} + .d2-3472882822 .fill-AA2{fill:#4A6FF3;} + .d2-3472882822 .fill-AA4{fill:#EDF0FD;} + .d2-3472882822 .fill-AA5{fill:#F7F8FE;} + .d2-3472882822 .fill-AB4{fill:#EDF0FD;} + .d2-3472882822 .fill-AB5{fill:#F7F8FE;} + .d2-3472882822 .stroke-N1{stroke:#0A0F25;} + .d2-3472882822 .stroke-N2{stroke:#676C7E;} + .d2-3472882822 .stroke-N3{stroke:#9499AB;} + .d2-3472882822 .stroke-N4{stroke:#CFD2DD;} + .d2-3472882822 .stroke-N5{stroke:#DEE1EB;} + .d2-3472882822 .stroke-N6{stroke:#EEF1F8;} + .d2-3472882822 .stroke-N7{stroke:#FFFFFF;} + .d2-3472882822 .stroke-B1{stroke:#0D32B2;} + .d2-3472882822 .stroke-B2{stroke:#0D32B2;} + .d2-3472882822 .stroke-B3{stroke:#E3E9FD;} + .d2-3472882822 .stroke-B4{stroke:#E3E9FD;} + .d2-3472882822 .stroke-B5{stroke:#EDF0FD;} + .d2-3472882822 .stroke-B6{stroke:#F7F8FE;} + .d2-3472882822 .stroke-AA2{stroke:#4A6FF3;} + .d2-3472882822 .stroke-AA4{stroke:#EDF0FD;} + .d2-3472882822 .stroke-AA5{stroke:#F7F8FE;} + .d2-3472882822 .stroke-AB4{stroke:#EDF0FD;} + .d2-3472882822 .stroke-AB5{stroke:#F7F8FE;} + .d2-3472882822 .background-color-N1{background-color:#0A0F25;} + .d2-3472882822 .background-color-N2{background-color:#676C7E;} + .d2-3472882822 .background-color-N3{background-color:#9499AB;} + .d2-3472882822 .background-color-N4{background-color:#CFD2DD;} + .d2-3472882822 .background-color-N5{background-color:#DEE1EB;} + .d2-3472882822 .background-color-N6{background-color:#EEF1F8;} + .d2-3472882822 .background-color-N7{background-color:#FFFFFF;} + .d2-3472882822 .background-color-B1{background-color:#0D32B2;} + .d2-3472882822 .background-color-B2{background-color:#0D32B2;} + .d2-3472882822 .background-color-B3{background-color:#E3E9FD;} + .d2-3472882822 .background-color-B4{background-color:#E3E9FD;} + .d2-3472882822 .background-color-B5{background-color:#EDF0FD;} + .d2-3472882822 .background-color-B6{background-color:#F7F8FE;} + .d2-3472882822 .background-color-AA2{background-color:#4A6FF3;} + .d2-3472882822 .background-color-AA4{background-color:#EDF0FD;} + .d2-3472882822 .background-color-AA5{background-color:#F7F8FE;} + .d2-3472882822 .background-color-AB4{background-color:#EDF0FD;} + .d2-3472882822 .background-color-AB5{background-color:#F7F8FE;} + .d2-3472882822 .color-N1{color:#0A0F25;} + .d2-3472882822 .color-N2{color:#676C7E;} + .d2-3472882822 .color-N3{color:#9499AB;} + .d2-3472882822 .color-N4{color:#CFD2DD;} + .d2-3472882822 .color-N5{color:#DEE1EB;} + .d2-3472882822 .color-N6{color:#EEF1F8;} + .d2-3472882822 .color-N7{color:#FFFFFF;} + .d2-3472882822 .color-B1{color:#0D32B2;} + .d2-3472882822 .color-B2{color:#0D32B2;} + .d2-3472882822 .color-B3{color:#E3E9FD;} + .d2-3472882822 .color-B4{color:#E3E9FD;} + .d2-3472882822 .color-B5{color:#EDF0FD;} + .d2-3472882822 .color-B6{color:#F7F8FE;} + .d2-3472882822 .color-AA2{color:#4A6FF3;} + .d2-3472882822 .color-AA4{color:#EDF0FD;} + .d2-3472882822 .color-AA5{color:#F7F8FE;} + .d2-3472882822 .color-AB4{color:#EDF0FD;} + .d2-3472882822 .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}]]>UseridintPKparent_idintFKspouse_idintFKPetidintPKowner_idintFKCardidintPKowner_idintFKPostidintPKtextstringauthor_idintFKMetadataidintPKageintInfoidintPKcontentjson.RawMessage spousespouse childrenparentyowhoaheypets/ownercard/ownerposts/authormetadata/userinfo/user diff --git a/e2etests/testdata/stable/grid_nested/dagre/board.exp.json b/e2etests/testdata/stable/grid_nested/dagre/board.exp.json index 539206801..fd1b4b77b 100644 --- a/e2etests/testdata/stable/grid_nested/dagre/board.exp.json +++ b/e2etests/testdata/stable/grid_nested/dagre/board.exp.json @@ -1125,6 +1125,10 @@ { "id": "grid w/ grid w/ grid", "type": "rectangle", + "classes": [ + "2x2", + "gap0" + ], "pos": { "x": 1736, "y": 54 @@ -1207,6 +1211,10 @@ { "id": "grid w/ grid w/ grid.b", "type": "rectangle", + "classes": [ + "2x2", + "gap0" + ], "pos": { "x": 1789, "y": 100 @@ -1330,6 +1338,10 @@ { "id": "grid w/ grid w/ grid.b.c", "type": "rectangle", + "classes": [ + "2x2", + "gap0" + ], "pos": { "x": 1789, "y": 207 @@ -1494,6 +1506,10 @@ { "id": "grid w/ grid w/ grid.b.c.d", "type": "rectangle", + "classes": [ + "2x2", + "gap0" + ], "pos": { "x": 1842, "y": 309 @@ -1535,6 +1551,10 @@ { "id": "grid w/ grid w/ grid.b.c.d.a", "type": "rectangle", + "classes": [ + "2x2", + "gap0" + ], "pos": { "x": 1842, "y": 340 diff --git a/e2etests/testdata/stable/grid_nested/dagre/sketch.exp.svg b/e2etests/testdata/stable/grid_nested/dagre/sketch.exp.svg index 86d91d2f7..9d6c62ad5 100644 --- a/e2etests/testdata/stable/grid_nested/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/grid_nested/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -grid w/ containergrid w/ nested containersgrid in gridgrid w/ grid w/ gridabcdabcdabcdabcdb childb 1abcdabcdb 2b 2aabcdb 3b 3aabcdb 4b 3aabcd + .d2-3711635443 .fill-N1{fill:#0A0F25;} + .d2-3711635443 .fill-N2{fill:#676C7E;} + .d2-3711635443 .fill-N3{fill:#9499AB;} + .d2-3711635443 .fill-N4{fill:#CFD2DD;} + .d2-3711635443 .fill-N5{fill:#DEE1EB;} + .d2-3711635443 .fill-N6{fill:#EEF1F8;} + .d2-3711635443 .fill-N7{fill:#FFFFFF;} + .d2-3711635443 .fill-B1{fill:#0D32B2;} + .d2-3711635443 .fill-B2{fill:#0D32B2;} + .d2-3711635443 .fill-B3{fill:#E3E9FD;} + .d2-3711635443 .fill-B4{fill:#E3E9FD;} + .d2-3711635443 .fill-B5{fill:#EDF0FD;} + .d2-3711635443 .fill-B6{fill:#F7F8FE;} + .d2-3711635443 .fill-AA2{fill:#4A6FF3;} + .d2-3711635443 .fill-AA4{fill:#EDF0FD;} + .d2-3711635443 .fill-AA5{fill:#F7F8FE;} + .d2-3711635443 .fill-AB4{fill:#EDF0FD;} + .d2-3711635443 .fill-AB5{fill:#F7F8FE;} + .d2-3711635443 .stroke-N1{stroke:#0A0F25;} + .d2-3711635443 .stroke-N2{stroke:#676C7E;} + .d2-3711635443 .stroke-N3{stroke:#9499AB;} + .d2-3711635443 .stroke-N4{stroke:#CFD2DD;} + .d2-3711635443 .stroke-N5{stroke:#DEE1EB;} + .d2-3711635443 .stroke-N6{stroke:#EEF1F8;} + .d2-3711635443 .stroke-N7{stroke:#FFFFFF;} + .d2-3711635443 .stroke-B1{stroke:#0D32B2;} + .d2-3711635443 .stroke-B2{stroke:#0D32B2;} + .d2-3711635443 .stroke-B3{stroke:#E3E9FD;} + .d2-3711635443 .stroke-B4{stroke:#E3E9FD;} + .d2-3711635443 .stroke-B5{stroke:#EDF0FD;} + .d2-3711635443 .stroke-B6{stroke:#F7F8FE;} + .d2-3711635443 .stroke-AA2{stroke:#4A6FF3;} + .d2-3711635443 .stroke-AA4{stroke:#EDF0FD;} + .d2-3711635443 .stroke-AA5{stroke:#F7F8FE;} + .d2-3711635443 .stroke-AB4{stroke:#EDF0FD;} + .d2-3711635443 .stroke-AB5{stroke:#F7F8FE;} + .d2-3711635443 .background-color-N1{background-color:#0A0F25;} + .d2-3711635443 .background-color-N2{background-color:#676C7E;} + .d2-3711635443 .background-color-N3{background-color:#9499AB;} + .d2-3711635443 .background-color-N4{background-color:#CFD2DD;} + .d2-3711635443 .background-color-N5{background-color:#DEE1EB;} + .d2-3711635443 .background-color-N6{background-color:#EEF1F8;} + .d2-3711635443 .background-color-N7{background-color:#FFFFFF;} + .d2-3711635443 .background-color-B1{background-color:#0D32B2;} + .d2-3711635443 .background-color-B2{background-color:#0D32B2;} + .d2-3711635443 .background-color-B3{background-color:#E3E9FD;} + .d2-3711635443 .background-color-B4{background-color:#E3E9FD;} + .d2-3711635443 .background-color-B5{background-color:#EDF0FD;} + .d2-3711635443 .background-color-B6{background-color:#F7F8FE;} + .d2-3711635443 .background-color-AA2{background-color:#4A6FF3;} + .d2-3711635443 .background-color-AA4{background-color:#EDF0FD;} + .d2-3711635443 .background-color-AA5{background-color:#F7F8FE;} + .d2-3711635443 .background-color-AB4{background-color:#EDF0FD;} + .d2-3711635443 .background-color-AB5{background-color:#F7F8FE;} + .d2-3711635443 .color-N1{color:#0A0F25;} + .d2-3711635443 .color-N2{color:#676C7E;} + .d2-3711635443 .color-N3{color:#9499AB;} + .d2-3711635443 .color-N4{color:#CFD2DD;} + .d2-3711635443 .color-N5{color:#DEE1EB;} + .d2-3711635443 .color-N6{color:#EEF1F8;} + .d2-3711635443 .color-N7{color:#FFFFFF;} + .d2-3711635443 .color-B1{color:#0D32B2;} + .d2-3711635443 .color-B2{color:#0D32B2;} + .d2-3711635443 .color-B3{color:#E3E9FD;} + .d2-3711635443 .color-B4{color:#E3E9FD;} + .d2-3711635443 .color-B5{color:#EDF0FD;} + .d2-3711635443 .color-B6{color:#F7F8FE;} + .d2-3711635443 .color-AA2{color:#4A6FF3;} + .d2-3711635443 .color-AA4{color:#EDF0FD;} + .d2-3711635443 .color-AA5{color:#F7F8FE;} + .d2-3711635443 .color-AB4{color:#EDF0FD;} + .d2-3711635443 .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}]]>grid w/ containergrid w/ nested containersgrid in gridgrid w/ grid w/ gridabcdabcdabcdabcdb childb 1abcdabcdb 2b 2aabcdb 3b 3aabcdb 4b 3aabcd \ No newline at end of file diff --git a/e2etests/testdata/stable/grid_nested/elk/board.exp.json b/e2etests/testdata/stable/grid_nested/elk/board.exp.json index 08a18ac92..d91b1c82a 100644 --- a/e2etests/testdata/stable/grid_nested/elk/board.exp.json +++ b/e2etests/testdata/stable/grid_nested/elk/board.exp.json @@ -1125,6 +1125,10 @@ { "id": "grid w/ grid w/ grid", "type": "rectangle", + "classes": [ + "2x2", + "gap0" + ], "pos": { "x": 1928, "y": 67 @@ -1207,6 +1211,10 @@ { "id": "grid w/ grid w/ grid.b", "type": "rectangle", + "classes": [ + "2x2", + "gap0" + ], "pos": { "x": 1981, "y": 113 @@ -1330,6 +1338,10 @@ { "id": "grid w/ grid w/ grid.b.c", "type": "rectangle", + "classes": [ + "2x2", + "gap0" + ], "pos": { "x": 1981, "y": 220 @@ -1494,6 +1506,10 @@ { "id": "grid w/ grid w/ grid.b.c.d", "type": "rectangle", + "classes": [ + "2x2", + "gap0" + ], "pos": { "x": 2034, "y": 322 @@ -1535,6 +1551,10 @@ { "id": "grid w/ grid w/ grid.b.c.d.a", "type": "rectangle", + "classes": [ + "2x2", + "gap0" + ], "pos": { "x": 2034, "y": 353 diff --git a/e2etests/testdata/stable/grid_nested/elk/sketch.exp.svg b/e2etests/testdata/stable/grid_nested/elk/sketch.exp.svg index 30711534e..4ba6609de 100644 --- a/e2etests/testdata/stable/grid_nested/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/grid_nested/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -grid w/ containergrid w/ nested containersgrid in gridgrid w/ grid w/ gridabcdabcdabcdabcdb childb 1abcdabcdb 2b 2aabcdb 3b 3aabcdb 4b 3aabcd + .d2-2531972057 .fill-N1{fill:#0A0F25;} + .d2-2531972057 .fill-N2{fill:#676C7E;} + .d2-2531972057 .fill-N3{fill:#9499AB;} + .d2-2531972057 .fill-N4{fill:#CFD2DD;} + .d2-2531972057 .fill-N5{fill:#DEE1EB;} + .d2-2531972057 .fill-N6{fill:#EEF1F8;} + .d2-2531972057 .fill-N7{fill:#FFFFFF;} + .d2-2531972057 .fill-B1{fill:#0D32B2;} + .d2-2531972057 .fill-B2{fill:#0D32B2;} + .d2-2531972057 .fill-B3{fill:#E3E9FD;} + .d2-2531972057 .fill-B4{fill:#E3E9FD;} + .d2-2531972057 .fill-B5{fill:#EDF0FD;} + .d2-2531972057 .fill-B6{fill:#F7F8FE;} + .d2-2531972057 .fill-AA2{fill:#4A6FF3;} + .d2-2531972057 .fill-AA4{fill:#EDF0FD;} + .d2-2531972057 .fill-AA5{fill:#F7F8FE;} + .d2-2531972057 .fill-AB4{fill:#EDF0FD;} + .d2-2531972057 .fill-AB5{fill:#F7F8FE;} + .d2-2531972057 .stroke-N1{stroke:#0A0F25;} + .d2-2531972057 .stroke-N2{stroke:#676C7E;} + .d2-2531972057 .stroke-N3{stroke:#9499AB;} + .d2-2531972057 .stroke-N4{stroke:#CFD2DD;} + .d2-2531972057 .stroke-N5{stroke:#DEE1EB;} + .d2-2531972057 .stroke-N6{stroke:#EEF1F8;} + .d2-2531972057 .stroke-N7{stroke:#FFFFFF;} + .d2-2531972057 .stroke-B1{stroke:#0D32B2;} + .d2-2531972057 .stroke-B2{stroke:#0D32B2;} + .d2-2531972057 .stroke-B3{stroke:#E3E9FD;} + .d2-2531972057 .stroke-B4{stroke:#E3E9FD;} + .d2-2531972057 .stroke-B5{stroke:#EDF0FD;} + .d2-2531972057 .stroke-B6{stroke:#F7F8FE;} + .d2-2531972057 .stroke-AA2{stroke:#4A6FF3;} + .d2-2531972057 .stroke-AA4{stroke:#EDF0FD;} + .d2-2531972057 .stroke-AA5{stroke:#F7F8FE;} + .d2-2531972057 .stroke-AB4{stroke:#EDF0FD;} + .d2-2531972057 .stroke-AB5{stroke:#F7F8FE;} + .d2-2531972057 .background-color-N1{background-color:#0A0F25;} + .d2-2531972057 .background-color-N2{background-color:#676C7E;} + .d2-2531972057 .background-color-N3{background-color:#9499AB;} + .d2-2531972057 .background-color-N4{background-color:#CFD2DD;} + .d2-2531972057 .background-color-N5{background-color:#DEE1EB;} + .d2-2531972057 .background-color-N6{background-color:#EEF1F8;} + .d2-2531972057 .background-color-N7{background-color:#FFFFFF;} + .d2-2531972057 .background-color-B1{background-color:#0D32B2;} + .d2-2531972057 .background-color-B2{background-color:#0D32B2;} + .d2-2531972057 .background-color-B3{background-color:#E3E9FD;} + .d2-2531972057 .background-color-B4{background-color:#E3E9FD;} + .d2-2531972057 .background-color-B5{background-color:#EDF0FD;} + .d2-2531972057 .background-color-B6{background-color:#F7F8FE;} + .d2-2531972057 .background-color-AA2{background-color:#4A6FF3;} + .d2-2531972057 .background-color-AA4{background-color:#EDF0FD;} + .d2-2531972057 .background-color-AA5{background-color:#F7F8FE;} + .d2-2531972057 .background-color-AB4{background-color:#EDF0FD;} + .d2-2531972057 .background-color-AB5{background-color:#F7F8FE;} + .d2-2531972057 .color-N1{color:#0A0F25;} + .d2-2531972057 .color-N2{color:#676C7E;} + .d2-2531972057 .color-N3{color:#9499AB;} + .d2-2531972057 .color-N4{color:#CFD2DD;} + .d2-2531972057 .color-N5{color:#DEE1EB;} + .d2-2531972057 .color-N6{color:#EEF1F8;} + .d2-2531972057 .color-N7{color:#FFFFFF;} + .d2-2531972057 .color-B1{color:#0D32B2;} + .d2-2531972057 .color-B2{color:#0D32B2;} + .d2-2531972057 .color-B3{color:#E3E9FD;} + .d2-2531972057 .color-B4{color:#E3E9FD;} + .d2-2531972057 .color-B5{color:#EDF0FD;} + .d2-2531972057 .color-B6{color:#F7F8FE;} + .d2-2531972057 .color-AA2{color:#4A6FF3;} + .d2-2531972057 .color-AA4{color:#EDF0FD;} + .d2-2531972057 .color-AA5{color:#F7F8FE;} + .d2-2531972057 .color-AB4{color:#EDF0FD;} + .d2-2531972057 .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}]]>grid w/ containergrid w/ nested containersgrid in gridgrid w/ grid w/ gridabcdabcdabcdabcdb childb 1abcdabcdb 2b 2aabcdb 3b 3aabcdb 4b 3aabcd \ No newline at end of file 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 7b5c31322..dd6b3f0d2 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 @@ -860,7 +860,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -888,7 +888,7 @@ "labelWidth": 64, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], 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 0e906b2a0..a3edaee99 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 @@ -1,30 +1,30 @@ -a labelblabelsa class+public() boolvoid-private() intvoidcloudyyyya := 5 + .d2-1927191183 .fill-N1{fill:#0A0F25;} + .d2-1927191183 .fill-N2{fill:#676C7E;} + .d2-1927191183 .fill-N3{fill:#9499AB;} + .d2-1927191183 .fill-N4{fill:#CFD2DD;} + .d2-1927191183 .fill-N5{fill:#DEE1EB;} + .d2-1927191183 .fill-N6{fill:#EEF1F8;} + .d2-1927191183 .fill-N7{fill:#FFFFFF;} + .d2-1927191183 .fill-B1{fill:#0D32B2;} + .d2-1927191183 .fill-B2{fill:#0D32B2;} + .d2-1927191183 .fill-B3{fill:#E3E9FD;} + .d2-1927191183 .fill-B4{fill:#E3E9FD;} + .d2-1927191183 .fill-B5{fill:#EDF0FD;} + .d2-1927191183 .fill-B6{fill:#F7F8FE;} + .d2-1927191183 .fill-AA2{fill:#4A6FF3;} + .d2-1927191183 .fill-AA4{fill:#EDF0FD;} + .d2-1927191183 .fill-AA5{fill:#F7F8FE;} + .d2-1927191183 .fill-AB4{fill:#EDF0FD;} + .d2-1927191183 .fill-AB5{fill:#F7F8FE;} + .d2-1927191183 .stroke-N1{stroke:#0A0F25;} + .d2-1927191183 .stroke-N2{stroke:#676C7E;} + .d2-1927191183 .stroke-N3{stroke:#9499AB;} + .d2-1927191183 .stroke-N4{stroke:#CFD2DD;} + .d2-1927191183 .stroke-N5{stroke:#DEE1EB;} + .d2-1927191183 .stroke-N6{stroke:#EEF1F8;} + .d2-1927191183 .stroke-N7{stroke:#FFFFFF;} + .d2-1927191183 .stroke-B1{stroke:#0D32B2;} + .d2-1927191183 .stroke-B2{stroke:#0D32B2;} + .d2-1927191183 .stroke-B3{stroke:#E3E9FD;} + .d2-1927191183 .stroke-B4{stroke:#E3E9FD;} + .d2-1927191183 .stroke-B5{stroke:#EDF0FD;} + .d2-1927191183 .stroke-B6{stroke:#F7F8FE;} + .d2-1927191183 .stroke-AA2{stroke:#4A6FF3;} + .d2-1927191183 .stroke-AA4{stroke:#EDF0FD;} + .d2-1927191183 .stroke-AA5{stroke:#F7F8FE;} + .d2-1927191183 .stroke-AB4{stroke:#EDF0FD;} + .d2-1927191183 .stroke-AB5{stroke:#F7F8FE;} + .d2-1927191183 .background-color-N1{background-color:#0A0F25;} + .d2-1927191183 .background-color-N2{background-color:#676C7E;} + .d2-1927191183 .background-color-N3{background-color:#9499AB;} + .d2-1927191183 .background-color-N4{background-color:#CFD2DD;} + .d2-1927191183 .background-color-N5{background-color:#DEE1EB;} + .d2-1927191183 .background-color-N6{background-color:#EEF1F8;} + .d2-1927191183 .background-color-N7{background-color:#FFFFFF;} + .d2-1927191183 .background-color-B1{background-color:#0D32B2;} + .d2-1927191183 .background-color-B2{background-color:#0D32B2;} + .d2-1927191183 .background-color-B3{background-color:#E3E9FD;} + .d2-1927191183 .background-color-B4{background-color:#E3E9FD;} + .d2-1927191183 .background-color-B5{background-color:#EDF0FD;} + .d2-1927191183 .background-color-B6{background-color:#F7F8FE;} + .d2-1927191183 .background-color-AA2{background-color:#4A6FF3;} + .d2-1927191183 .background-color-AA4{background-color:#EDF0FD;} + .d2-1927191183 .background-color-AA5{background-color:#F7F8FE;} + .d2-1927191183 .background-color-AB4{background-color:#EDF0FD;} + .d2-1927191183 .background-color-AB5{background-color:#F7F8FE;} + .d2-1927191183 .color-N1{color:#0A0F25;} + .d2-1927191183 .color-N2{color:#676C7E;} + .d2-1927191183 .color-N3{color:#9499AB;} + .d2-1927191183 .color-N4{color:#CFD2DD;} + .d2-1927191183 .color-N5{color:#DEE1EB;} + .d2-1927191183 .color-N6{color:#EEF1F8;} + .d2-1927191183 .color-N7{color:#FFFFFF;} + .d2-1927191183 .color-B1{color:#0D32B2;} + .d2-1927191183 .color-B2{color:#0D32B2;} + .d2-1927191183 .color-B3{color:#E3E9FD;} + .d2-1927191183 .color-B4{color:#E3E9FD;} + .d2-1927191183 .color-B5{color:#EDF0FD;} + .d2-1927191183 .color-B6{color:#F7F8FE;} + .d2-1927191183 .color-AA2{color:#4A6FF3;} + .d2-1927191183 .color-AA4{color:#EDF0FD;} + .d2-1927191183 .color-AA5{color:#F7F8FE;} + .d2-1927191183 .color-AB4{color:#EDF0FD;} + .d2-1927191183 .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}]]>a labelblabelsa class+public() boolvoid-private() intvoidcloudyyyya := 5 b := a + 7 fmt.Printf("%d", b)a := 5 b := a + 7 -fmt.Printf("%d", b)cyldiadocssix cornersa random iconoverpackdocs pagetoohard o saysinglepersona queuea squarea step at a timedatausersidintnamevarchar result := callThisFunction(obj, 5) midthis sideother side +fmt.Printf("%d", b)cyldiadocssix cornersa random iconoverpackdocs pagetoohard o saysinglepersona queuea squarea step at a timedatausersidintnamevarchar result := callThisFunction(obj, 5) midthis sideother side diff --git a/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/board.exp.json b/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/board.exp.json index 7b5c31322..dd6b3f0d2 100644 --- a/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/board.exp.json @@ -860,7 +860,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -888,7 +888,7 @@ "labelWidth": 64, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], diff --git a/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/sketch.exp.svg index 0e906b2a0..a3edaee99 100644 --- a/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/sketch.exp.svg @@ -1,30 +1,30 @@ -a labelblabelsa class+public() boolvoid-private() intvoidcloudyyyya := 5 + .d2-1927191183 .fill-N1{fill:#0A0F25;} + .d2-1927191183 .fill-N2{fill:#676C7E;} + .d2-1927191183 .fill-N3{fill:#9499AB;} + .d2-1927191183 .fill-N4{fill:#CFD2DD;} + .d2-1927191183 .fill-N5{fill:#DEE1EB;} + .d2-1927191183 .fill-N6{fill:#EEF1F8;} + .d2-1927191183 .fill-N7{fill:#FFFFFF;} + .d2-1927191183 .fill-B1{fill:#0D32B2;} + .d2-1927191183 .fill-B2{fill:#0D32B2;} + .d2-1927191183 .fill-B3{fill:#E3E9FD;} + .d2-1927191183 .fill-B4{fill:#E3E9FD;} + .d2-1927191183 .fill-B5{fill:#EDF0FD;} + .d2-1927191183 .fill-B6{fill:#F7F8FE;} + .d2-1927191183 .fill-AA2{fill:#4A6FF3;} + .d2-1927191183 .fill-AA4{fill:#EDF0FD;} + .d2-1927191183 .fill-AA5{fill:#F7F8FE;} + .d2-1927191183 .fill-AB4{fill:#EDF0FD;} + .d2-1927191183 .fill-AB5{fill:#F7F8FE;} + .d2-1927191183 .stroke-N1{stroke:#0A0F25;} + .d2-1927191183 .stroke-N2{stroke:#676C7E;} + .d2-1927191183 .stroke-N3{stroke:#9499AB;} + .d2-1927191183 .stroke-N4{stroke:#CFD2DD;} + .d2-1927191183 .stroke-N5{stroke:#DEE1EB;} + .d2-1927191183 .stroke-N6{stroke:#EEF1F8;} + .d2-1927191183 .stroke-N7{stroke:#FFFFFF;} + .d2-1927191183 .stroke-B1{stroke:#0D32B2;} + .d2-1927191183 .stroke-B2{stroke:#0D32B2;} + .d2-1927191183 .stroke-B3{stroke:#E3E9FD;} + .d2-1927191183 .stroke-B4{stroke:#E3E9FD;} + .d2-1927191183 .stroke-B5{stroke:#EDF0FD;} + .d2-1927191183 .stroke-B6{stroke:#F7F8FE;} + .d2-1927191183 .stroke-AA2{stroke:#4A6FF3;} + .d2-1927191183 .stroke-AA4{stroke:#EDF0FD;} + .d2-1927191183 .stroke-AA5{stroke:#F7F8FE;} + .d2-1927191183 .stroke-AB4{stroke:#EDF0FD;} + .d2-1927191183 .stroke-AB5{stroke:#F7F8FE;} + .d2-1927191183 .background-color-N1{background-color:#0A0F25;} + .d2-1927191183 .background-color-N2{background-color:#676C7E;} + .d2-1927191183 .background-color-N3{background-color:#9499AB;} + .d2-1927191183 .background-color-N4{background-color:#CFD2DD;} + .d2-1927191183 .background-color-N5{background-color:#DEE1EB;} + .d2-1927191183 .background-color-N6{background-color:#EEF1F8;} + .d2-1927191183 .background-color-N7{background-color:#FFFFFF;} + .d2-1927191183 .background-color-B1{background-color:#0D32B2;} + .d2-1927191183 .background-color-B2{background-color:#0D32B2;} + .d2-1927191183 .background-color-B3{background-color:#E3E9FD;} + .d2-1927191183 .background-color-B4{background-color:#E3E9FD;} + .d2-1927191183 .background-color-B5{background-color:#EDF0FD;} + .d2-1927191183 .background-color-B6{background-color:#F7F8FE;} + .d2-1927191183 .background-color-AA2{background-color:#4A6FF3;} + .d2-1927191183 .background-color-AA4{background-color:#EDF0FD;} + .d2-1927191183 .background-color-AA5{background-color:#F7F8FE;} + .d2-1927191183 .background-color-AB4{background-color:#EDF0FD;} + .d2-1927191183 .background-color-AB5{background-color:#F7F8FE;} + .d2-1927191183 .color-N1{color:#0A0F25;} + .d2-1927191183 .color-N2{color:#676C7E;} + .d2-1927191183 .color-N3{color:#9499AB;} + .d2-1927191183 .color-N4{color:#CFD2DD;} + .d2-1927191183 .color-N5{color:#DEE1EB;} + .d2-1927191183 .color-N6{color:#EEF1F8;} + .d2-1927191183 .color-N7{color:#FFFFFF;} + .d2-1927191183 .color-B1{color:#0D32B2;} + .d2-1927191183 .color-B2{color:#0D32B2;} + .d2-1927191183 .color-B3{color:#E3E9FD;} + .d2-1927191183 .color-B4{color:#E3E9FD;} + .d2-1927191183 .color-B5{color:#EDF0FD;} + .d2-1927191183 .color-B6{color:#F7F8FE;} + .d2-1927191183 .color-AA2{color:#4A6FF3;} + .d2-1927191183 .color-AA4{color:#EDF0FD;} + .d2-1927191183 .color-AA5{color:#F7F8FE;} + .d2-1927191183 .color-AB4{color:#EDF0FD;} + .d2-1927191183 .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}]]>a labelblabelsa class+public() boolvoid-private() intvoidcloudyyyya := 5 b := a + 7 fmt.Printf("%d", b)a := 5 b := a + 7 -fmt.Printf("%d", b)cyldiadocssix cornersa random iconoverpackdocs pagetoohard o saysinglepersona queuea squarea step at a timedatausersidintnamevarchar result := callThisFunction(obj, 5) midthis sideother side +fmt.Printf("%d", b)cyldiadocssix cornersa random iconoverpackdocs pagetoohard o saysinglepersona queuea squarea step at a timedatausersidintnamevarchar result := callThisFunction(obj, 5) midthis sideother side diff --git a/e2etests/testdata/stable/sql_table_column_styles/dagre/board.exp.json b/e2etests/testdata/stable/sql_table_column_styles/dagre/board.exp.json index 55c5ecf20..24dffe9d7 100644 --- a/e2etests/testdata/stable/sql_table_column_styles/dagre/board.exp.json +++ b/e2etests/testdata/stable/sql_table_column_styles/dagre/board.exp.json @@ -55,7 +55,7 @@ "labelWidth": 166, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -83,7 +83,7 @@ "labelWidth": 210, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], @@ -155,7 +155,7 @@ "labelWidth": 248, "labelHeight": 38 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -183,7 +183,7 @@ "labelWidth": 315, "labelHeight": 38 }, - "constraint": "", + "constraint": null, "reference": "" } ], diff --git a/e2etests/testdata/stable/sql_table_column_styles/dagre/sketch.exp.svg b/e2etests/testdata/stable/sql_table_column_styles/dagre/sketch.exp.svg index e14ea125f..99efadac6 100644 --- a/e2etests/testdata/stable/sql_table_column_styles/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sql_table_column_styles/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -Humor in the CourtCould you see him from where you were standing?I could see his head.And where was his head?Just above his shoulders.Humor in the Court2Could you see him from where you were standing?I could see his head.And where was his head?Just above his shoulders.BatchManager-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voidBatchManager-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)void + .d2-4052321575 .fill-N1{fill:#0A0F25;} + .d2-4052321575 .fill-N2{fill:#676C7E;} + .d2-4052321575 .fill-N3{fill:#9499AB;} + .d2-4052321575 .fill-N4{fill:#CFD2DD;} + .d2-4052321575 .fill-N5{fill:#DEE1EB;} + .d2-4052321575 .fill-N6{fill:#EEF1F8;} + .d2-4052321575 .fill-N7{fill:#FFFFFF;} + .d2-4052321575 .fill-B1{fill:#0D32B2;} + .d2-4052321575 .fill-B2{fill:#0D32B2;} + .d2-4052321575 .fill-B3{fill:#E3E9FD;} + .d2-4052321575 .fill-B4{fill:#E3E9FD;} + .d2-4052321575 .fill-B5{fill:#EDF0FD;} + .d2-4052321575 .fill-B6{fill:#F7F8FE;} + .d2-4052321575 .fill-AA2{fill:#4A6FF3;} + .d2-4052321575 .fill-AA4{fill:#EDF0FD;} + .d2-4052321575 .fill-AA5{fill:#F7F8FE;} + .d2-4052321575 .fill-AB4{fill:#EDF0FD;} + .d2-4052321575 .fill-AB5{fill:#F7F8FE;} + .d2-4052321575 .stroke-N1{stroke:#0A0F25;} + .d2-4052321575 .stroke-N2{stroke:#676C7E;} + .d2-4052321575 .stroke-N3{stroke:#9499AB;} + .d2-4052321575 .stroke-N4{stroke:#CFD2DD;} + .d2-4052321575 .stroke-N5{stroke:#DEE1EB;} + .d2-4052321575 .stroke-N6{stroke:#EEF1F8;} + .d2-4052321575 .stroke-N7{stroke:#FFFFFF;} + .d2-4052321575 .stroke-B1{stroke:#0D32B2;} + .d2-4052321575 .stroke-B2{stroke:#0D32B2;} + .d2-4052321575 .stroke-B3{stroke:#E3E9FD;} + .d2-4052321575 .stroke-B4{stroke:#E3E9FD;} + .d2-4052321575 .stroke-B5{stroke:#EDF0FD;} + .d2-4052321575 .stroke-B6{stroke:#F7F8FE;} + .d2-4052321575 .stroke-AA2{stroke:#4A6FF3;} + .d2-4052321575 .stroke-AA4{stroke:#EDF0FD;} + .d2-4052321575 .stroke-AA5{stroke:#F7F8FE;} + .d2-4052321575 .stroke-AB4{stroke:#EDF0FD;} + .d2-4052321575 .stroke-AB5{stroke:#F7F8FE;} + .d2-4052321575 .background-color-N1{background-color:#0A0F25;} + .d2-4052321575 .background-color-N2{background-color:#676C7E;} + .d2-4052321575 .background-color-N3{background-color:#9499AB;} + .d2-4052321575 .background-color-N4{background-color:#CFD2DD;} + .d2-4052321575 .background-color-N5{background-color:#DEE1EB;} + .d2-4052321575 .background-color-N6{background-color:#EEF1F8;} + .d2-4052321575 .background-color-N7{background-color:#FFFFFF;} + .d2-4052321575 .background-color-B1{background-color:#0D32B2;} + .d2-4052321575 .background-color-B2{background-color:#0D32B2;} + .d2-4052321575 .background-color-B3{background-color:#E3E9FD;} + .d2-4052321575 .background-color-B4{background-color:#E3E9FD;} + .d2-4052321575 .background-color-B5{background-color:#EDF0FD;} + .d2-4052321575 .background-color-B6{background-color:#F7F8FE;} + .d2-4052321575 .background-color-AA2{background-color:#4A6FF3;} + .d2-4052321575 .background-color-AA4{background-color:#EDF0FD;} + .d2-4052321575 .background-color-AA5{background-color:#F7F8FE;} + .d2-4052321575 .background-color-AB4{background-color:#EDF0FD;} + .d2-4052321575 .background-color-AB5{background-color:#F7F8FE;} + .d2-4052321575 .color-N1{color:#0A0F25;} + .d2-4052321575 .color-N2{color:#676C7E;} + .d2-4052321575 .color-N3{color:#9499AB;} + .d2-4052321575 .color-N4{color:#CFD2DD;} + .d2-4052321575 .color-N5{color:#DEE1EB;} + .d2-4052321575 .color-N6{color:#EEF1F8;} + .d2-4052321575 .color-N7{color:#FFFFFF;} + .d2-4052321575 .color-B1{color:#0D32B2;} + .d2-4052321575 .color-B2{color:#0D32B2;} + .d2-4052321575 .color-B3{color:#E3E9FD;} + .d2-4052321575 .color-B4{color:#E3E9FD;} + .d2-4052321575 .color-B5{color:#EDF0FD;} + .d2-4052321575 .color-B6{color:#F7F8FE;} + .d2-4052321575 .color-AA2{color:#4A6FF3;} + .d2-4052321575 .color-AA4{color:#EDF0FD;} + .d2-4052321575 .color-AA5{color:#F7F8FE;} + .d2-4052321575 .color-AB4{color:#EDF0FD;} + .d2-4052321575 .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}]]>Humor in the CourtCould you see him from where you were standing?I could see his head.And where was his head?Just above his shoulders.Humor in the Court2Could you see him from where you were standing?I could see his head.And where was his head?Just above his shoulders.BatchManager-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voidBatchManager-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)void \ No newline at end of file diff --git a/e2etests/testdata/stable/sql_table_column_styles/elk/board.exp.json b/e2etests/testdata/stable/sql_table_column_styles/elk/board.exp.json index 4819ec11c..220d7395f 100644 --- a/e2etests/testdata/stable/sql_table_column_styles/elk/board.exp.json +++ b/e2etests/testdata/stable/sql_table_column_styles/elk/board.exp.json @@ -55,7 +55,7 @@ "labelWidth": 166, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -83,7 +83,7 @@ "labelWidth": 210, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], @@ -155,7 +155,7 @@ "labelWidth": 248, "labelHeight": 38 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -183,7 +183,7 @@ "labelWidth": 315, "labelHeight": 38 }, - "constraint": "", + "constraint": null, "reference": "" } ], diff --git a/e2etests/testdata/stable/sql_table_column_styles/elk/sketch.exp.svg b/e2etests/testdata/stable/sql_table_column_styles/elk/sketch.exp.svg index e3d6072bd..bfc92d078 100644 --- a/e2etests/testdata/stable/sql_table_column_styles/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sql_table_column_styles/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -Humor in the CourtCould you see him from where you were standing?I could see his head.And where was his head?Just above his shoulders.Humor in the Court2Could you see him from where you were standing?I could see his head.And where was his head?Just above his shoulders.BatchManager-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voidBatchManager-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)void + .d2-2628520825 .fill-N1{fill:#0A0F25;} + .d2-2628520825 .fill-N2{fill:#676C7E;} + .d2-2628520825 .fill-N3{fill:#9499AB;} + .d2-2628520825 .fill-N4{fill:#CFD2DD;} + .d2-2628520825 .fill-N5{fill:#DEE1EB;} + .d2-2628520825 .fill-N6{fill:#EEF1F8;} + .d2-2628520825 .fill-N7{fill:#FFFFFF;} + .d2-2628520825 .fill-B1{fill:#0D32B2;} + .d2-2628520825 .fill-B2{fill:#0D32B2;} + .d2-2628520825 .fill-B3{fill:#E3E9FD;} + .d2-2628520825 .fill-B4{fill:#E3E9FD;} + .d2-2628520825 .fill-B5{fill:#EDF0FD;} + .d2-2628520825 .fill-B6{fill:#F7F8FE;} + .d2-2628520825 .fill-AA2{fill:#4A6FF3;} + .d2-2628520825 .fill-AA4{fill:#EDF0FD;} + .d2-2628520825 .fill-AA5{fill:#F7F8FE;} + .d2-2628520825 .fill-AB4{fill:#EDF0FD;} + .d2-2628520825 .fill-AB5{fill:#F7F8FE;} + .d2-2628520825 .stroke-N1{stroke:#0A0F25;} + .d2-2628520825 .stroke-N2{stroke:#676C7E;} + .d2-2628520825 .stroke-N3{stroke:#9499AB;} + .d2-2628520825 .stroke-N4{stroke:#CFD2DD;} + .d2-2628520825 .stroke-N5{stroke:#DEE1EB;} + .d2-2628520825 .stroke-N6{stroke:#EEF1F8;} + .d2-2628520825 .stroke-N7{stroke:#FFFFFF;} + .d2-2628520825 .stroke-B1{stroke:#0D32B2;} + .d2-2628520825 .stroke-B2{stroke:#0D32B2;} + .d2-2628520825 .stroke-B3{stroke:#E3E9FD;} + .d2-2628520825 .stroke-B4{stroke:#E3E9FD;} + .d2-2628520825 .stroke-B5{stroke:#EDF0FD;} + .d2-2628520825 .stroke-B6{stroke:#F7F8FE;} + .d2-2628520825 .stroke-AA2{stroke:#4A6FF3;} + .d2-2628520825 .stroke-AA4{stroke:#EDF0FD;} + .d2-2628520825 .stroke-AA5{stroke:#F7F8FE;} + .d2-2628520825 .stroke-AB4{stroke:#EDF0FD;} + .d2-2628520825 .stroke-AB5{stroke:#F7F8FE;} + .d2-2628520825 .background-color-N1{background-color:#0A0F25;} + .d2-2628520825 .background-color-N2{background-color:#676C7E;} + .d2-2628520825 .background-color-N3{background-color:#9499AB;} + .d2-2628520825 .background-color-N4{background-color:#CFD2DD;} + .d2-2628520825 .background-color-N5{background-color:#DEE1EB;} + .d2-2628520825 .background-color-N6{background-color:#EEF1F8;} + .d2-2628520825 .background-color-N7{background-color:#FFFFFF;} + .d2-2628520825 .background-color-B1{background-color:#0D32B2;} + .d2-2628520825 .background-color-B2{background-color:#0D32B2;} + .d2-2628520825 .background-color-B3{background-color:#E3E9FD;} + .d2-2628520825 .background-color-B4{background-color:#E3E9FD;} + .d2-2628520825 .background-color-B5{background-color:#EDF0FD;} + .d2-2628520825 .background-color-B6{background-color:#F7F8FE;} + .d2-2628520825 .background-color-AA2{background-color:#4A6FF3;} + .d2-2628520825 .background-color-AA4{background-color:#EDF0FD;} + .d2-2628520825 .background-color-AA5{background-color:#F7F8FE;} + .d2-2628520825 .background-color-AB4{background-color:#EDF0FD;} + .d2-2628520825 .background-color-AB5{background-color:#F7F8FE;} + .d2-2628520825 .color-N1{color:#0A0F25;} + .d2-2628520825 .color-N2{color:#676C7E;} + .d2-2628520825 .color-N3{color:#9499AB;} + .d2-2628520825 .color-N4{color:#CFD2DD;} + .d2-2628520825 .color-N5{color:#DEE1EB;} + .d2-2628520825 .color-N6{color:#EEF1F8;} + .d2-2628520825 .color-N7{color:#FFFFFF;} + .d2-2628520825 .color-B1{color:#0D32B2;} + .d2-2628520825 .color-B2{color:#0D32B2;} + .d2-2628520825 .color-B3{color:#E3E9FD;} + .d2-2628520825 .color-B4{color:#E3E9FD;} + .d2-2628520825 .color-B5{color:#EDF0FD;} + .d2-2628520825 .color-B6{color:#F7F8FE;} + .d2-2628520825 .color-AA2{color:#4A6FF3;} + .d2-2628520825 .color-AA4{color:#EDF0FD;} + .d2-2628520825 .color-AA5{color:#F7F8FE;} + .d2-2628520825 .color-AB4{color:#EDF0FD;} + .d2-2628520825 .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}]]>Humor in the CourtCould you see him from where you were standing?I could see his head.And where was his head?Just above his shoulders.Humor in the Court2Could you see him from where you were standing?I could see his head.And where was his head?Just above his shoulders.BatchManager-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voidBatchManager-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)void \ No newline at end of file diff --git a/e2etests/testdata/stable/sql_table_constraints_width/dagre/sketch.exp.svg b/e2etests/testdata/stable/sql_table_constraints_width/dagre/sketch.exp.svg index 296755423..8c24e4b53 100644 --- a/e2etests/testdata/stable/sql_table_constraints_width/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sql_table_constraints_width/dagre/sketch.exp.svg @@ -1,10 +1,10 @@ -xy + .d2-3227093269 .fill-N1{fill:#0A0F25;} + .d2-3227093269 .fill-N2{fill:#676C7E;} + .d2-3227093269 .fill-N3{fill:#9499AB;} + .d2-3227093269 .fill-N4{fill:#CFD2DD;} + .d2-3227093269 .fill-N5{fill:#DEE1EB;} + .d2-3227093269 .fill-N6{fill:#EEF1F8;} + .d2-3227093269 .fill-N7{fill:#FFFFFF;} + .d2-3227093269 .fill-B1{fill:#0D32B2;} + .d2-3227093269 .fill-B2{fill:#0D32B2;} + .d2-3227093269 .fill-B3{fill:#E3E9FD;} + .d2-3227093269 .fill-B4{fill:#E3E9FD;} + .d2-3227093269 .fill-B5{fill:#EDF0FD;} + .d2-3227093269 .fill-B6{fill:#F7F8FE;} + .d2-3227093269 .fill-AA2{fill:#4A6FF3;} + .d2-3227093269 .fill-AA4{fill:#EDF0FD;} + .d2-3227093269 .fill-AA5{fill:#F7F8FE;} + .d2-3227093269 .fill-AB4{fill:#EDF0FD;} + .d2-3227093269 .fill-AB5{fill:#F7F8FE;} + .d2-3227093269 .stroke-N1{stroke:#0A0F25;} + .d2-3227093269 .stroke-N2{stroke:#676C7E;} + .d2-3227093269 .stroke-N3{stroke:#9499AB;} + .d2-3227093269 .stroke-N4{stroke:#CFD2DD;} + .d2-3227093269 .stroke-N5{stroke:#DEE1EB;} + .d2-3227093269 .stroke-N6{stroke:#EEF1F8;} + .d2-3227093269 .stroke-N7{stroke:#FFFFFF;} + .d2-3227093269 .stroke-B1{stroke:#0D32B2;} + .d2-3227093269 .stroke-B2{stroke:#0D32B2;} + .d2-3227093269 .stroke-B3{stroke:#E3E9FD;} + .d2-3227093269 .stroke-B4{stroke:#E3E9FD;} + .d2-3227093269 .stroke-B5{stroke:#EDF0FD;} + .d2-3227093269 .stroke-B6{stroke:#F7F8FE;} + .d2-3227093269 .stroke-AA2{stroke:#4A6FF3;} + .d2-3227093269 .stroke-AA4{stroke:#EDF0FD;} + .d2-3227093269 .stroke-AA5{stroke:#F7F8FE;} + .d2-3227093269 .stroke-AB4{stroke:#EDF0FD;} + .d2-3227093269 .stroke-AB5{stroke:#F7F8FE;} + .d2-3227093269 .background-color-N1{background-color:#0A0F25;} + .d2-3227093269 .background-color-N2{background-color:#676C7E;} + .d2-3227093269 .background-color-N3{background-color:#9499AB;} + .d2-3227093269 .background-color-N4{background-color:#CFD2DD;} + .d2-3227093269 .background-color-N5{background-color:#DEE1EB;} + .d2-3227093269 .background-color-N6{background-color:#EEF1F8;} + .d2-3227093269 .background-color-N7{background-color:#FFFFFF;} + .d2-3227093269 .background-color-B1{background-color:#0D32B2;} + .d2-3227093269 .background-color-B2{background-color:#0D32B2;} + .d2-3227093269 .background-color-B3{background-color:#E3E9FD;} + .d2-3227093269 .background-color-B4{background-color:#E3E9FD;} + .d2-3227093269 .background-color-B5{background-color:#EDF0FD;} + .d2-3227093269 .background-color-B6{background-color:#F7F8FE;} + .d2-3227093269 .background-color-AA2{background-color:#4A6FF3;} + .d2-3227093269 .background-color-AA4{background-color:#EDF0FD;} + .d2-3227093269 .background-color-AA5{background-color:#F7F8FE;} + .d2-3227093269 .background-color-AB4{background-color:#EDF0FD;} + .d2-3227093269 .background-color-AB5{background-color:#F7F8FE;} + .d2-3227093269 .color-N1{color:#0A0F25;} + .d2-3227093269 .color-N2{color:#676C7E;} + .d2-3227093269 .color-N3{color:#9499AB;} + .d2-3227093269 .color-N4{color:#CFD2DD;} + .d2-3227093269 .color-N5{color:#DEE1EB;} + .d2-3227093269 .color-N6{color:#EEF1F8;} + .d2-3227093269 .color-N7{color:#FFFFFF;} + .d2-3227093269 .color-B1{color:#0D32B2;} + .d2-3227093269 .color-B2{color:#0D32B2;} + .d2-3227093269 .color-B3{color:#E3E9FD;} + .d2-3227093269 .color-B4{color:#E3E9FD;} + .d2-3227093269 .color-B5{color:#EDF0FD;} + .d2-3227093269 .color-B6{color:#F7F8FE;} + .d2-3227093269 .color-AA2{color:#4A6FF3;} + .d2-3227093269 .color-AA4{color:#EDF0FD;} + .d2-3227093269 .color-AA5{color:#F7F8FE;} + .d2-3227093269 .color-AB4{color:#EDF0FD;} + .d2-3227093269 .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}]]>xy @@ -111,7 +111,7 @@ -I like turtlesab +I like turtlesab \ No newline at end of file diff --git a/e2etests/testdata/stable/sql_table_tooltip_animated/elk/board.exp.json b/e2etests/testdata/stable/sql_table_tooltip_animated/elk/board.exp.json index 196665d6c..613062453 100644 --- a/e2etests/testdata/stable/sql_table_tooltip_animated/elk/board.exp.json +++ b/e2etests/testdata/stable/sql_table_tooltip_animated/elk/board.exp.json @@ -55,7 +55,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "", + "constraint": null, "reference": "" } ], @@ -127,7 +127,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "", + "constraint": null, "reference": "" } ], diff --git a/e2etests/testdata/stable/sql_table_tooltip_animated/elk/sketch.exp.svg b/e2etests/testdata/stable/sql_table_tooltip_animated/elk/sketch.exp.svg index b48aaa780..f4289ad69 100644 --- a/e2etests/testdata/stable/sql_table_tooltip_animated/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sql_table_tooltip_animated/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -xy + .d2-514706804 .fill-N1{fill:#0A0F25;} + .d2-514706804 .fill-N2{fill:#676C7E;} + .d2-514706804 .fill-N3{fill:#9499AB;} + .d2-514706804 .fill-N4{fill:#CFD2DD;} + .d2-514706804 .fill-N5{fill:#DEE1EB;} + .d2-514706804 .fill-N6{fill:#EEF1F8;} + .d2-514706804 .fill-N7{fill:#FFFFFF;} + .d2-514706804 .fill-B1{fill:#0D32B2;} + .d2-514706804 .fill-B2{fill:#0D32B2;} + .d2-514706804 .fill-B3{fill:#E3E9FD;} + .d2-514706804 .fill-B4{fill:#E3E9FD;} + .d2-514706804 .fill-B5{fill:#EDF0FD;} + .d2-514706804 .fill-B6{fill:#F7F8FE;} + .d2-514706804 .fill-AA2{fill:#4A6FF3;} + .d2-514706804 .fill-AA4{fill:#EDF0FD;} + .d2-514706804 .fill-AA5{fill:#F7F8FE;} + .d2-514706804 .fill-AB4{fill:#EDF0FD;} + .d2-514706804 .fill-AB5{fill:#F7F8FE;} + .d2-514706804 .stroke-N1{stroke:#0A0F25;} + .d2-514706804 .stroke-N2{stroke:#676C7E;} + .d2-514706804 .stroke-N3{stroke:#9499AB;} + .d2-514706804 .stroke-N4{stroke:#CFD2DD;} + .d2-514706804 .stroke-N5{stroke:#DEE1EB;} + .d2-514706804 .stroke-N6{stroke:#EEF1F8;} + .d2-514706804 .stroke-N7{stroke:#FFFFFF;} + .d2-514706804 .stroke-B1{stroke:#0D32B2;} + .d2-514706804 .stroke-B2{stroke:#0D32B2;} + .d2-514706804 .stroke-B3{stroke:#E3E9FD;} + .d2-514706804 .stroke-B4{stroke:#E3E9FD;} + .d2-514706804 .stroke-B5{stroke:#EDF0FD;} + .d2-514706804 .stroke-B6{stroke:#F7F8FE;} + .d2-514706804 .stroke-AA2{stroke:#4A6FF3;} + .d2-514706804 .stroke-AA4{stroke:#EDF0FD;} + .d2-514706804 .stroke-AA5{stroke:#F7F8FE;} + .d2-514706804 .stroke-AB4{stroke:#EDF0FD;} + .d2-514706804 .stroke-AB5{stroke:#F7F8FE;} + .d2-514706804 .background-color-N1{background-color:#0A0F25;} + .d2-514706804 .background-color-N2{background-color:#676C7E;} + .d2-514706804 .background-color-N3{background-color:#9499AB;} + .d2-514706804 .background-color-N4{background-color:#CFD2DD;} + .d2-514706804 .background-color-N5{background-color:#DEE1EB;} + .d2-514706804 .background-color-N6{background-color:#EEF1F8;} + .d2-514706804 .background-color-N7{background-color:#FFFFFF;} + .d2-514706804 .background-color-B1{background-color:#0D32B2;} + .d2-514706804 .background-color-B2{background-color:#0D32B2;} + .d2-514706804 .background-color-B3{background-color:#E3E9FD;} + .d2-514706804 .background-color-B4{background-color:#E3E9FD;} + .d2-514706804 .background-color-B5{background-color:#EDF0FD;} + .d2-514706804 .background-color-B6{background-color:#F7F8FE;} + .d2-514706804 .background-color-AA2{background-color:#4A6FF3;} + .d2-514706804 .background-color-AA4{background-color:#EDF0FD;} + .d2-514706804 .background-color-AA5{background-color:#F7F8FE;} + .d2-514706804 .background-color-AB4{background-color:#EDF0FD;} + .d2-514706804 .background-color-AB5{background-color:#F7F8FE;} + .d2-514706804 .color-N1{color:#0A0F25;} + .d2-514706804 .color-N2{color:#676C7E;} + .d2-514706804 .color-N3{color:#9499AB;} + .d2-514706804 .color-N4{color:#CFD2DD;} + .d2-514706804 .color-N5{color:#DEE1EB;} + .d2-514706804 .color-N6{color:#EEF1F8;} + .d2-514706804 .color-N7{color:#FFFFFF;} + .d2-514706804 .color-B1{color:#0D32B2;} + .d2-514706804 .color-B2{color:#0D32B2;} + .d2-514706804 .color-B3{color:#E3E9FD;} + .d2-514706804 .color-B4{color:#E3E9FD;} + .d2-514706804 .color-B5{color:#EDF0FD;} + .d2-514706804 .color-B6{color:#F7F8FE;} + .d2-514706804 .color-AA2{color:#4A6FF3;} + .d2-514706804 .color-AA4{color:#EDF0FD;} + .d2-514706804 .color-AA5{color:#F7F8FE;} + .d2-514706804 .color-AB4{color:#EDF0FD;} + .d2-514706804 .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}]]>xy @@ -111,7 +111,7 @@ -I like turtlesab +I like turtlesab \ No newline at end of file diff --git a/e2etests/testdata/stable/sql_tables/dagre/board.exp.json b/e2etests/testdata/stable/sql_tables/dagre/board.exp.json index 3eede9e4e..a108d914d 100644 --- a/e2etests/testdata/stable/sql_tables/dagre/board.exp.json +++ b/e2etests/testdata/stable/sql_tables/dagre/board.exp.json @@ -55,7 +55,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -83,7 +83,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -111,7 +111,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -139,7 +139,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -167,7 +167,9 @@ "labelWidth": 77, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" } ], @@ -239,7 +241,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -267,7 +269,7 @@ "labelWidth": 67, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -295,7 +297,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -323,7 +325,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], @@ -395,7 +397,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -423,7 +425,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -451,7 +453,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], @@ -523,7 +525,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -551,7 +553,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -579,7 +581,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -607,7 +609,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], diff --git a/e2etests/testdata/stable/sql_tables/dagre/sketch.exp.svg b/e2etests/testdata/stable/sql_tables/dagre/sketch.exp.svg index 49496713c..babe59c83 100644 --- a/e2etests/testdata/stable/sql_tables/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sql_tables/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -usersidintnamestringemailstringpasswordstringlast_logindatetimePKproductsidintpricedecimalskustringnamestringordersidintuser_idintproduct_idintshipmentsidintorder_idinttracking_numberstringstatusstring + .d2-3718986021 .fill-N1{fill:#0A0F25;} + .d2-3718986021 .fill-N2{fill:#676C7E;} + .d2-3718986021 .fill-N3{fill:#9499AB;} + .d2-3718986021 .fill-N4{fill:#CFD2DD;} + .d2-3718986021 .fill-N5{fill:#DEE1EB;} + .d2-3718986021 .fill-N6{fill:#EEF1F8;} + .d2-3718986021 .fill-N7{fill:#FFFFFF;} + .d2-3718986021 .fill-B1{fill:#0D32B2;} + .d2-3718986021 .fill-B2{fill:#0D32B2;} + .d2-3718986021 .fill-B3{fill:#E3E9FD;} + .d2-3718986021 .fill-B4{fill:#E3E9FD;} + .d2-3718986021 .fill-B5{fill:#EDF0FD;} + .d2-3718986021 .fill-B6{fill:#F7F8FE;} + .d2-3718986021 .fill-AA2{fill:#4A6FF3;} + .d2-3718986021 .fill-AA4{fill:#EDF0FD;} + .d2-3718986021 .fill-AA5{fill:#F7F8FE;} + .d2-3718986021 .fill-AB4{fill:#EDF0FD;} + .d2-3718986021 .fill-AB5{fill:#F7F8FE;} + .d2-3718986021 .stroke-N1{stroke:#0A0F25;} + .d2-3718986021 .stroke-N2{stroke:#676C7E;} + .d2-3718986021 .stroke-N3{stroke:#9499AB;} + .d2-3718986021 .stroke-N4{stroke:#CFD2DD;} + .d2-3718986021 .stroke-N5{stroke:#DEE1EB;} + .d2-3718986021 .stroke-N6{stroke:#EEF1F8;} + .d2-3718986021 .stroke-N7{stroke:#FFFFFF;} + .d2-3718986021 .stroke-B1{stroke:#0D32B2;} + .d2-3718986021 .stroke-B2{stroke:#0D32B2;} + .d2-3718986021 .stroke-B3{stroke:#E3E9FD;} + .d2-3718986021 .stroke-B4{stroke:#E3E9FD;} + .d2-3718986021 .stroke-B5{stroke:#EDF0FD;} + .d2-3718986021 .stroke-B6{stroke:#F7F8FE;} + .d2-3718986021 .stroke-AA2{stroke:#4A6FF3;} + .d2-3718986021 .stroke-AA4{stroke:#EDF0FD;} + .d2-3718986021 .stroke-AA5{stroke:#F7F8FE;} + .d2-3718986021 .stroke-AB4{stroke:#EDF0FD;} + .d2-3718986021 .stroke-AB5{stroke:#F7F8FE;} + .d2-3718986021 .background-color-N1{background-color:#0A0F25;} + .d2-3718986021 .background-color-N2{background-color:#676C7E;} + .d2-3718986021 .background-color-N3{background-color:#9499AB;} + .d2-3718986021 .background-color-N4{background-color:#CFD2DD;} + .d2-3718986021 .background-color-N5{background-color:#DEE1EB;} + .d2-3718986021 .background-color-N6{background-color:#EEF1F8;} + .d2-3718986021 .background-color-N7{background-color:#FFFFFF;} + .d2-3718986021 .background-color-B1{background-color:#0D32B2;} + .d2-3718986021 .background-color-B2{background-color:#0D32B2;} + .d2-3718986021 .background-color-B3{background-color:#E3E9FD;} + .d2-3718986021 .background-color-B4{background-color:#E3E9FD;} + .d2-3718986021 .background-color-B5{background-color:#EDF0FD;} + .d2-3718986021 .background-color-B6{background-color:#F7F8FE;} + .d2-3718986021 .background-color-AA2{background-color:#4A6FF3;} + .d2-3718986021 .background-color-AA4{background-color:#EDF0FD;} + .d2-3718986021 .background-color-AA5{background-color:#F7F8FE;} + .d2-3718986021 .background-color-AB4{background-color:#EDF0FD;} + .d2-3718986021 .background-color-AB5{background-color:#F7F8FE;} + .d2-3718986021 .color-N1{color:#0A0F25;} + .d2-3718986021 .color-N2{color:#676C7E;} + .d2-3718986021 .color-N3{color:#9499AB;} + .d2-3718986021 .color-N4{color:#CFD2DD;} + .d2-3718986021 .color-N5{color:#DEE1EB;} + .d2-3718986021 .color-N6{color:#EEF1F8;} + .d2-3718986021 .color-N7{color:#FFFFFF;} + .d2-3718986021 .color-B1{color:#0D32B2;} + .d2-3718986021 .color-B2{color:#0D32B2;} + .d2-3718986021 .color-B3{color:#E3E9FD;} + .d2-3718986021 .color-B4{color:#E3E9FD;} + .d2-3718986021 .color-B5{color:#EDF0FD;} + .d2-3718986021 .color-B6{color:#F7F8FE;} + .d2-3718986021 .color-AA2{color:#4A6FF3;} + .d2-3718986021 .color-AA4{color:#EDF0FD;} + .d2-3718986021 .color-AA5{color:#F7F8FE;} + .d2-3718986021 .color-AB4{color:#EDF0FD;} + .d2-3718986021 .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}]]>usersidintnamestringemailstringpasswordstringlast_logindatetimePKproductsidintpricedecimalskustringnamestringordersidintuser_idintproduct_idintshipmentsidintorder_idinttracking_numberstringstatusstring \ No newline at end of file diff --git a/e2etests/testdata/stable/sql_tables/elk/board.exp.json b/e2etests/testdata/stable/sql_tables/elk/board.exp.json index 286573e69..2915e1b47 100644 --- a/e2etests/testdata/stable/sql_tables/elk/board.exp.json +++ b/e2etests/testdata/stable/sql_tables/elk/board.exp.json @@ -55,7 +55,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -83,7 +83,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -111,7 +111,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -139,7 +139,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -167,7 +167,9 @@ "labelWidth": 77, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" } ], @@ -239,7 +241,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -267,7 +269,7 @@ "labelWidth": 67, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -295,7 +297,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -323,7 +325,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], @@ -395,7 +397,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -423,7 +425,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -451,7 +453,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], @@ -523,7 +525,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -551,7 +553,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -579,7 +581,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -607,7 +609,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], diff --git a/e2etests/testdata/stable/sql_tables/elk/sketch.exp.svg b/e2etests/testdata/stable/sql_tables/elk/sketch.exp.svg index 5a7475ea3..dd4fa46e0 100644 --- a/e2etests/testdata/stable/sql_tables/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sql_tables/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -usersidintnamestringemailstringpasswordstringlast_logindatetimePKproductsidintpricedecimalskustringnamestringordersidintuser_idintproduct_idintshipmentsidintorder_idinttracking_numberstringstatusstring + .d2-4282920767 .fill-N1{fill:#0A0F25;} + .d2-4282920767 .fill-N2{fill:#676C7E;} + .d2-4282920767 .fill-N3{fill:#9499AB;} + .d2-4282920767 .fill-N4{fill:#CFD2DD;} + .d2-4282920767 .fill-N5{fill:#DEE1EB;} + .d2-4282920767 .fill-N6{fill:#EEF1F8;} + .d2-4282920767 .fill-N7{fill:#FFFFFF;} + .d2-4282920767 .fill-B1{fill:#0D32B2;} + .d2-4282920767 .fill-B2{fill:#0D32B2;} + .d2-4282920767 .fill-B3{fill:#E3E9FD;} + .d2-4282920767 .fill-B4{fill:#E3E9FD;} + .d2-4282920767 .fill-B5{fill:#EDF0FD;} + .d2-4282920767 .fill-B6{fill:#F7F8FE;} + .d2-4282920767 .fill-AA2{fill:#4A6FF3;} + .d2-4282920767 .fill-AA4{fill:#EDF0FD;} + .d2-4282920767 .fill-AA5{fill:#F7F8FE;} + .d2-4282920767 .fill-AB4{fill:#EDF0FD;} + .d2-4282920767 .fill-AB5{fill:#F7F8FE;} + .d2-4282920767 .stroke-N1{stroke:#0A0F25;} + .d2-4282920767 .stroke-N2{stroke:#676C7E;} + .d2-4282920767 .stroke-N3{stroke:#9499AB;} + .d2-4282920767 .stroke-N4{stroke:#CFD2DD;} + .d2-4282920767 .stroke-N5{stroke:#DEE1EB;} + .d2-4282920767 .stroke-N6{stroke:#EEF1F8;} + .d2-4282920767 .stroke-N7{stroke:#FFFFFF;} + .d2-4282920767 .stroke-B1{stroke:#0D32B2;} + .d2-4282920767 .stroke-B2{stroke:#0D32B2;} + .d2-4282920767 .stroke-B3{stroke:#E3E9FD;} + .d2-4282920767 .stroke-B4{stroke:#E3E9FD;} + .d2-4282920767 .stroke-B5{stroke:#EDF0FD;} + .d2-4282920767 .stroke-B6{stroke:#F7F8FE;} + .d2-4282920767 .stroke-AA2{stroke:#4A6FF3;} + .d2-4282920767 .stroke-AA4{stroke:#EDF0FD;} + .d2-4282920767 .stroke-AA5{stroke:#F7F8FE;} + .d2-4282920767 .stroke-AB4{stroke:#EDF0FD;} + .d2-4282920767 .stroke-AB5{stroke:#F7F8FE;} + .d2-4282920767 .background-color-N1{background-color:#0A0F25;} + .d2-4282920767 .background-color-N2{background-color:#676C7E;} + .d2-4282920767 .background-color-N3{background-color:#9499AB;} + .d2-4282920767 .background-color-N4{background-color:#CFD2DD;} + .d2-4282920767 .background-color-N5{background-color:#DEE1EB;} + .d2-4282920767 .background-color-N6{background-color:#EEF1F8;} + .d2-4282920767 .background-color-N7{background-color:#FFFFFF;} + .d2-4282920767 .background-color-B1{background-color:#0D32B2;} + .d2-4282920767 .background-color-B2{background-color:#0D32B2;} + .d2-4282920767 .background-color-B3{background-color:#E3E9FD;} + .d2-4282920767 .background-color-B4{background-color:#E3E9FD;} + .d2-4282920767 .background-color-B5{background-color:#EDF0FD;} + .d2-4282920767 .background-color-B6{background-color:#F7F8FE;} + .d2-4282920767 .background-color-AA2{background-color:#4A6FF3;} + .d2-4282920767 .background-color-AA4{background-color:#EDF0FD;} + .d2-4282920767 .background-color-AA5{background-color:#F7F8FE;} + .d2-4282920767 .background-color-AB4{background-color:#EDF0FD;} + .d2-4282920767 .background-color-AB5{background-color:#F7F8FE;} + .d2-4282920767 .color-N1{color:#0A0F25;} + .d2-4282920767 .color-N2{color:#676C7E;} + .d2-4282920767 .color-N3{color:#9499AB;} + .d2-4282920767 .color-N4{color:#CFD2DD;} + .d2-4282920767 .color-N5{color:#DEE1EB;} + .d2-4282920767 .color-N6{color:#EEF1F8;} + .d2-4282920767 .color-N7{color:#FFFFFF;} + .d2-4282920767 .color-B1{color:#0D32B2;} + .d2-4282920767 .color-B2{color:#0D32B2;} + .d2-4282920767 .color-B3{color:#E3E9FD;} + .d2-4282920767 .color-B4{color:#E3E9FD;} + .d2-4282920767 .color-B5{color:#EDF0FD;} + .d2-4282920767 .color-B6{color:#F7F8FE;} + .d2-4282920767 .color-AA2{color:#4A6FF3;} + .d2-4282920767 .color-AA4{color:#EDF0FD;} + .d2-4282920767 .color-AA5{color:#F7F8FE;} + .d2-4282920767 .color-AB4{color:#EDF0FD;} + .d2-4282920767 .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}]]>usersidintnamestringemailstringpasswordstringlast_logindatetimePKproductsidintpricedecimalskustringnamestringordersidintuser_idintproduct_idintshipmentsidintorder_idinttracking_numberstringstatusstring \ No newline at end of file diff --git a/e2etests/testdata/stable/unnamed_only_height/dagre/board.exp.json b/e2etests/testdata/stable/unnamed_only_height/dagre/board.exp.json index 75d93d051..362c4f342 100644 --- a/e2etests/testdata/stable/unnamed_only_height/dagre/board.exp.json +++ b/e2etests/testdata/stable/unnamed_only_height/dagre/board.exp.json @@ -130,7 +130,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -158,7 +158,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -186,7 +186,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -214,7 +214,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -242,7 +242,7 @@ "labelWidth": 77, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], diff --git a/e2etests/testdata/stable/unnamed_only_height/dagre/sketch.exp.svg b/e2etests/testdata/stable/unnamed_only_height/dagre/sketch.exp.svg index e15935f8a..d52cc2e54 100644 --- a/e2etests/testdata/stable/unnamed_only_height/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/unnamed_only_height/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ --numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetimea := 5 + .d2-1407267750 .fill-N1{fill:#0A0F25;} + .d2-1407267750 .fill-N2{fill:#676C7E;} + .d2-1407267750 .fill-N3{fill:#9499AB;} + .d2-1407267750 .fill-N4{fill:#CFD2DD;} + .d2-1407267750 .fill-N5{fill:#DEE1EB;} + .d2-1407267750 .fill-N6{fill:#EEF1F8;} + .d2-1407267750 .fill-N7{fill:#FFFFFF;} + .d2-1407267750 .fill-B1{fill:#0D32B2;} + .d2-1407267750 .fill-B2{fill:#0D32B2;} + .d2-1407267750 .fill-B3{fill:#E3E9FD;} + .d2-1407267750 .fill-B4{fill:#E3E9FD;} + .d2-1407267750 .fill-B5{fill:#EDF0FD;} + .d2-1407267750 .fill-B6{fill:#F7F8FE;} + .d2-1407267750 .fill-AA2{fill:#4A6FF3;} + .d2-1407267750 .fill-AA4{fill:#EDF0FD;} + .d2-1407267750 .fill-AA5{fill:#F7F8FE;} + .d2-1407267750 .fill-AB4{fill:#EDF0FD;} + .d2-1407267750 .fill-AB5{fill:#F7F8FE;} + .d2-1407267750 .stroke-N1{stroke:#0A0F25;} + .d2-1407267750 .stroke-N2{stroke:#676C7E;} + .d2-1407267750 .stroke-N3{stroke:#9499AB;} + .d2-1407267750 .stroke-N4{stroke:#CFD2DD;} + .d2-1407267750 .stroke-N5{stroke:#DEE1EB;} + .d2-1407267750 .stroke-N6{stroke:#EEF1F8;} + .d2-1407267750 .stroke-N7{stroke:#FFFFFF;} + .d2-1407267750 .stroke-B1{stroke:#0D32B2;} + .d2-1407267750 .stroke-B2{stroke:#0D32B2;} + .d2-1407267750 .stroke-B3{stroke:#E3E9FD;} + .d2-1407267750 .stroke-B4{stroke:#E3E9FD;} + .d2-1407267750 .stroke-B5{stroke:#EDF0FD;} + .d2-1407267750 .stroke-B6{stroke:#F7F8FE;} + .d2-1407267750 .stroke-AA2{stroke:#4A6FF3;} + .d2-1407267750 .stroke-AA4{stroke:#EDF0FD;} + .d2-1407267750 .stroke-AA5{stroke:#F7F8FE;} + .d2-1407267750 .stroke-AB4{stroke:#EDF0FD;} + .d2-1407267750 .stroke-AB5{stroke:#F7F8FE;} + .d2-1407267750 .background-color-N1{background-color:#0A0F25;} + .d2-1407267750 .background-color-N2{background-color:#676C7E;} + .d2-1407267750 .background-color-N3{background-color:#9499AB;} + .d2-1407267750 .background-color-N4{background-color:#CFD2DD;} + .d2-1407267750 .background-color-N5{background-color:#DEE1EB;} + .d2-1407267750 .background-color-N6{background-color:#EEF1F8;} + .d2-1407267750 .background-color-N7{background-color:#FFFFFF;} + .d2-1407267750 .background-color-B1{background-color:#0D32B2;} + .d2-1407267750 .background-color-B2{background-color:#0D32B2;} + .d2-1407267750 .background-color-B3{background-color:#E3E9FD;} + .d2-1407267750 .background-color-B4{background-color:#E3E9FD;} + .d2-1407267750 .background-color-B5{background-color:#EDF0FD;} + .d2-1407267750 .background-color-B6{background-color:#F7F8FE;} + .d2-1407267750 .background-color-AA2{background-color:#4A6FF3;} + .d2-1407267750 .background-color-AA4{background-color:#EDF0FD;} + .d2-1407267750 .background-color-AA5{background-color:#F7F8FE;} + .d2-1407267750 .background-color-AB4{background-color:#EDF0FD;} + .d2-1407267750 .background-color-AB5{background-color:#F7F8FE;} + .d2-1407267750 .color-N1{color:#0A0F25;} + .d2-1407267750 .color-N2{color:#676C7E;} + .d2-1407267750 .color-N3{color:#9499AB;} + .d2-1407267750 .color-N4{color:#CFD2DD;} + .d2-1407267750 .color-N5{color:#DEE1EB;} + .d2-1407267750 .color-N6{color:#EEF1F8;} + .d2-1407267750 .color-N7{color:#FFFFFF;} + .d2-1407267750 .color-B1{color:#0D32B2;} + .d2-1407267750 .color-B2{color:#0D32B2;} + .d2-1407267750 .color-B3{color:#E3E9FD;} + .d2-1407267750 .color-B4{color:#E3E9FD;} + .d2-1407267750 .color-B5{color:#EDF0FD;} + .d2-1407267750 .color-B6{color:#F7F8FE;} + .d2-1407267750 .color-AA2{color:#4A6FF3;} + .d2-1407267750 .color-AA4{color:#EDF0FD;} + .d2-1407267750 .color-AA5{color:#F7F8FE;} + .d2-1407267750 .color-AB4{color:#EDF0FD;} + .d2-1407267750 .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}]]>-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetimea := 5 b := a + 7 fmt.Printf("%d", b)a := 5 b := a + 7 -fmt.Printf("%d", b) +fmt.Printf("%d", b) \ No newline at end of file diff --git a/e2etests/testdata/stable/unnamed_only_height/elk/board.exp.json b/e2etests/testdata/stable/unnamed_only_height/elk/board.exp.json index 93804d206..b4c0804d3 100644 --- a/e2etests/testdata/stable/unnamed_only_height/elk/board.exp.json +++ b/e2etests/testdata/stable/unnamed_only_height/elk/board.exp.json @@ -130,7 +130,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -158,7 +158,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -186,7 +186,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -214,7 +214,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -242,7 +242,7 @@ "labelWidth": 77, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], diff --git a/e2etests/testdata/stable/unnamed_only_height/elk/sketch.exp.svg b/e2etests/testdata/stable/unnamed_only_height/elk/sketch.exp.svg index bd86209b4..61a62b814 100644 --- a/e2etests/testdata/stable/unnamed_only_height/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/unnamed_only_height/elk/sketch.exp.svg @@ -1,23 +1,23 @@ --numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetimea := 5 + .d2-161332075 .fill-N1{fill:#0A0F25;} + .d2-161332075 .fill-N2{fill:#676C7E;} + .d2-161332075 .fill-N3{fill:#9499AB;} + .d2-161332075 .fill-N4{fill:#CFD2DD;} + .d2-161332075 .fill-N5{fill:#DEE1EB;} + .d2-161332075 .fill-N6{fill:#EEF1F8;} + .d2-161332075 .fill-N7{fill:#FFFFFF;} + .d2-161332075 .fill-B1{fill:#0D32B2;} + .d2-161332075 .fill-B2{fill:#0D32B2;} + .d2-161332075 .fill-B3{fill:#E3E9FD;} + .d2-161332075 .fill-B4{fill:#E3E9FD;} + .d2-161332075 .fill-B5{fill:#EDF0FD;} + .d2-161332075 .fill-B6{fill:#F7F8FE;} + .d2-161332075 .fill-AA2{fill:#4A6FF3;} + .d2-161332075 .fill-AA4{fill:#EDF0FD;} + .d2-161332075 .fill-AA5{fill:#F7F8FE;} + .d2-161332075 .fill-AB4{fill:#EDF0FD;} + .d2-161332075 .fill-AB5{fill:#F7F8FE;} + .d2-161332075 .stroke-N1{stroke:#0A0F25;} + .d2-161332075 .stroke-N2{stroke:#676C7E;} + .d2-161332075 .stroke-N3{stroke:#9499AB;} + .d2-161332075 .stroke-N4{stroke:#CFD2DD;} + .d2-161332075 .stroke-N5{stroke:#DEE1EB;} + .d2-161332075 .stroke-N6{stroke:#EEF1F8;} + .d2-161332075 .stroke-N7{stroke:#FFFFFF;} + .d2-161332075 .stroke-B1{stroke:#0D32B2;} + .d2-161332075 .stroke-B2{stroke:#0D32B2;} + .d2-161332075 .stroke-B3{stroke:#E3E9FD;} + .d2-161332075 .stroke-B4{stroke:#E3E9FD;} + .d2-161332075 .stroke-B5{stroke:#EDF0FD;} + .d2-161332075 .stroke-B6{stroke:#F7F8FE;} + .d2-161332075 .stroke-AA2{stroke:#4A6FF3;} + .d2-161332075 .stroke-AA4{stroke:#EDF0FD;} + .d2-161332075 .stroke-AA5{stroke:#F7F8FE;} + .d2-161332075 .stroke-AB4{stroke:#EDF0FD;} + .d2-161332075 .stroke-AB5{stroke:#F7F8FE;} + .d2-161332075 .background-color-N1{background-color:#0A0F25;} + .d2-161332075 .background-color-N2{background-color:#676C7E;} + .d2-161332075 .background-color-N3{background-color:#9499AB;} + .d2-161332075 .background-color-N4{background-color:#CFD2DD;} + .d2-161332075 .background-color-N5{background-color:#DEE1EB;} + .d2-161332075 .background-color-N6{background-color:#EEF1F8;} + .d2-161332075 .background-color-N7{background-color:#FFFFFF;} + .d2-161332075 .background-color-B1{background-color:#0D32B2;} + .d2-161332075 .background-color-B2{background-color:#0D32B2;} + .d2-161332075 .background-color-B3{background-color:#E3E9FD;} + .d2-161332075 .background-color-B4{background-color:#E3E9FD;} + .d2-161332075 .background-color-B5{background-color:#EDF0FD;} + .d2-161332075 .background-color-B6{background-color:#F7F8FE;} + .d2-161332075 .background-color-AA2{background-color:#4A6FF3;} + .d2-161332075 .background-color-AA4{background-color:#EDF0FD;} + .d2-161332075 .background-color-AA5{background-color:#F7F8FE;} + .d2-161332075 .background-color-AB4{background-color:#EDF0FD;} + .d2-161332075 .background-color-AB5{background-color:#F7F8FE;} + .d2-161332075 .color-N1{color:#0A0F25;} + .d2-161332075 .color-N2{color:#676C7E;} + .d2-161332075 .color-N3{color:#9499AB;} + .d2-161332075 .color-N4{color:#CFD2DD;} + .d2-161332075 .color-N5{color:#DEE1EB;} + .d2-161332075 .color-N6{color:#EEF1F8;} + .d2-161332075 .color-N7{color:#FFFFFF;} + .d2-161332075 .color-B1{color:#0D32B2;} + .d2-161332075 .color-B2{color:#0D32B2;} + .d2-161332075 .color-B3{color:#E3E9FD;} + .d2-161332075 .color-B4{color:#E3E9FD;} + .d2-161332075 .color-B5{color:#EDF0FD;} + .d2-161332075 .color-B6{color:#F7F8FE;} + .d2-161332075 .color-AA2{color:#4A6FF3;} + .d2-161332075 .color-AA4{color:#EDF0FD;} + .d2-161332075 .color-AA5{color:#F7F8FE;} + .d2-161332075 .color-AB4{color:#EDF0FD;} + .d2-161332075 .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}]]>-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetimea := 5 b := a + 7 fmt.Printf("%d", b)a := 5 b := a + 7 -fmt.Printf("%d", b) +fmt.Printf("%d", b) \ No newline at end of file diff --git a/e2etests/testdata/stable/unnamed_only_width/dagre/board.exp.json b/e2etests/testdata/stable/unnamed_only_width/dagre/board.exp.json index bc19074e8..508c0dfda 100644 --- a/e2etests/testdata/stable/unnamed_only_width/dagre/board.exp.json +++ b/e2etests/testdata/stable/unnamed_only_width/dagre/board.exp.json @@ -130,7 +130,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -158,7 +158,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -186,7 +186,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -214,7 +214,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -242,7 +242,7 @@ "labelWidth": 77, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], diff --git a/e2etests/testdata/stable/unnamed_only_width/dagre/sketch.exp.svg b/e2etests/testdata/stable/unnamed_only_width/dagre/sketch.exp.svg index bd421bf1b..bb8598391 100644 --- a/e2etests/testdata/stable/unnamed_only_width/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/unnamed_only_width/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ --numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetimea := 5 + .d2-2995629861 .fill-N1{fill:#0A0F25;} + .d2-2995629861 .fill-N2{fill:#676C7E;} + .d2-2995629861 .fill-N3{fill:#9499AB;} + .d2-2995629861 .fill-N4{fill:#CFD2DD;} + .d2-2995629861 .fill-N5{fill:#DEE1EB;} + .d2-2995629861 .fill-N6{fill:#EEF1F8;} + .d2-2995629861 .fill-N7{fill:#FFFFFF;} + .d2-2995629861 .fill-B1{fill:#0D32B2;} + .d2-2995629861 .fill-B2{fill:#0D32B2;} + .d2-2995629861 .fill-B3{fill:#E3E9FD;} + .d2-2995629861 .fill-B4{fill:#E3E9FD;} + .d2-2995629861 .fill-B5{fill:#EDF0FD;} + .d2-2995629861 .fill-B6{fill:#F7F8FE;} + .d2-2995629861 .fill-AA2{fill:#4A6FF3;} + .d2-2995629861 .fill-AA4{fill:#EDF0FD;} + .d2-2995629861 .fill-AA5{fill:#F7F8FE;} + .d2-2995629861 .fill-AB4{fill:#EDF0FD;} + .d2-2995629861 .fill-AB5{fill:#F7F8FE;} + .d2-2995629861 .stroke-N1{stroke:#0A0F25;} + .d2-2995629861 .stroke-N2{stroke:#676C7E;} + .d2-2995629861 .stroke-N3{stroke:#9499AB;} + .d2-2995629861 .stroke-N4{stroke:#CFD2DD;} + .d2-2995629861 .stroke-N5{stroke:#DEE1EB;} + .d2-2995629861 .stroke-N6{stroke:#EEF1F8;} + .d2-2995629861 .stroke-N7{stroke:#FFFFFF;} + .d2-2995629861 .stroke-B1{stroke:#0D32B2;} + .d2-2995629861 .stroke-B2{stroke:#0D32B2;} + .d2-2995629861 .stroke-B3{stroke:#E3E9FD;} + .d2-2995629861 .stroke-B4{stroke:#E3E9FD;} + .d2-2995629861 .stroke-B5{stroke:#EDF0FD;} + .d2-2995629861 .stroke-B6{stroke:#F7F8FE;} + .d2-2995629861 .stroke-AA2{stroke:#4A6FF3;} + .d2-2995629861 .stroke-AA4{stroke:#EDF0FD;} + .d2-2995629861 .stroke-AA5{stroke:#F7F8FE;} + .d2-2995629861 .stroke-AB4{stroke:#EDF0FD;} + .d2-2995629861 .stroke-AB5{stroke:#F7F8FE;} + .d2-2995629861 .background-color-N1{background-color:#0A0F25;} + .d2-2995629861 .background-color-N2{background-color:#676C7E;} + .d2-2995629861 .background-color-N3{background-color:#9499AB;} + .d2-2995629861 .background-color-N4{background-color:#CFD2DD;} + .d2-2995629861 .background-color-N5{background-color:#DEE1EB;} + .d2-2995629861 .background-color-N6{background-color:#EEF1F8;} + .d2-2995629861 .background-color-N7{background-color:#FFFFFF;} + .d2-2995629861 .background-color-B1{background-color:#0D32B2;} + .d2-2995629861 .background-color-B2{background-color:#0D32B2;} + .d2-2995629861 .background-color-B3{background-color:#E3E9FD;} + .d2-2995629861 .background-color-B4{background-color:#E3E9FD;} + .d2-2995629861 .background-color-B5{background-color:#EDF0FD;} + .d2-2995629861 .background-color-B6{background-color:#F7F8FE;} + .d2-2995629861 .background-color-AA2{background-color:#4A6FF3;} + .d2-2995629861 .background-color-AA4{background-color:#EDF0FD;} + .d2-2995629861 .background-color-AA5{background-color:#F7F8FE;} + .d2-2995629861 .background-color-AB4{background-color:#EDF0FD;} + .d2-2995629861 .background-color-AB5{background-color:#F7F8FE;} + .d2-2995629861 .color-N1{color:#0A0F25;} + .d2-2995629861 .color-N2{color:#676C7E;} + .d2-2995629861 .color-N3{color:#9499AB;} + .d2-2995629861 .color-N4{color:#CFD2DD;} + .d2-2995629861 .color-N5{color:#DEE1EB;} + .d2-2995629861 .color-N6{color:#EEF1F8;} + .d2-2995629861 .color-N7{color:#FFFFFF;} + .d2-2995629861 .color-B1{color:#0D32B2;} + .d2-2995629861 .color-B2{color:#0D32B2;} + .d2-2995629861 .color-B3{color:#E3E9FD;} + .d2-2995629861 .color-B4{color:#E3E9FD;} + .d2-2995629861 .color-B5{color:#EDF0FD;} + .d2-2995629861 .color-B6{color:#F7F8FE;} + .d2-2995629861 .color-AA2{color:#4A6FF3;} + .d2-2995629861 .color-AA4{color:#EDF0FD;} + .d2-2995629861 .color-AA5{color:#F7F8FE;} + .d2-2995629861 .color-AB4{color:#EDF0FD;} + .d2-2995629861 .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}]]>-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetimea := 5 b := a + 7 fmt.Printf("%d", b)a := 5 b := a + 7 -fmt.Printf("%d", b) +fmt.Printf("%d", b) \ No newline at end of file diff --git a/e2etests/testdata/stable/unnamed_only_width/elk/board.exp.json b/e2etests/testdata/stable/unnamed_only_width/elk/board.exp.json index e3549a896..bbcdf884f 100644 --- a/e2etests/testdata/stable/unnamed_only_width/elk/board.exp.json +++ b/e2etests/testdata/stable/unnamed_only_width/elk/board.exp.json @@ -130,7 +130,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -158,7 +158,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -186,7 +186,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -214,7 +214,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -242,7 +242,7 @@ "labelWidth": 77, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], diff --git a/e2etests/testdata/stable/unnamed_only_width/elk/sketch.exp.svg b/e2etests/testdata/stable/unnamed_only_width/elk/sketch.exp.svg index 6cac9b478..38691fb59 100644 --- a/e2etests/testdata/stable/unnamed_only_width/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/unnamed_only_width/elk/sketch.exp.svg @@ -1,23 +1,23 @@ --numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetimea := 5 + .d2-2813224635 .fill-N1{fill:#0A0F25;} + .d2-2813224635 .fill-N2{fill:#676C7E;} + .d2-2813224635 .fill-N3{fill:#9499AB;} + .d2-2813224635 .fill-N4{fill:#CFD2DD;} + .d2-2813224635 .fill-N5{fill:#DEE1EB;} + .d2-2813224635 .fill-N6{fill:#EEF1F8;} + .d2-2813224635 .fill-N7{fill:#FFFFFF;} + .d2-2813224635 .fill-B1{fill:#0D32B2;} + .d2-2813224635 .fill-B2{fill:#0D32B2;} + .d2-2813224635 .fill-B3{fill:#E3E9FD;} + .d2-2813224635 .fill-B4{fill:#E3E9FD;} + .d2-2813224635 .fill-B5{fill:#EDF0FD;} + .d2-2813224635 .fill-B6{fill:#F7F8FE;} + .d2-2813224635 .fill-AA2{fill:#4A6FF3;} + .d2-2813224635 .fill-AA4{fill:#EDF0FD;} + .d2-2813224635 .fill-AA5{fill:#F7F8FE;} + .d2-2813224635 .fill-AB4{fill:#EDF0FD;} + .d2-2813224635 .fill-AB5{fill:#F7F8FE;} + .d2-2813224635 .stroke-N1{stroke:#0A0F25;} + .d2-2813224635 .stroke-N2{stroke:#676C7E;} + .d2-2813224635 .stroke-N3{stroke:#9499AB;} + .d2-2813224635 .stroke-N4{stroke:#CFD2DD;} + .d2-2813224635 .stroke-N5{stroke:#DEE1EB;} + .d2-2813224635 .stroke-N6{stroke:#EEF1F8;} + .d2-2813224635 .stroke-N7{stroke:#FFFFFF;} + .d2-2813224635 .stroke-B1{stroke:#0D32B2;} + .d2-2813224635 .stroke-B2{stroke:#0D32B2;} + .d2-2813224635 .stroke-B3{stroke:#E3E9FD;} + .d2-2813224635 .stroke-B4{stroke:#E3E9FD;} + .d2-2813224635 .stroke-B5{stroke:#EDF0FD;} + .d2-2813224635 .stroke-B6{stroke:#F7F8FE;} + .d2-2813224635 .stroke-AA2{stroke:#4A6FF3;} + .d2-2813224635 .stroke-AA4{stroke:#EDF0FD;} + .d2-2813224635 .stroke-AA5{stroke:#F7F8FE;} + .d2-2813224635 .stroke-AB4{stroke:#EDF0FD;} + .d2-2813224635 .stroke-AB5{stroke:#F7F8FE;} + .d2-2813224635 .background-color-N1{background-color:#0A0F25;} + .d2-2813224635 .background-color-N2{background-color:#676C7E;} + .d2-2813224635 .background-color-N3{background-color:#9499AB;} + .d2-2813224635 .background-color-N4{background-color:#CFD2DD;} + .d2-2813224635 .background-color-N5{background-color:#DEE1EB;} + .d2-2813224635 .background-color-N6{background-color:#EEF1F8;} + .d2-2813224635 .background-color-N7{background-color:#FFFFFF;} + .d2-2813224635 .background-color-B1{background-color:#0D32B2;} + .d2-2813224635 .background-color-B2{background-color:#0D32B2;} + .d2-2813224635 .background-color-B3{background-color:#E3E9FD;} + .d2-2813224635 .background-color-B4{background-color:#E3E9FD;} + .d2-2813224635 .background-color-B5{background-color:#EDF0FD;} + .d2-2813224635 .background-color-B6{background-color:#F7F8FE;} + .d2-2813224635 .background-color-AA2{background-color:#4A6FF3;} + .d2-2813224635 .background-color-AA4{background-color:#EDF0FD;} + .d2-2813224635 .background-color-AA5{background-color:#F7F8FE;} + .d2-2813224635 .background-color-AB4{background-color:#EDF0FD;} + .d2-2813224635 .background-color-AB5{background-color:#F7F8FE;} + .d2-2813224635 .color-N1{color:#0A0F25;} + .d2-2813224635 .color-N2{color:#676C7E;} + .d2-2813224635 .color-N3{color:#9499AB;} + .d2-2813224635 .color-N4{color:#CFD2DD;} + .d2-2813224635 .color-N5{color:#DEE1EB;} + .d2-2813224635 .color-N6{color:#EEF1F8;} + .d2-2813224635 .color-N7{color:#FFFFFF;} + .d2-2813224635 .color-B1{color:#0D32B2;} + .d2-2813224635 .color-B2{color:#0D32B2;} + .d2-2813224635 .color-B3{color:#E3E9FD;} + .d2-2813224635 .color-B4{color:#E3E9FD;} + .d2-2813224635 .color-B5{color:#EDF0FD;} + .d2-2813224635 .color-B6{color:#F7F8FE;} + .d2-2813224635 .color-AA2{color:#4A6FF3;} + .d2-2813224635 .color-AA4{color:#EDF0FD;} + .d2-2813224635 .color-AA5{color:#F7F8FE;} + .d2-2813224635 .color-AB4{color:#EDF0FD;} + .d2-2813224635 .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}]]>-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetimea := 5 b := a + 7 fmt.Printf("%d", b)a := 5 b := a + 7 -fmt.Printf("%d", b) +fmt.Printf("%d", b) \ No newline at end of file diff --git a/e2etests/testdata/themes/dark_terrastruct_flagship/dagre/board.exp.json b/e2etests/testdata/themes/dark_terrastruct_flagship/dagre/board.exp.json index d7c7fe141..8eb19cc74 100644 --- a/e2etests/testdata/themes/dark_terrastruct_flagship/dagre/board.exp.json +++ b/e2etests/testdata/themes/dark_terrastruct_flagship/dagre/board.exp.json @@ -506,7 +506,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -534,7 +534,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -562,7 +562,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -590,7 +590,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -618,7 +618,7 @@ "labelWidth": 77, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], diff --git a/e2etests/testdata/themes/dark_terrastruct_flagship/dagre/sketch.exp.svg b/e2etests/testdata/themes/dark_terrastruct_flagship/dagre/sketch.exp.svg index ee777f0f3..3abfc595a 100644 --- a/e2etests/testdata/themes/dark_terrastruct_flagship/dagre/sketch.exp.svg +++ b/e2etests/testdata/themes/dark_terrastruct_flagship/dagre/sketch.exp.svg @@ -1,41 +1,41 @@ -networkuserapi serverlogsusersidintnamestringemailstringpasswordstringlast_logindatetimeproducts+idint+pricedecimal+skustring+namestring

A tale

@@ -908,7 +908,7 @@     city2 := City{Name: "CityB", Population: 1200000}     tellTale(city1, city2) -}Cell Toweronline portaldata processorsatellitesTRANSMITTERuistorage sendsendsendphone logsmake call accessdisplaypersist +}Cell Toweronline portaldata processorsatellitesTRANSMITTERuistorage sendsendsendphone logsmake call accessdisplaypersist diff --git a/e2etests/testdata/themes/dark_terrastruct_flagship/elk/board.exp.json b/e2etests/testdata/themes/dark_terrastruct_flagship/elk/board.exp.json index c9ccab85e..446b8df1a 100644 --- a/e2etests/testdata/themes/dark_terrastruct_flagship/elk/board.exp.json +++ b/e2etests/testdata/themes/dark_terrastruct_flagship/elk/board.exp.json @@ -506,7 +506,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -534,7 +534,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -562,7 +562,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -590,7 +590,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -618,7 +618,7 @@ "labelWidth": 77, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], diff --git a/e2etests/testdata/themes/dark_terrastruct_flagship/elk/sketch.exp.svg b/e2etests/testdata/themes/dark_terrastruct_flagship/elk/sketch.exp.svg index b99756948..887020287 100644 --- a/e2etests/testdata/themes/dark_terrastruct_flagship/elk/sketch.exp.svg +++ b/e2etests/testdata/themes/dark_terrastruct_flagship/elk/sketch.exp.svg @@ -1,41 +1,41 @@ -networkuserapi serverlogsusersidintnamestringemailstringpasswordstringlast_logindatetimeproducts+idint+pricedecimal+skustring+namestring

A tale

@@ -908,7 +908,7 @@     city2 := City{Name: "CityB", Population: 1200000}     tellTale(city1, city2) -}Cell Toweronline portaldata processorsatellitesTRANSMITTERuistorage sendsendsendphone logsmake call accessdisplaypersist +}Cell Toweronline portaldata processorsatellitesTRANSMITTERuistorage sendsendsendphone logsmake call accessdisplaypersist diff --git a/e2etests/testdata/themes/terminal/dagre/board.exp.json b/e2etests/testdata/themes/terminal/dagre/board.exp.json index 2a82f1207..d43ae2585 100644 --- a/e2etests/testdata/themes/terminal/dagre/board.exp.json +++ b/e2etests/testdata/themes/terminal/dagre/board.exp.json @@ -510,7 +510,7 @@ "labelWidth": 34, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -538,7 +538,7 @@ "labelWidth": 71, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -566,7 +566,7 @@ "labelWidth": 71, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -594,7 +594,7 @@ "labelWidth": 71, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -622,7 +622,7 @@ "labelWidth": 94, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], diff --git a/e2etests/testdata/themes/terminal/dagre/sketch.exp.svg b/e2etests/testdata/themes/terminal/dagre/sketch.exp.svg index 7de10b4a5..1ac160d33 100644 --- a/e2etests/testdata/themes/terminal/dagre/sketch.exp.svg +++ b/e2etests/testdata/themes/terminal/dagre/sketch.exp.svg @@ -1,34 +1,34 @@ -containerscloudtall cylinderclass2-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voidusersidintnamestringemailstringpasswordstringlast_logindatetimecontainer

markdown text expanded to 800x400

@@ -859,7 +859,7 @@ b := a + 7 fmt.Printf("%d", b)a := 5 b := a + 7 -fmt.Printf("%d", b)circle containerdiamond containeroval containerhexagon containerdiamondcirclehexagonoval +fmt.Printf("%d", b)circle containerdiamond containeroval containerhexagon containerdiamondcirclehexagonoval \ No newline at end of file diff --git a/e2etests/testdata/todo/shape_set_width_height/elk/board.exp.json b/e2etests/testdata/todo/shape_set_width_height/elk/board.exp.json index a461cb6a0..f83df4dbe 100644 --- a/e2etests/testdata/todo/shape_set_width_height/elk/board.exp.json +++ b/e2etests/testdata/todo/shape_set_width_height/elk/board.exp.json @@ -581,7 +581,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -609,7 +609,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -637,7 +637,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -665,7 +665,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -693,7 +693,7 @@ "labelWidth": 77, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], diff --git a/e2etests/testdata/todo/shape_set_width_height/elk/sketch.exp.svg b/e2etests/testdata/todo/shape_set_width_height/elk/sketch.exp.svg index f67cb84d9..0fedb2be9 100644 --- a/e2etests/testdata/todo/shape_set_width_height/elk/sketch.exp.svg +++ b/e2etests/testdata/todo/shape_set_width_height/elk/sketch.exp.svg @@ -1,34 +1,34 @@ -containerscloudtall cylinderclass2-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voidusersidintnamestringemailstringpasswordstringlast_logindatetimecontainer

markdown text expanded to 800x400

@@ -859,7 +859,7 @@ b := a + 7 fmt.Printf("%d", b)a := 5 b := a + 7 -fmt.Printf("%d", b)circle containerdiamond containeroval containerhexagon containerdiamondcirclehexagonoval +fmt.Printf("%d", b)circle containerdiamond containeroval containerhexagon containerdiamondcirclehexagonoval \ No newline at end of file diff --git a/testdata/d2compiler/TestCompile/array-classes.exp.json b/testdata/d2compiler/TestCompile/array-classes.exp.json index 4dfed8f49..c19a3cf7a 100644 --- a/testdata/d2compiler/TestCompile/array-classes.exp.json +++ b/testdata/d2compiler/TestCompile/array-classes.exp.json @@ -623,9 +623,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -660,9 +658,11 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null, + "classes": [ + "path", + "path2" + ] }, "zIndex": 0 } @@ -736,9 +736,11 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null, + "classes": [ + "dragon_ball", + "path" + ] }, "zIndex": 0 }, @@ -810,9 +812,11 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null, + "classes": [ + "path", + "dragon_ball" + ] }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/basic_icon.exp.json b/testdata/d2compiler/TestCompile/basic_icon.exp.json index bc9297187..fec8c9f44 100644 --- a/testdata/d2compiler/TestCompile/basic_icon.exp.json +++ b/testdata/d2compiler/TestCompile/basic_icon.exp.json @@ -93,9 +93,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -155,9 +153,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/basic_sequence.exp.json b/testdata/d2compiler/TestCompile/basic_sequence.exp.json index 115675dbb..40ecd99ad 100644 --- a/testdata/d2compiler/TestCompile/basic_sequence.exp.json +++ b/testdata/d2compiler/TestCompile/basic_sequence.exp.json @@ -88,9 +88,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -137,9 +135,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/basic_shape.exp.json b/testdata/d2compiler/TestCompile/basic_shape.exp.json index d5d26fb77..74758c4b0 100644 --- a/testdata/d2compiler/TestCompile/basic_shape.exp.json +++ b/testdata/d2compiler/TestCompile/basic_shape.exp.json @@ -88,9 +88,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -137,9 +135,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/basic_style.exp.json b/testdata/d2compiler/TestCompile/basic_style.exp.json index cb68c4cc1..d69341d1c 100644 --- a/testdata/d2compiler/TestCompile/basic_style.exp.json +++ b/testdata/d2compiler/TestCompile/basic_style.exp.json @@ -95,9 +95,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -148,9 +146,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/class-shape-class.exp.json b/testdata/d2compiler/TestCompile/class-shape-class.exp.json index a787bab08..dd334affa 100644 --- a/testdata/d2compiler/TestCompile/class-shape-class.exp.json +++ b/testdata/d2compiler/TestCompile/class-shape-class.exp.json @@ -212,9 +212,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -271,9 +269,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - }, + "constraint": null, "classes": [ "classClass" ] diff --git a/testdata/d2compiler/TestCompile/class_paren.exp.json b/testdata/d2compiler/TestCompile/class_paren.exp.json index aeaf5b5d4..7d81a32af 100644 --- a/testdata/d2compiler/TestCompile/class_paren.exp.json +++ b/testdata/d2compiler/TestCompile/class_paren.exp.json @@ -187,9 +187,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -257,9 +255,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/class_style.exp.json b/testdata/d2compiler/TestCompile/class_style.exp.json index d9df3a793..32a6cc903 100644 --- a/testdata/d2compiler/TestCompile/class_style.exp.json +++ b/testdata/d2compiler/TestCompile/class_style.exp.json @@ -161,9 +161,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -224,9 +222,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/classes.exp.json b/testdata/d2compiler/TestCompile/classes.exp.json index a96e1034f..c0b35a802 100644 --- a/testdata/d2compiler/TestCompile/classes.exp.json +++ b/testdata/d2compiler/TestCompile/classes.exp.json @@ -649,9 +649,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -686,9 +684,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - }, + "constraint": null, "classes": [ "path" ] @@ -762,9 +758,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - }, + "constraint": null, "classes": [ "dragon_ball" ] @@ -836,9 +830,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - }, + "constraint": null, "classes": [ "dragon_ball" ] @@ -890,9 +882,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - }, + "constraint": null, "classes": [ "dragon_ball" ] diff --git a/testdata/d2compiler/TestCompile/constraint_label.exp.json b/testdata/d2compiler/TestCompile/constraint_label.exp.json index 9441a3351..ee1b0c201 100644 --- a/testdata/d2compiler/TestCompile/constraint_label.exp.json +++ b/testdata/d2compiler/TestCompile/constraint_label.exp.json @@ -121,9 +121,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -170,9 +168,9 @@ "direction": { "value": "" }, - "constraint": { - "value": "BIZ" - } + "constraint": [ + "BIZ" + ] }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/default_direction.exp.json b/testdata/d2compiler/TestCompile/default_direction.exp.json index 32057225f..b412ef6b2 100644 --- a/testdata/d2compiler/TestCompile/default_direction.exp.json +++ b/testdata/d2compiler/TestCompile/default_direction.exp.json @@ -49,9 +49,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -98,9 +96,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/dimension_with_style.exp.json b/testdata/d2compiler/TestCompile/dimension_with_style.exp.json index ef03ae945..8ed777881 100644 --- a/testdata/d2compiler/TestCompile/dimension_with_style.exp.json +++ b/testdata/d2compiler/TestCompile/dimension_with_style.exp.json @@ -123,9 +123,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -179,9 +177,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/dimensions_on_containers.exp.json b/testdata/d2compiler/TestCompile/dimensions_on_containers.exp.json index 9cfeaf3bb..1ce908eb3 100644 --- a/testdata/d2compiler/TestCompile/dimensions_on_containers.exp.json +++ b/testdata/d2compiler/TestCompile/dimensions_on_containers.exp.json @@ -957,9 +957,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1006,9 +1004,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1056,9 +1052,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1109,9 +1103,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1162,9 +1154,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1212,9 +1202,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1265,9 +1253,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1318,9 +1304,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1371,9 +1355,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1424,9 +1406,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/dimensions_on_nonimage.exp.json b/testdata/d2compiler/TestCompile/dimensions_on_nonimage.exp.json index 639d347d6..35a80069c 100644 --- a/testdata/d2compiler/TestCompile/dimensions_on_nonimage.exp.json +++ b/testdata/d2compiler/TestCompile/dimensions_on_nonimage.exp.json @@ -151,9 +151,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -206,9 +204,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge.exp.json b/testdata/d2compiler/TestCompile/edge.exp.json index dec4dc8ec..04daae90e 100644 --- a/testdata/d2compiler/TestCompile/edge.exp.json +++ b/testdata/d2compiler/TestCompile/edge.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -105,9 +103,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -154,9 +150,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -201,9 +195,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json b/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json index 4ad934650..8c8f45d32 100644 --- a/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json +++ b/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json @@ -251,9 +251,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -278,9 +276,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "dst_arrow": true, "dstArrowhead": { @@ -303,9 +299,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "references": [ { @@ -328,9 +322,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -377,9 +369,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -424,9 +414,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_arrowhead_primary.exp.json b/testdata/d2compiler/TestCompile/edge_arrowhead_primary.exp.json index 80b30f4a5..a3ccdacbc 100644 --- a/testdata/d2compiler/TestCompile/edge_arrowhead_primary.exp.json +++ b/testdata/d2compiler/TestCompile/edge_arrowhead_primary.exp.json @@ -111,9 +111,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -138,9 +136,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "dst_arrow": true, "references": [ @@ -164,9 +160,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -213,9 +207,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -260,9 +252,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_chain.exp.json b/testdata/d2compiler/TestCompile/edge_chain.exp.json index 529cfb405..fc3cb532e 100644 --- a/testdata/d2compiler/TestCompile/edge_chain.exp.json +++ b/testdata/d2compiler/TestCompile/edge_chain.exp.json @@ -119,9 +119,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -152,9 +150,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -184,9 +180,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -233,9 +227,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -300,9 +292,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -347,9 +337,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_chain_map.exp.json b/testdata/d2compiler/TestCompile/edge_chain_map.exp.json index d0140ae67..2a0553378 100644 --- a/testdata/d2compiler/TestCompile/edge_chain_map.exp.json +++ b/testdata/d2compiler/TestCompile/edge_chain_map.exp.json @@ -148,9 +148,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -181,9 +179,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -213,9 +209,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -262,9 +256,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -329,9 +321,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -376,9 +366,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_column_index.exp.json b/testdata/d2compiler/TestCompile/edge_column_index.exp.json index 4d9b52f8f..9f4c9e37c 100644 --- a/testdata/d2compiler/TestCompile/edge_column_index.exp.json +++ b/testdata/d2compiler/TestCompile/edge_column_index.exp.json @@ -350,9 +350,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -385,9 +383,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -476,7 +472,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -504,7 +500,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "", + "constraint": null, "reference": "" } ] @@ -525,9 +521,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -614,7 +608,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -642,7 +636,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "", + "constraint": null, "reference": "" } ] @@ -663,9 +657,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json b/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json index bd1d26af7..ffabeaa32 100644 --- a/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json +++ b/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json @@ -117,9 +117,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -154,9 +152,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -203,9 +199,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -250,9 +244,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json index a5a83a569..50be77f89 100644 --- a/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json @@ -160,9 +160,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -187,9 +185,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "dst_arrow": true, "references": [ @@ -216,9 +212,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -285,9 +279,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -352,9 +344,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json index 702e516fe..a65a5ac66 100644 --- a/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json @@ -128,9 +128,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -155,9 +153,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "dst_arrow": true, "references": [ @@ -181,9 +177,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -230,9 +224,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -277,9 +269,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_index.exp.json b/testdata/d2compiler/TestCompile/edge_index.exp.json index aeb34ecb9..dec38ad77 100644 --- a/testdata/d2compiler/TestCompile/edge_index.exp.json +++ b/testdata/d2compiler/TestCompile/edge_index.exp.json @@ -143,9 +143,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -179,9 +177,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -248,9 +244,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -315,9 +309,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_index_map.exp.json b/testdata/d2compiler/TestCompile/edge_index_map.exp.json index 9416b5b07..f782fe9d2 100644 --- a/testdata/d2compiler/TestCompile/edge_index_map.exp.json +++ b/testdata/d2compiler/TestCompile/edge_index_map.exp.json @@ -162,9 +162,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -198,9 +196,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -267,9 +263,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -334,9 +328,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_index_nested.exp.json b/testdata/d2compiler/TestCompile/edge_index_nested.exp.json index c279ce0a2..1163c970b 100644 --- a/testdata/d2compiler/TestCompile/edge_index_nested.exp.json +++ b/testdata/d2compiler/TestCompile/edge_index_nested.exp.json @@ -172,9 +172,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -208,9 +206,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -257,9 +253,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -324,9 +318,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -391,9 +383,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json b/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json index be517f33a..297694de2 100644 --- a/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json +++ b/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json @@ -188,9 +188,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -224,9 +222,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -293,9 +289,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -360,9 +354,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -427,9 +419,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.exp.json b/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.exp.json index 37936ebcd..18db2713e 100644 --- a/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.exp.json +++ b/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.exp.json @@ -201,9 +201,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -241,9 +239,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -310,9 +306,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -377,9 +371,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -444,9 +436,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.exp.json b/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.exp.json index ef5091d56..74d4645f9 100644 --- a/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.exp.json +++ b/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.exp.json @@ -207,9 +207,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -247,9 +245,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -296,9 +292,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -343,9 +337,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -390,9 +382,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.exp.json b/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.exp.json index a8a8a8b04..0e527bd33 100644 --- a/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.exp.json +++ b/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.exp.json @@ -220,9 +220,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -260,9 +258,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -309,9 +305,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -356,9 +350,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -403,9 +395,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.exp.json b/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.exp.json index 893b3ec82..359bf5caf 100644 --- a/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.exp.json +++ b/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.exp.json @@ -238,9 +238,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -278,9 +276,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -327,9 +323,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -374,9 +368,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -421,9 +413,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_label_map.exp.json b/testdata/d2compiler/TestCompile/edge_label_map.exp.json index 07d7b8c0c..c643f9c52 100644 --- a/testdata/d2compiler/TestCompile/edge_label_map.exp.json +++ b/testdata/d2compiler/TestCompile/edge_label_map.exp.json @@ -128,9 +128,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -165,9 +163,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -214,9 +210,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -261,9 +255,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_map.exp.json b/testdata/d2compiler/TestCompile/edge_map.exp.json index 89c09dbfb..e58694f19 100644 --- a/testdata/d2compiler/TestCompile/edge_map.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map.exp.json @@ -111,9 +111,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -144,9 +142,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -193,9 +189,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -240,9 +234,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json index 592d3f381..028d45ed5 100644 --- a/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json @@ -140,9 +140,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -167,9 +165,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "dst_arrow": true, "references": [ @@ -193,9 +189,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -242,9 +236,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -289,9 +281,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json b/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json index 1741fcde2..4821d0012 100644 --- a/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json @@ -156,9 +156,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -196,9 +194,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -265,9 +261,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -332,9 +326,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json b/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json index d33c5a281..7b286b266 100644 --- a/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json @@ -174,9 +174,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -214,9 +212,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -283,9 +279,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -350,9 +344,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_map_nested.exp.json b/testdata/d2compiler/TestCompile/edge_map_nested.exp.json index 861726cd5..9e892d0d1 100644 --- a/testdata/d2compiler/TestCompile/edge_map_nested.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_nested.exp.json @@ -136,9 +136,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -173,9 +171,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -222,9 +218,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -269,9 +263,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json b/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json index b59517440..77107e3ad 100644 --- a/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json @@ -118,9 +118,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -155,9 +153,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -204,9 +200,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -251,9 +245,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json index 8ae05a29c..a7cb23299 100644 --- a/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json @@ -228,9 +228,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -255,9 +253,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "dst_arrow": true, "dstArrowhead": { @@ -276,9 +272,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "references": [ { @@ -304,9 +298,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -373,9 +365,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -440,9 +430,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json index 762bf710a..6736c7dba 100644 --- a/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json @@ -122,9 +122,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -149,9 +147,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "dst_arrow": true, "references": [ @@ -175,9 +171,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -224,9 +218,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -271,9 +263,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json index cb3102c6c..78ce4ca82 100644 --- a/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json @@ -178,9 +178,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -205,9 +203,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "dst_arrow": true, "references": [ @@ -234,9 +230,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -303,9 +297,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -370,9 +362,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/escaped_id.exp.json b/testdata/d2compiler/TestCompile/escaped_id.exp.json index a5135358f..796618579 100644 --- a/testdata/d2compiler/TestCompile/escaped_id.exp.json +++ b/testdata/d2compiler/TestCompile/escaped_id.exp.json @@ -49,9 +49,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -98,9 +96,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/fill-pattern.exp.json b/testdata/d2compiler/TestCompile/fill-pattern.exp.json index 6b30f7fc0..63ae0bdc0 100644 --- a/testdata/d2compiler/TestCompile/fill-pattern.exp.json +++ b/testdata/d2compiler/TestCompile/fill-pattern.exp.json @@ -117,9 +117,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -170,9 +168,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/grid.exp.json b/testdata/d2compiler/TestCompile/grid.exp.json index 6c45373de..92d184f76 100644 --- a/testdata/d2compiler/TestCompile/grid.exp.json +++ b/testdata/d2compiler/TestCompile/grid.exp.json @@ -113,9 +113,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -162,9 +160,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - }, + "constraint": null, "gridRows": { "value": "200" }, diff --git a/testdata/d2compiler/TestCompile/grid_nested.exp.json b/testdata/d2compiler/TestCompile/grid_nested.exp.json index a6a72499e..049d2a65b 100644 --- a/testdata/d2compiler/TestCompile/grid_nested.exp.json +++ b/testdata/d2compiler/TestCompile/grid_nested.exp.json @@ -349,9 +349,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -398,9 +396,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - }, + "constraint": null, "gridRows": { "value": "200" }, @@ -451,9 +447,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -498,9 +492,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -545,9 +537,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -603,9 +593,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -661,9 +649,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -708,9 +694,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - }, + "constraint": null, "gridRows": { "value": "1" }, @@ -761,9 +745,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -808,9 +790,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/image_style.exp.json b/testdata/d2compiler/TestCompile/image_style.exp.json index deba163ae..37a47c513 100644 --- a/testdata/d2compiler/TestCompile/image_style.exp.json +++ b/testdata/d2compiler/TestCompile/image_style.exp.json @@ -170,9 +170,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -236,9 +234,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/link-board-key-nested.exp.json b/testdata/d2compiler/TestCompile/link-board-key-nested.exp.json index a06090d29..8158ac8ca 100644 --- a/testdata/d2compiler/TestCompile/link-board-key-nested.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-key-nested.exp.json @@ -179,9 +179,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -228,9 +226,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -289,9 +285,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -477,9 +471,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -526,9 +518,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/link-board-mixed.exp.json b/testdata/d2compiler/TestCompile/link-board-mixed.exp.json index 3130fecd5..346ec7dd4 100644 --- a/testdata/d2compiler/TestCompile/link-board-mixed.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-mixed.exp.json @@ -329,9 +329,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -412,9 +410,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -750,9 +746,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -783,9 +777,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -832,9 +824,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -879,9 +869,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -1219,9 +1207,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1348,9 +1334,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/link-board-nested.exp.json b/testdata/d2compiler/TestCompile/link-board-nested.exp.json index 79b61eb73..05aa0f0eb 100644 --- a/testdata/d2compiler/TestCompile/link-board-nested.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-nested.exp.json @@ -208,9 +208,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -271,9 +269,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -488,9 +484,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -706,9 +700,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -755,9 +747,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/link-board-ok.exp.json b/testdata/d2compiler/TestCompile/link-board-ok.exp.json index 77fab9ab6..5d6526c97 100644 --- a/testdata/d2compiler/TestCompile/link-board-ok.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-ok.exp.json @@ -150,9 +150,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -213,9 +211,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -372,9 +368,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -421,9 +415,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/link-board-underscore.exp.json b/testdata/d2compiler/TestCompile/link-board-underscore.exp.json index 2fba9e04d..4fd1a2f08 100644 --- a/testdata/d2compiler/TestCompile/link-board-underscore.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-underscore.exp.json @@ -274,9 +274,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -323,9 +321,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -606,9 +602,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -655,9 +649,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -938,9 +930,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1001,9 +991,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1062,9 +1050,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/missing-class.exp.json b/testdata/d2compiler/TestCompile/missing-class.exp.json index 9ba720cd7..1aa7a9673 100644 --- a/testdata/d2compiler/TestCompile/missing-class.exp.json +++ b/testdata/d2compiler/TestCompile/missing-class.exp.json @@ -70,9 +70,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -130,9 +128,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - }, + "constraint": null, "classes": [ "yo" ] diff --git a/testdata/d2compiler/TestCompile/near_constant.exp.json b/testdata/d2compiler/TestCompile/near_constant.exp.json index 9d3e863ea..6139e09c5 100644 --- a/testdata/d2compiler/TestCompile/near_constant.exp.json +++ b/testdata/d2compiler/TestCompile/near_constant.exp.json @@ -70,9 +70,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -145,9 +143,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/nested-array-classes.exp.json b/testdata/d2compiler/TestCompile/nested-array-classes.exp.json index 4a65875df..9639946a2 100644 --- a/testdata/d2compiler/TestCompile/nested-array-classes.exp.json +++ b/testdata/d2compiler/TestCompile/nested-array-classes.exp.json @@ -403,9 +403,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -431,9 +429,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "references": [ { @@ -456,9 +452,11 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null, + "classes": [ + "one target", + "association" + ] }, "zIndex": 0 }, @@ -483,9 +481,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "references": [ { @@ -508,9 +504,11 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null, + "classes": [ + "association", + "one target" + ] }, "zIndex": 0 } @@ -577,9 +575,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -644,9 +640,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/nested_sql.exp.json b/testdata/d2compiler/TestCompile/nested_sql.exp.json index 9c3d344c9..85cd7107e 100644 --- a/testdata/d2compiler/TestCompile/nested_sql.exp.json +++ b/testdata/d2compiler/TestCompile/nested_sql.exp.json @@ -183,9 +183,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -232,9 +230,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -290,7 +286,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -318,7 +314,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "", + "constraint": null, "reference": "" } ] @@ -339,9 +335,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/nil_scope_obj_regression.exp.json b/testdata/d2compiler/TestCompile/nil_scope_obj_regression.exp.json index 92b041542..e2ab08f59 100644 --- a/testdata/d2compiler/TestCompile/nil_scope_obj_regression.exp.json +++ b/testdata/d2compiler/TestCompile/nil_scope_obj_regression.exp.json @@ -112,9 +112,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -192,9 +190,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -239,9 +235,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/null.exp.json b/testdata/d2compiler/TestCompile/null.exp.json index 65705d6c7..9781daf23 100644 --- a/testdata/d2compiler/TestCompile/null.exp.json +++ b/testdata/d2compiler/TestCompile/null.exp.json @@ -49,9 +49,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -98,9 +96,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/path_link.exp.json b/testdata/d2compiler/TestCompile/path_link.exp.json index 8d2ad1a19..69a66c765 100644 --- a/testdata/d2compiler/TestCompile/path_link.exp.json +++ b/testdata/d2compiler/TestCompile/path_link.exp.json @@ -88,9 +88,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -140,9 +138,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/positions.exp.json b/testdata/d2compiler/TestCompile/positions.exp.json index f639d6d9f..877d874c3 100644 --- a/testdata/d2compiler/TestCompile/positions.exp.json +++ b/testdata/d2compiler/TestCompile/positions.exp.json @@ -113,9 +113,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -168,9 +166,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/reordered-classes.exp.json b/testdata/d2compiler/TestCompile/reordered-classes.exp.json index 556b25462..9264f93b5 100644 --- a/testdata/d2compiler/TestCompile/reordered-classes.exp.json +++ b/testdata/d2compiler/TestCompile/reordered-classes.exp.json @@ -216,9 +216,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -276,9 +274,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - }, + "constraint": null, "classes": [ "x" ] diff --git a/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json b/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json index 3a21e6622..b1b0e5261 100644 --- a/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json +++ b/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json @@ -283,9 +283,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -401,9 +399,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -448,9 +444,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/root_direction.exp.json b/testdata/d2compiler/TestCompile/root_direction.exp.json index 64fce1459..98ba30eda 100644 --- a/testdata/d2compiler/TestCompile/root_direction.exp.json +++ b/testdata/d2compiler/TestCompile/root_direction.exp.json @@ -59,9 +59,7 @@ "direction": { "value": "right" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, diff --git a/testdata/d2compiler/TestCompile/root_sequence.exp.json b/testdata/d2compiler/TestCompile/root_sequence.exp.json index 39d523dd3..353ce9a61 100644 --- a/testdata/d2compiler/TestCompile/root_sequence.exp.json +++ b/testdata/d2compiler/TestCompile/root_sequence.exp.json @@ -59,9 +59,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, diff --git a/testdata/d2compiler/TestCompile/self-referencing.exp.json b/testdata/d2compiler/TestCompile/self-referencing.exp.json index 88f3bf8f3..461633527 100644 --- a/testdata/d2compiler/TestCompile/self-referencing.exp.json +++ b/testdata/d2compiler/TestCompile/self-referencing.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -105,9 +103,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -174,9 +170,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/sequence-timestamp.exp.json b/testdata/d2compiler/TestCompile/sequence-timestamp.exp.json index ec9e1b268..c476fd55a 100644 --- a/testdata/d2compiler/TestCompile/sequence-timestamp.exp.json +++ b/testdata/d2compiler/TestCompile/sequence-timestamp.exp.json @@ -243,9 +243,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -276,9 +274,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -376,9 +372,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -443,9 +437,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -490,9 +482,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -537,9 +527,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -595,9 +583,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/sequence_container.exp.json b/testdata/d2compiler/TestCompile/sequence_container.exp.json index 7397f55e3..797208ff8 100644 --- a/testdata/d2compiler/TestCompile/sequence_container.exp.json +++ b/testdata/d2compiler/TestCompile/sequence_container.exp.json @@ -268,9 +268,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -301,9 +299,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -333,9 +329,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -446,9 +440,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -557,9 +549,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -668,9 +658,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -779,9 +767,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -890,9 +876,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1001,9 +985,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1048,9 +1030,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/sequence_container_2.exp.json b/testdata/d2compiler/TestCompile/sequence_container_2.exp.json index 5a23fa225..942bac612 100644 --- a/testdata/d2compiler/TestCompile/sequence_container_2.exp.json +++ b/testdata/d2compiler/TestCompile/sequence_container_2.exp.json @@ -246,9 +246,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -279,9 +277,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -392,9 +388,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -503,9 +497,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -614,9 +606,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -661,9 +651,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -730,9 +718,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -799,9 +785,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -868,9 +852,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -915,9 +897,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/sequence_grouped_note.exp.json b/testdata/d2compiler/TestCompile/sequence_grouped_note.exp.json index d9046aa5e..574aaf9dd 100644 --- a/testdata/d2compiler/TestCompile/sequence_grouped_note.exp.json +++ b/testdata/d2compiler/TestCompile/sequence_grouped_note.exp.json @@ -168,9 +168,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -217,9 +215,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -295,9 +291,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -342,9 +336,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -400,9 +392,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/sequence_scoping.exp.json b/testdata/d2compiler/TestCompile/sequence_scoping.exp.json index e539e5d0f..90110176f 100644 --- a/testdata/d2compiler/TestCompile/sequence_scoping.exp.json +++ b/testdata/d2compiler/TestCompile/sequence_scoping.exp.json @@ -356,9 +356,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -389,9 +387,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -421,9 +417,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -453,9 +447,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -502,9 +494,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -600,9 +590,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -771,9 +759,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -818,9 +804,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -876,9 +860,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1007,9 +989,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1076,9 +1056,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/set_direction.exp.json b/testdata/d2compiler/TestCompile/set_direction.exp.json index 655ebf0ae..dc8c57b5b 100644 --- a/testdata/d2compiler/TestCompile/set_direction.exp.json +++ b/testdata/d2compiler/TestCompile/set_direction.exp.json @@ -88,9 +88,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -137,9 +135,7 @@ "direction": { "value": "left" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/single_dimension_on_circle.exp.json b/testdata/d2compiler/TestCompile/single_dimension_on_circle.exp.json index 258a6a4a5..ebca6e33c 100644 --- a/testdata/d2compiler/TestCompile/single_dimension_on_circle.exp.json +++ b/testdata/d2compiler/TestCompile/single_dimension_on_circle.exp.json @@ -122,9 +122,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -174,9 +172,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/sql-constraints.exp.json b/testdata/d2compiler/TestCompile/sql-constraints.exp.json new file mode 100644 index 000000000..8a1742a81 --- /dev/null +++ b/testdata/d2compiler/TestCompile/sql-constraints.exp.json @@ -0,0 +1,372 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,0:0:0-4:1:110", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,0:0:0-4:1:110", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,0:3:3-4:0:109", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,1:2:7-1:18:23", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,1:2:7-1:7:12", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,1:2:7-1:7:12", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,1:9:14-1:18:23", + "value": [ + { + "string": "sql_table", + "raw_string": "sql_table" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,2:2:26-2:34:58", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,2:2:26-2:3:27", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,2:2:26-2:3:27", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "primary": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,2:5:29-2:8:32", + "value": [ + { + "string": "int", + "raw_string": "int" + } + ] + } + }, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,2:9:33-2:33:57", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,2:10:34-2:33:57", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,2:10:34-2:20:44", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,2:10:34-2:20:44", + "value": [ + { + "string": "constraint", + "raw_string": "constraint" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,2:22:46-2:33:57", + "value": [ + { + "string": "primary_key", + "raw_string": "primary_key" + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,3:2:61-3:49:108", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,3:2:61-3:3:62", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,3:2:61-3:3:62", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "primary": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,3:5:64-3:8:67", + "value": [ + { + "string": "int", + "raw_string": "int" + } + ] + } + }, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,3:9:68-3:48:107", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,3:10:69-3:48:107", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,3:10:69-3:20:79", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,3:10:69-3:20:79", + "value": [ + { + "string": "constraint", + "raw_string": "constraint" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "array": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,3:22:81-3:47:106", + "nodes": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,3:23:82-3:34:93", + "value": [ + { + "string": "primary_key", + "raw_string": "primary_key" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,3:36:95-3:47:106", + "value": [ + { + "string": "foreign_key", + "raw_string": "foreign_key" + } + ] + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "x", + "id_val": "x", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "sql_table": { + "columns": [ + { + "name": { + "label": "a", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0 + }, + "type": { + "label": "int", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0 + }, + "constraint": [ + "primary_key" + ], + "reference": "" + }, + { + "name": { + "label": "b", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0 + }, + "type": { + "label": "int", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0 + }, + "constraint": [ + "primary_key", + "foreign_key" + ], + "reference": "" + } + ] + }, + "attributes": { + "label": { + "value": "x" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "sql_table" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "err": null +} diff --git a/testdata/d2compiler/TestCompile/sql-regression.exp.json b/testdata/d2compiler/TestCompile/sql-regression.exp.json index 29516d953..539adf1c0 100644 --- a/testdata/d2compiler/TestCompile/sql-regression.exp.json +++ b/testdata/d2compiler/TestCompile/sql-regression.exp.json @@ -225,9 +225,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -278,9 +276,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -336,7 +332,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "", + "constraint": null, "reference": "" } ] @@ -357,9 +353,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -404,9 +398,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/sql_paren.exp.json b/testdata/d2compiler/TestCompile/sql_paren.exp.json index 4b2e0bb0a..eba972c81 100644 --- a/testdata/d2compiler/TestCompile/sql_paren.exp.json +++ b/testdata/d2compiler/TestCompile/sql_paren.exp.json @@ -164,9 +164,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -224,7 +222,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -252,7 +250,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "", + "constraint": null, "reference": "" } ] @@ -273,9 +271,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/stroke-width.exp.json b/testdata/d2compiler/TestCompile/stroke-width.exp.json index 4d6854ed7..2c3bfdb89 100644 --- a/testdata/d2compiler/TestCompile/stroke-width.exp.json +++ b/testdata/d2compiler/TestCompile/stroke-width.exp.json @@ -95,9 +95,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -148,9 +146,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/table_connection_attr.exp.json b/testdata/d2compiler/TestCompile/table_connection_attr.exp.json index ce190463d..ae35a6c53 100644 --- a/testdata/d2compiler/TestCompile/table_connection_attr.exp.json +++ b/testdata/d2compiler/TestCompile/table_connection_attr.exp.json @@ -309,9 +309,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -348,9 +346,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -439,7 +435,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "", + "constraint": null, "reference": "" } ] @@ -460,9 +456,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -549,7 +543,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "", + "constraint": null, "reference": "" } ] @@ -570,9 +564,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/table_style.exp.json b/testdata/d2compiler/TestCompile/table_style.exp.json index 56abfa352..57da002b7 100644 --- a/testdata/d2compiler/TestCompile/table_style.exp.json +++ b/testdata/d2compiler/TestCompile/table_style.exp.json @@ -161,9 +161,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -221,7 +219,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "", + "constraint": null, "reference": "" } ] @@ -246,9 +244,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/table_style_map.exp.json b/testdata/d2compiler/TestCompile/table_style_map.exp.json index 9c2291acb..ec723d05d 100644 --- a/testdata/d2compiler/TestCompile/table_style_map.exp.json +++ b/testdata/d2compiler/TestCompile/table_style_map.exp.json @@ -212,9 +212,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -272,7 +270,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "", + "constraint": null, "reference": "" } ] @@ -300,9 +298,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/text-transform.exp.json b/testdata/d2compiler/TestCompile/text-transform.exp.json index 19be4223d..1ebd73a2a 100644 --- a/testdata/d2compiler/TestCompile/text-transform.exp.json +++ b/testdata/d2compiler/TestCompile/text-transform.exp.json @@ -293,9 +293,7 @@ "direction": { "value": "right" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -330,9 +328,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -425,9 +421,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -518,9 +512,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/underscore_connection.exp.json b/testdata/d2compiler/TestCompile/underscore_connection.exp.json index 5aa625846..46e166725 100644 --- a/testdata/d2compiler/TestCompile/underscore_connection.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_connection.exp.json @@ -145,9 +145,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -178,9 +176,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -227,9 +223,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -338,9 +332,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -407,9 +399,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -476,9 +466,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/underscore_edge.exp.json b/testdata/d2compiler/TestCompile/underscore_edge.exp.json index 09d2123ac..0bdb94b00 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge.exp.json @@ -123,9 +123,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -156,9 +154,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -236,9 +232,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -294,9 +288,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json index 67ed11d4f..38d968276 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json @@ -182,9 +182,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -215,9 +213,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -247,9 +243,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -358,9 +352,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -416,9 +408,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -474,9 +464,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json index b74d8611b..e6ed4a467 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json @@ -189,9 +189,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -222,9 +220,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -254,9 +250,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -334,9 +328,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -412,9 +404,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -459,9 +449,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json index f164aee76..173285ea6 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json @@ -194,9 +194,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -230,9 +228,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -279,9 +275,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -326,9 +320,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -373,9 +365,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json index 7c462ae53..608d2922e 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json @@ -163,9 +163,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -196,9 +194,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -245,9 +241,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -323,9 +317,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -392,9 +384,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/underscore_parent_create.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_create.exp.json index 4db535bae..210d82d17 100644 --- a/testdata/d2compiler/TestCompile/underscore_parent_create.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_parent_create.exp.json @@ -89,9 +89,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -138,9 +136,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -196,9 +192,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/underscore_parent_not_root.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_not_root.exp.json index fc6b50a55..61dfa7869 100644 --- a/testdata/d2compiler/TestCompile/underscore_parent_not_root.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_parent_not_root.exp.json @@ -118,9 +118,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -167,9 +165,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -214,9 +210,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -272,9 +266,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/underscore_parent_preference_1.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_preference_1.exp.json index 52086b6ae..4db434860 100644 --- a/testdata/d2compiler/TestCompile/underscore_parent_preference_1.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_parent_preference_1.exp.json @@ -132,9 +132,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -181,9 +179,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -259,9 +255,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/underscore_parent_preference_2.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_preference_2.exp.json index f3243d490..5281966f7 100644 --- a/testdata/d2compiler/TestCompile/underscore_parent_preference_2.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_parent_preference_2.exp.json @@ -132,9 +132,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -212,9 +210,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -259,9 +255,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/underscore_parent_squared.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_squared.exp.json index c81350873..ea0c6e33c 100644 --- a/testdata/d2compiler/TestCompile/underscore_parent_squared.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_parent_squared.exp.json @@ -129,9 +129,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -178,9 +176,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -225,9 +221,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -294,9 +288,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/underscore_unresolved_obj.exp.json b/testdata/d2compiler/TestCompile/underscore_unresolved_obj.exp.json index d5c56bdee..d494bc12b 100644 --- a/testdata/d2compiler/TestCompile/underscore_unresolved_obj.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_unresolved_obj.exp.json @@ -89,9 +89,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -138,9 +136,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -196,9 +192,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/unescaped_id_cr.exp.json b/testdata/d2compiler/TestCompile/unescaped_id_cr.exp.json index 7a73c0b08..2b2f1b4f8 100644 --- a/testdata/d2compiler/TestCompile/unescaped_id_cr.exp.json +++ b/testdata/d2compiler/TestCompile/unescaped_id_cr.exp.json @@ -49,9 +49,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -98,9 +96,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/url_link.exp.json b/testdata/d2compiler/TestCompile/url_link.exp.json index 6bd4fe629..ac23a6997 100644 --- a/testdata/d2compiler/TestCompile/url_link.exp.json +++ b/testdata/d2compiler/TestCompile/url_link.exp.json @@ -88,9 +88,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -140,9 +138,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/url_link_and_not_url_tooltip_concurrently.exp.json b/testdata/d2compiler/TestCompile/url_link_and_not_url_tooltip_concurrently.exp.json index eef3087ba..414c8364a 100644 --- a/testdata/d2compiler/TestCompile/url_link_and_not_url_tooltip_concurrently.exp.json +++ b/testdata/d2compiler/TestCompile/url_link_and_not_url_tooltip_concurrently.exp.json @@ -121,9 +121,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -176,9 +174,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/url_tooltip.exp.json b/testdata/d2compiler/TestCompile/url_tooltip.exp.json index 8895108bd..d59351628 100644 --- a/testdata/d2compiler/TestCompile/url_tooltip.exp.json +++ b/testdata/d2compiler/TestCompile/url_tooltip.exp.json @@ -88,9 +88,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -140,9 +138,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/wrong_column_index.exp.json b/testdata/d2compiler/TestCompile/wrong_column_index.exp.json index af890238e..49dcdfe6b 100644 --- a/testdata/d2compiler/TestCompile/wrong_column_index.exp.json +++ b/testdata/d2compiler/TestCompile/wrong_column_index.exp.json @@ -710,9 +710,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -745,9 +743,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -836,7 +832,9 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -864,7 +862,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -892,7 +890,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -920,7 +918,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -948,7 +946,9 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" }, { @@ -976,7 +976,9 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" } ] @@ -997,9 +999,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1086,7 +1086,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -1114,7 +1114,9 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" }, { @@ -1142,7 +1144,9 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" } ] @@ -1163,9 +1167,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile2/boards/isFolderOnly.exp.json b/testdata/d2compiler/TestCompile2/boards/isFolderOnly.exp.json index 0a2c78652..4bcd01085 100644 --- a/testdata/d2compiler/TestCompile2/boards/isFolderOnly.exp.json +++ b/testdata/d2compiler/TestCompile2/boards/isFolderOnly.exp.json @@ -307,9 +307,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -624,9 +622,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -673,9 +669,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -989,9 +983,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1038,9 +1030,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -1354,9 +1344,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1403,9 +1391,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -1719,9 +1705,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1768,9 +1752,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile2/boards/recursive.exp.json b/testdata/d2compiler/TestCompile2/boards/recursive.exp.json index ffb88ac9e..5294489e9 100644 --- a/testdata/d2compiler/TestCompile2/boards/recursive.exp.json +++ b/testdata/d2compiler/TestCompile2/boards/recursive.exp.json @@ -315,9 +315,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -364,9 +362,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -688,9 +684,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -737,9 +731,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -1061,9 +1053,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1110,9 +1100,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -1434,9 +1422,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1483,9 +1469,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1530,9 +1514,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -1854,9 +1836,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1903,9 +1883,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1950,9 +1928,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1997,9 +1973,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile2/boards/root.exp.json b/testdata/d2compiler/TestCompile2/boards/root.exp.json index e53b1ebc1..782eb55ea 100644 --- a/testdata/d2compiler/TestCompile2/boards/root.exp.json +++ b/testdata/d2compiler/TestCompile2/boards/root.exp.json @@ -182,9 +182,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -231,9 +229,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -422,9 +418,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -471,9 +465,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -662,9 +654,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -711,9 +701,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.exp.json b/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.exp.json index 6e3e364fc..779da95e3 100644 --- a/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.exp.json +++ b/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.exp.json @@ -214,9 +214,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -247,9 +245,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -296,9 +292,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -343,9 +337,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -566,9 +558,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -606,9 +596,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -675,9 +663,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -742,9 +728,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestCreate/base.exp.json b/testdata/d2oracle/TestCreate/base.exp.json index 00929a93d..f552f394a 100644 --- a/testdata/d2oracle/TestCreate/base.exp.json +++ b/testdata/d2oracle/TestCreate/base.exp.json @@ -49,9 +49,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -98,9 +96,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestCreate/container.exp.json b/testdata/d2oracle/TestCreate/container.exp.json index 313bc4453..26f8e503a 100644 --- a/testdata/d2oracle/TestCreate/container.exp.json +++ b/testdata/d2oracle/TestCreate/container.exp.json @@ -78,9 +78,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -127,9 +125,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -174,9 +170,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestCreate/container_edge.exp.json b/testdata/d2oracle/TestCreate/container_edge.exp.json index 67de3a5ee..04420baf5 100644 --- a/testdata/d2oracle/TestCreate/container_edge.exp.json +++ b/testdata/d2oracle/TestCreate/container_edge.exp.json @@ -101,9 +101,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -134,9 +132,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -183,9 +179,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -230,9 +224,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -277,9 +269,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestCreate/container_edge_label.exp.json b/testdata/d2oracle/TestCreate/container_edge_label.exp.json index dd86c4758..2db853505 100644 --- a/testdata/d2oracle/TestCreate/container_edge_label.exp.json +++ b/testdata/d2oracle/TestCreate/container_edge_label.exp.json @@ -111,9 +111,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -144,9 +142,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -193,9 +189,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -240,9 +234,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -287,9 +279,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestCreate/edge.exp.json b/testdata/d2oracle/TestCreate/edge.exp.json index bd65e7873..b9391dd96 100644 --- a/testdata/d2oracle/TestCreate/edge.exp.json +++ b/testdata/d2oracle/TestCreate/edge.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -105,9 +103,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -154,9 +150,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -201,9 +195,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestCreate/edge_nested.exp.json b/testdata/d2oracle/TestCreate/edge_nested.exp.json index 811197336..fd96ef6e9 100644 --- a/testdata/d2oracle/TestCreate/edge_nested.exp.json +++ b/testdata/d2oracle/TestCreate/edge_nested.exp.json @@ -88,9 +88,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -121,9 +119,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -170,9 +166,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -217,9 +211,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -264,9 +256,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestCreate/edge_scope.exp.json b/testdata/d2oracle/TestCreate/edge_scope.exp.json index 1ae389403..ef3c9060a 100644 --- a/testdata/d2oracle/TestCreate/edge_scope.exp.json +++ b/testdata/d2oracle/TestCreate/edge_scope.exp.json @@ -101,9 +101,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -134,9 +132,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -183,9 +179,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -230,9 +224,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -277,9 +269,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json b/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json index ace2f2ebe..c0294b14d 100644 --- a/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json +++ b/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json @@ -101,9 +101,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -134,9 +132,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -183,9 +179,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -230,9 +224,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -277,9 +269,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json b/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json index 966bef34f..4f4d2595a 100644 --- a/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json +++ b/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json @@ -112,9 +112,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -145,9 +143,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -205,9 +201,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -263,9 +257,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -310,9 +302,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -357,9 +347,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestCreate/edge_unique.exp.json b/testdata/d2oracle/TestCreate/edge_unique.exp.json index 87e16b21a..2228f62f9 100644 --- a/testdata/d2oracle/TestCreate/edge_unique.exp.json +++ b/testdata/d2oracle/TestCreate/edge_unique.exp.json @@ -258,9 +258,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -291,9 +289,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -323,9 +319,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -355,9 +349,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -387,9 +379,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -436,9 +426,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -483,9 +471,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -570,9 +556,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -657,9 +641,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -744,9 +726,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestCreate/gen_key.exp.json b/testdata/d2oracle/TestCreate/gen_key.exp.json index 13f651219..6d3333c4f 100644 --- a/testdata/d2oracle/TestCreate/gen_key.exp.json +++ b/testdata/d2oracle/TestCreate/gen_key.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -121,9 +119,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -168,9 +164,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestCreate/gen_key_n.exp.json b/testdata/d2oracle/TestCreate/gen_key_n.exp.json index b7f76f285..a2e5c227f 100644 --- a/testdata/d2oracle/TestCreate/gen_key_n.exp.json +++ b/testdata/d2oracle/TestCreate/gen_key_n.exp.json @@ -330,9 +330,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -401,9 +399,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -470,9 +466,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -539,9 +533,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -586,9 +578,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -633,9 +623,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -680,9 +668,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -727,9 +713,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -774,9 +758,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -821,9 +803,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -868,9 +848,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -915,9 +893,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -962,9 +938,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1009,9 +983,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1056,9 +1028,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestCreate/gen_key_nested.exp.json b/testdata/d2oracle/TestCreate/gen_key_nested.exp.json index 64facd4a0..8e43202e6 100644 --- a/testdata/d2oracle/TestCreate/gen_key_nested.exp.json +++ b/testdata/d2oracle/TestCreate/gen_key_nested.exp.json @@ -138,9 +138,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -273,9 +271,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -406,9 +402,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -539,9 +533,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -619,9 +611,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -699,9 +689,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestCreate/gen_key_scope.exp.json b/testdata/d2oracle/TestCreate/gen_key_scope.exp.json index 8151a96d6..39d9d5b91 100644 --- a/testdata/d2oracle/TestCreate/gen_key_scope.exp.json +++ b/testdata/d2oracle/TestCreate/gen_key_scope.exp.json @@ -123,9 +123,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -194,9 +192,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -263,9 +259,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -332,9 +326,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -379,9 +371,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -426,9 +416,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestCreate/gen_key_suffix.exp.json b/testdata/d2oracle/TestCreate/gen_key_suffix.exp.json index fb3bda2ab..2cc74b8aa 100644 --- a/testdata/d2oracle/TestCreate/gen_key_suffix.exp.json +++ b/testdata/d2oracle/TestCreate/gen_key_suffix.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -121,9 +119,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -168,9 +164,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestCreate/make_scope_multiline.exp.json b/testdata/d2oracle/TestCreate/make_scope_multiline.exp.json index c8a266867..dfc4c5ab0 100644 --- a/testdata/d2oracle/TestCreate/make_scope_multiline.exp.json +++ b/testdata/d2oracle/TestCreate/make_scope_multiline.exp.json @@ -111,9 +111,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -160,9 +158,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -207,9 +203,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.exp.json b/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.exp.json index a3ca572b8..d66653ae1 100644 --- a/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.exp.json +++ b/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.exp.json @@ -157,9 +157,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -206,9 +204,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -253,9 +249,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -300,9 +294,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -347,9 +339,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.exp.json b/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.exp.json index 736cd373f..0d04cefa4 100644 --- a/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.exp.json +++ b/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.exp.json @@ -157,9 +157,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -206,9 +204,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -253,9 +249,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -300,9 +294,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -347,9 +339,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestCreate/nested.exp.json b/testdata/d2oracle/TestCreate/nested.exp.json index 24fc23908..aa857c317 100644 --- a/testdata/d2oracle/TestCreate/nested.exp.json +++ b/testdata/d2oracle/TestCreate/nested.exp.json @@ -71,9 +71,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -142,9 +140,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -211,9 +207,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -280,9 +274,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestCreate/scope.exp.json b/testdata/d2oracle/TestCreate/scope.exp.json index ed300d55d..f33cce3d9 100644 --- a/testdata/d2oracle/TestCreate/scope.exp.json +++ b/testdata/d2oracle/TestCreate/scope.exp.json @@ -100,9 +100,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -171,9 +169,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -240,9 +236,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -309,9 +303,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -356,9 +348,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/arrowhead.exp.json b/testdata/d2oracle/TestDelete/arrowhead.exp.json index 55ca77da0..6e89878ef 100644 --- a/testdata/d2oracle/TestDelete/arrowhead.exp.json +++ b/testdata/d2oracle/TestDelete/arrowhead.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -105,9 +103,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -154,9 +150,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -201,9 +195,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/arrowhead_label.exp.json b/testdata/d2oracle/TestDelete/arrowhead_label.exp.json index cae034940..05312cf16 100644 --- a/testdata/d2oracle/TestDelete/arrowhead_label.exp.json +++ b/testdata/d2oracle/TestDelete/arrowhead_label.exp.json @@ -122,9 +122,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -150,9 +148,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "references": [ { @@ -175,9 +171,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -224,9 +218,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -271,9 +263,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/arrowhead_map.exp.json b/testdata/d2oracle/TestDelete/arrowhead_map.exp.json index 22c22b4e1..e6ff5d752 100644 --- a/testdata/d2oracle/TestDelete/arrowhead_map.exp.json +++ b/testdata/d2oracle/TestDelete/arrowhead_map.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -105,9 +103,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -154,9 +150,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -201,9 +195,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/arrowhead_shape.exp.json b/testdata/d2oracle/TestDelete/arrowhead_shape.exp.json index 6b3c4f832..28694a0da 100644 --- a/testdata/d2oracle/TestDelete/arrowhead_shape.exp.json +++ b/testdata/d2oracle/TestDelete/arrowhead_shape.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -105,9 +103,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -154,9 +150,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -201,9 +195,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/breakup_arrowhead.exp.json b/testdata/d2oracle/TestDelete/breakup_arrowhead.exp.json index 81f128ca2..59968f1d6 100644 --- a/testdata/d2oracle/TestDelete/breakup_arrowhead.exp.json +++ b/testdata/d2oracle/TestDelete/breakup_arrowhead.exp.json @@ -49,9 +49,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -98,9 +96,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/chaos_1.exp.json b/testdata/d2oracle/TestDelete/chaos_1.exp.json index 37e9a36c1..d7f6953d6 100644 --- a/testdata/d2oracle/TestDelete/chaos_1.exp.json +++ b/testdata/d2oracle/TestDelete/chaos_1.exp.json @@ -263,9 +263,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -290,9 +288,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "dst_arrow": true, "references": [ @@ -316,9 +312,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -425,9 +419,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -472,9 +464,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -519,9 +509,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/children.exp.json b/testdata/d2oracle/TestDelete/children.exp.json index 1c006a1ac..a0fdc1628 100644 --- a/testdata/d2oracle/TestDelete/children.exp.json +++ b/testdata/d2oracle/TestDelete/children.exp.json @@ -95,9 +95,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -128,9 +126,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -177,9 +173,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -224,9 +218,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -271,9 +263,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/children_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_conflicts.exp.json index b98430de1..bfed5014b 100644 --- a/testdata/d2oracle/TestDelete/children_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_conflicts.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -121,9 +119,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -168,9 +164,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json index c761202f4..7759732a2 100644 --- a/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json @@ -128,9 +128,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -161,9 +159,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -230,9 +226,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -277,9 +271,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -324,9 +316,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json index 13ca0d7c8..a11ffdd2c 100644 --- a/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json @@ -221,9 +221,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -254,9 +252,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -286,9 +282,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -355,9 +349,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -422,9 +414,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -489,9 +479,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -536,9 +524,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -583,9 +569,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/children_flat_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_flat_conflicts.exp.json index 3cfa85bc2..fe212f64a 100644 --- a/testdata/d2oracle/TestDelete/children_flat_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_flat_conflicts.exp.json @@ -105,9 +105,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -174,9 +172,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -221,9 +217,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json index e71f7802c..c1cf6e922 100644 --- a/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json @@ -197,9 +197,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -230,9 +228,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -319,9 +315,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -386,9 +380,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -433,9 +425,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -480,9 +470,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/children_nested_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_nested_conflicts.exp.json index f63710718..0cfaf5c8d 100644 --- a/testdata/d2oracle/TestDelete/children_nested_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_nested_conflicts.exp.json @@ -101,9 +101,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -150,9 +148,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -197,9 +193,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -244,9 +238,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/children_nested_referenced_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_nested_referenced_conflicts.exp.json index 6c0c07b4d..489e99551 100644 --- a/testdata/d2oracle/TestDelete/children_nested_referenced_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_nested_referenced_conflicts.exp.json @@ -160,9 +160,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -271,9 +269,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -360,9 +356,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -407,9 +401,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/children_no_self_conflict.exp.json b/testdata/d2oracle/TestDelete/children_no_self_conflict.exp.json index d2734da1d..656125a78 100644 --- a/testdata/d2oracle/TestDelete/children_no_self_conflict.exp.json +++ b/testdata/d2oracle/TestDelete/children_no_self_conflict.exp.json @@ -49,9 +49,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -98,9 +96,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/children_order.exp.json b/testdata/d2oracle/TestDelete/children_order.exp.json index c9255013d..208847bc1 100644 --- a/testdata/d2oracle/TestDelete/children_order.exp.json +++ b/testdata/d2oracle/TestDelete/children_order.exp.json @@ -124,9 +124,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -173,9 +171,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -220,9 +216,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -267,9 +261,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -314,9 +306,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/children_referenced_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_referenced_conflicts.exp.json index f9acfe369..25088c478 100644 --- a/testdata/d2oracle/TestDelete/children_referenced_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_referenced_conflicts.exp.json @@ -105,9 +105,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -174,9 +172,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -221,9 +217,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/children_scope.exp.json b/testdata/d2oracle/TestDelete/children_scope.exp.json index 630970e3d..8c3331580 100644 --- a/testdata/d2oracle/TestDelete/children_scope.exp.json +++ b/testdata/d2oracle/TestDelete/children_scope.exp.json @@ -135,9 +135,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -168,9 +166,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -228,9 +224,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -286,9 +280,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -333,9 +325,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -380,9 +370,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -427,9 +415,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/class_refs.exp.json b/testdata/d2oracle/TestDelete/class_refs.exp.json index 7196b7cab..965ae6c65 100644 --- a/testdata/d2oracle/TestDelete/class_refs.exp.json +++ b/testdata/d2oracle/TestDelete/class_refs.exp.json @@ -25,9 +25,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, diff --git a/testdata/d2oracle/TestDelete/conflicts_generated.exp.json b/testdata/d2oracle/TestDelete/conflicts_generated.exp.json index 06b5c7bfb..295ba993d 100644 --- a/testdata/d2oracle/TestDelete/conflicts_generated.exp.json +++ b/testdata/d2oracle/TestDelete/conflicts_generated.exp.json @@ -124,9 +124,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -173,9 +171,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -220,9 +216,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -267,9 +261,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -314,9 +306,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/conflicts_generated_3.exp.json b/testdata/d2oracle/TestDelete/conflicts_generated_3.exp.json index cdb048501..5bfcfeee6 100644 --- a/testdata/d2oracle/TestDelete/conflicts_generated_3.exp.json +++ b/testdata/d2oracle/TestDelete/conflicts_generated_3.exp.json @@ -118,9 +118,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -167,9 +165,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -214,9 +210,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -261,9 +255,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -308,9 +300,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/conflicts_generated_continued.exp.json b/testdata/d2oracle/TestDelete/conflicts_generated_continued.exp.json index c11ac7776..b6b34b741 100644 --- a/testdata/d2oracle/TestDelete/conflicts_generated_continued.exp.json +++ b/testdata/d2oracle/TestDelete/conflicts_generated_continued.exp.json @@ -95,9 +95,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -144,9 +142,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -191,9 +187,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -238,9 +232,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/container_near.exp.json b/testdata/d2oracle/TestDelete/container_near.exp.json index 9f216275b..62e53d145 100644 --- a/testdata/d2oracle/TestDelete/container_near.exp.json +++ b/testdata/d2oracle/TestDelete/container_near.exp.json @@ -173,9 +173,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -237,9 +235,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -284,9 +280,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -346,9 +340,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/delete_container_of_near.exp.json b/testdata/d2oracle/TestDelete/delete_container_of_near.exp.json index fcf34e63f..4c52363d8 100644 --- a/testdata/d2oracle/TestDelete/delete_container_of_near.exp.json +++ b/testdata/d2oracle/TestDelete/delete_container_of_near.exp.json @@ -481,9 +481,7 @@ "direction": { "value": "down" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -514,9 +512,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -546,9 +542,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -578,9 +572,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -610,9 +602,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -642,9 +632,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -674,9 +662,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -706,9 +692,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -738,9 +722,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -770,9 +752,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -819,9 +799,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -866,9 +844,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -913,9 +889,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -960,9 +934,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1027,9 +999,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1094,9 +1064,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1181,9 +1149,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1294,9 +1260,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1361,9 +1325,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1428,9 +1390,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1475,9 +1435,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/delete_icon.exp.json b/testdata/d2oracle/TestDelete/delete_icon.exp.json index fd520cb59..016b3f03f 100644 --- a/testdata/d2oracle/TestDelete/delete_icon.exp.json +++ b/testdata/d2oracle/TestDelete/delete_icon.exp.json @@ -99,9 +99,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -159,9 +157,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -220,9 +216,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/delete_link.exp.json b/testdata/d2oracle/TestDelete/delete_link.exp.json index 8971321a5..b90432335 100644 --- a/testdata/d2oracle/TestDelete/delete_link.exp.json +++ b/testdata/d2oracle/TestDelete/delete_link.exp.json @@ -49,9 +49,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -98,9 +96,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/delete_near.exp.json b/testdata/d2oracle/TestDelete/delete_near.exp.json index 2a1816a00..123053d74 100644 --- a/testdata/d2oracle/TestDelete/delete_near.exp.json +++ b/testdata/d2oracle/TestDelete/delete_near.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -121,9 +119,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -168,9 +164,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/delete_needed_flat_near.exp.json b/testdata/d2oracle/TestDelete/delete_needed_flat_near.exp.json index 3358a6682..1572242cc 100644 --- a/testdata/d2oracle/TestDelete/delete_needed_flat_near.exp.json +++ b/testdata/d2oracle/TestDelete/delete_needed_flat_near.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -121,9 +119,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -168,9 +164,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/delete_redundant_flat_near.exp.json b/testdata/d2oracle/TestDelete/delete_redundant_flat_near.exp.json index 35cb1e9ee..dc12090dc 100644 --- a/testdata/d2oracle/TestDelete/delete_redundant_flat_near.exp.json +++ b/testdata/d2oracle/TestDelete/delete_redundant_flat_near.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -121,9 +119,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -168,9 +164,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/delete_tooltip.exp.json b/testdata/d2oracle/TestDelete/delete_tooltip.exp.json index e69deea55..374052ed6 100644 --- a/testdata/d2oracle/TestDelete/delete_tooltip.exp.json +++ b/testdata/d2oracle/TestDelete/delete_tooltip.exp.json @@ -49,9 +49,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -98,9 +96,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/drop_value.exp.json b/testdata/d2oracle/TestDelete/drop_value.exp.json index e433d441d..ffa928761 100644 --- a/testdata/d2oracle/TestDelete/drop_value.exp.json +++ b/testdata/d2oracle/TestDelete/drop_value.exp.json @@ -60,9 +60,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -120,9 +118,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -178,9 +174,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/drop_value_with_primary.exp.json b/testdata/d2oracle/TestDelete/drop_value_with_primary.exp.json index 95bfecfae..b77b63a71 100644 --- a/testdata/d2oracle/TestDelete/drop_value_with_primary.exp.json +++ b/testdata/d2oracle/TestDelete/drop_value_with_primary.exp.json @@ -49,9 +49,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -98,9 +96,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/duplicate_generated.exp.json b/testdata/d2oracle/TestDelete/duplicate_generated.exp.json index 795869ebc..c157119f0 100644 --- a/testdata/d2oracle/TestDelete/duplicate_generated.exp.json +++ b/testdata/d2oracle/TestDelete/duplicate_generated.exp.json @@ -164,9 +164,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -213,9 +211,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -260,9 +256,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -307,9 +301,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -354,9 +346,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -401,9 +391,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -448,9 +436,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/edge-only-style.exp.json b/testdata/d2oracle/TestDelete/edge-only-style.exp.json index 3ed8aed31..baec4d804 100644 --- a/testdata/d2oracle/TestDelete/edge-only-style.exp.json +++ b/testdata/d2oracle/TestDelete/edge-only-style.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -105,9 +103,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -154,9 +150,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -201,9 +195,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json b/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json index a93ec9cbe..1d8b8d2ea 100644 --- a/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json +++ b/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json @@ -105,9 +105,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -138,9 +136,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -240,9 +236,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -309,9 +303,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -378,9 +370,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -436,9 +426,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/edge_common.exp.json b/testdata/d2oracle/TestDelete/edge_common.exp.json index 09f4f71c8..5f4719f31 100644 --- a/testdata/d2oracle/TestDelete/edge_common.exp.json +++ b/testdata/d2oracle/TestDelete/edge_common.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -105,9 +103,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -154,9 +150,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -201,9 +195,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/edge_common_2.exp.json b/testdata/d2oracle/TestDelete/edge_common_2.exp.json index b59e40e5b..1994e23e7 100644 --- a/testdata/d2oracle/TestDelete/edge_common_2.exp.json +++ b/testdata/d2oracle/TestDelete/edge_common_2.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -105,9 +103,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -154,9 +150,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -201,9 +195,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/edge_common_3.exp.json b/testdata/d2oracle/TestDelete/edge_common_3.exp.json index 24b5ee815..038ad6051 100644 --- a/testdata/d2oracle/TestDelete/edge_common_3.exp.json +++ b/testdata/d2oracle/TestDelete/edge_common_3.exp.json @@ -94,9 +94,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -185,9 +183,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -243,9 +239,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -301,9 +295,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/edge_common_4.exp.json b/testdata/d2oracle/TestDelete/edge_common_4.exp.json index f6af89f48..22dc9057c 100644 --- a/testdata/d2oracle/TestDelete/edge_common_4.exp.json +++ b/testdata/d2oracle/TestDelete/edge_common_4.exp.json @@ -94,9 +94,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -185,9 +183,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -243,9 +239,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -301,9 +295,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/edge_conflict.exp.json b/testdata/d2oracle/TestDelete/edge_conflict.exp.json index 7a57da3ae..40c43ece4 100644 --- a/testdata/d2oracle/TestDelete/edge_conflict.exp.json +++ b/testdata/d2oracle/TestDelete/edge_conflict.exp.json @@ -117,9 +117,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -150,9 +148,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -241,9 +237,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -299,9 +293,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -357,9 +349,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -404,9 +394,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/edge_decrement.exp.json b/testdata/d2oracle/TestDelete/edge_decrement.exp.json index 0244a8b63..13a576bb8 100644 --- a/testdata/d2oracle/TestDelete/edge_decrement.exp.json +++ b/testdata/d2oracle/TestDelete/edge_decrement.exp.json @@ -454,9 +454,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -490,9 +488,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -525,9 +521,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -560,9 +554,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -595,9 +587,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -784,9 +774,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -971,9 +959,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/edge_first.exp.json b/testdata/d2oracle/TestDelete/edge_first.exp.json index 72ea2342f..ff9fec5da 100644 --- a/testdata/d2oracle/TestDelete/edge_first.exp.json +++ b/testdata/d2oracle/TestDelete/edge_first.exp.json @@ -183,9 +183,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -216,9 +214,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -248,9 +244,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -319,9 +313,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -388,9 +380,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -457,9 +447,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -504,9 +492,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -551,9 +537,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -618,9 +602,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -665,9 +647,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/edge_flat_style.exp.json b/testdata/d2oracle/TestDelete/edge_flat_style.exp.json index ef273a614..9a91e3f76 100644 --- a/testdata/d2oracle/TestDelete/edge_flat_style.exp.json +++ b/testdata/d2oracle/TestDelete/edge_flat_style.exp.json @@ -49,9 +49,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -98,9 +96,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/edge_identical_child.exp.json b/testdata/d2oracle/TestDelete/edge_identical_child.exp.json index 05ab2e21b..8803c583a 100644 --- a/testdata/d2oracle/TestDelete/edge_identical_child.exp.json +++ b/testdata/d2oracle/TestDelete/edge_identical_child.exp.json @@ -105,9 +105,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -138,9 +136,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -209,9 +205,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -278,9 +272,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -347,9 +339,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -405,9 +395,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -463,9 +451,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/edge_key_style.exp.json b/testdata/d2oracle/TestDelete/edge_key_style.exp.json index 3d0d0f277..92084a164 100644 --- a/testdata/d2oracle/TestDelete/edge_key_style.exp.json +++ b/testdata/d2oracle/TestDelete/edge_key_style.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -105,9 +103,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -154,9 +150,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -201,9 +195,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/edge_last.exp.json b/testdata/d2oracle/TestDelete/edge_last.exp.json index 38149e7d9..f5ee8321d 100644 --- a/testdata/d2oracle/TestDelete/edge_last.exp.json +++ b/testdata/d2oracle/TestDelete/edge_last.exp.json @@ -220,9 +220,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -253,9 +251,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -285,9 +281,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -317,9 +311,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -388,9 +380,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -457,9 +447,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -526,9 +514,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -573,9 +559,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -640,9 +624,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -707,9 +689,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -754,9 +734,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -801,9 +779,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/edge_map_style.exp.json b/testdata/d2oracle/TestDelete/edge_map_style.exp.json index 777eb0db8..4e09f2ba8 100644 --- a/testdata/d2oracle/TestDelete/edge_map_style.exp.json +++ b/testdata/d2oracle/TestDelete/edge_map_style.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -105,9 +103,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -154,9 +150,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -201,9 +195,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/edge_middle.exp.json b/testdata/d2oracle/TestDelete/edge_middle.exp.json index 5684d997c..38c8a4a15 100644 --- a/testdata/d2oracle/TestDelete/edge_middle.exp.json +++ b/testdata/d2oracle/TestDelete/edge_middle.exp.json @@ -206,9 +206,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -239,9 +237,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -271,9 +267,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -303,9 +297,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -374,9 +366,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -443,9 +433,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -512,9 +500,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -559,9 +545,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -626,9 +610,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -673,9 +655,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -720,9 +700,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -767,9 +745,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/empty_map.exp.json b/testdata/d2oracle/TestDelete/empty_map.exp.json index fc8d49b06..948977db5 100644 --- a/testdata/d2oracle/TestDelete/empty_map.exp.json +++ b/testdata/d2oracle/TestDelete/empty_map.exp.json @@ -78,9 +78,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -127,9 +125,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -174,9 +170,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/flat.exp.json b/testdata/d2oracle/TestDelete/flat.exp.json index 60ff925c4..f40d4a886 100644 --- a/testdata/d2oracle/TestDelete/flat.exp.json +++ b/testdata/d2oracle/TestDelete/flat.exp.json @@ -25,9 +25,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, diff --git a/testdata/d2oracle/TestDelete/flat_reserved.exp.json b/testdata/d2oracle/TestDelete/flat_reserved.exp.json index 294f462a7..184a6220e 100644 --- a/testdata/d2oracle/TestDelete/flat_reserved.exp.json +++ b/testdata/d2oracle/TestDelete/flat_reserved.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -105,9 +103,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -154,9 +150,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -201,9 +195,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/hoist_children.exp.json b/testdata/d2oracle/TestDelete/hoist_children.exp.json index e7e88fd2e..a8fdd39cd 100644 --- a/testdata/d2oracle/TestDelete/hoist_children.exp.json +++ b/testdata/d2oracle/TestDelete/hoist_children.exp.json @@ -78,9 +78,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -127,9 +125,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -174,9 +170,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json b/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json index 790c640a3..5131fc958 100644 --- a/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json +++ b/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json @@ -95,9 +95,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -128,9 +126,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -177,9 +173,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -224,9 +218,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -271,9 +263,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/key_with_edges.exp.json b/testdata/d2oracle/TestDelete/key_with_edges.exp.json index bb035803a..b627b4c4c 100644 --- a/testdata/d2oracle/TestDelete/key_with_edges.exp.json +++ b/testdata/d2oracle/TestDelete/key_with_edges.exp.json @@ -94,9 +94,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -185,9 +183,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -243,9 +239,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -301,9 +295,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/key_with_edges_2.exp.json b/testdata/d2oracle/TestDelete/key_with_edges_2.exp.json index ae47c4e08..3d1f7b584 100644 --- a/testdata/d2oracle/TestDelete/key_with_edges_2.exp.json +++ b/testdata/d2oracle/TestDelete/key_with_edges_2.exp.json @@ -60,9 +60,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -120,9 +118,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -178,9 +174,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/key_with_edges_3.exp.json b/testdata/d2oracle/TestDelete/key_with_edges_3.exp.json index 6a9419684..1506c5f02 100644 --- a/testdata/d2oracle/TestDelete/key_with_edges_3.exp.json +++ b/testdata/d2oracle/TestDelete/key_with_edges_3.exp.json @@ -60,9 +60,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -120,9 +118,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -178,9 +174,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/key_with_edges_4.exp.json b/testdata/d2oracle/TestDelete/key_with_edges_4.exp.json index 98077ceb8..605af29ab 100644 --- a/testdata/d2oracle/TestDelete/key_with_edges_4.exp.json +++ b/testdata/d2oracle/TestDelete/key_with_edges_4.exp.json @@ -94,9 +94,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -185,9 +183,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -243,9 +239,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -301,9 +295,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/left.exp.json b/testdata/d2oracle/TestDelete/left.exp.json index beb1a5894..ecb9c0394 100644 --- a/testdata/d2oracle/TestDelete/left.exp.json +++ b/testdata/d2oracle/TestDelete/left.exp.json @@ -49,9 +49,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -98,9 +96,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/multi_near.exp.json b/testdata/d2oracle/TestDelete/multi_near.exp.json index 4c73064fa..270b09dfa 100644 --- a/testdata/d2oracle/TestDelete/multi_near.exp.json +++ b/testdata/d2oracle/TestDelete/multi_near.exp.json @@ -196,9 +196,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -245,9 +243,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -307,9 +303,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -369,9 +363,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -416,9 +408,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/multi_path_map_conflict.exp.json b/testdata/d2oracle/TestDelete/multi_path_map_conflict.exp.json index 41419ac2a..2ffbd61e7 100644 --- a/testdata/d2oracle/TestDelete/multi_path_map_conflict.exp.json +++ b/testdata/d2oracle/TestDelete/multi_path_map_conflict.exp.json @@ -130,9 +130,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -199,9 +197,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -246,9 +242,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -293,9 +287,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/multi_path_map_no_conflict.exp.json b/testdata/d2oracle/TestDelete/multi_path_map_no_conflict.exp.json index 7b3dcc4f0..770427f9f 100644 --- a/testdata/d2oracle/TestDelete/multi_path_map_no_conflict.exp.json +++ b/testdata/d2oracle/TestDelete/multi_path_map_no_conflict.exp.json @@ -101,9 +101,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -150,9 +148,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -197,9 +193,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -244,9 +238,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/multiple_flat_middle_container.exp.json b/testdata/d2oracle/TestDelete/multiple_flat_middle_container.exp.json index 232329175..a50fae2dd 100644 --- a/testdata/d2oracle/TestDelete/multiple_flat_middle_container.exp.json +++ b/testdata/d2oracle/TestDelete/multiple_flat_middle_container.exp.json @@ -94,9 +94,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -185,9 +183,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -243,9 +239,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -301,9 +295,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/multiple_flat_style.exp.json b/testdata/d2oracle/TestDelete/multiple_flat_style.exp.json index dfe56bd26..daca2a820 100644 --- a/testdata/d2oracle/TestDelete/multiple_flat_style.exp.json +++ b/testdata/d2oracle/TestDelete/multiple_flat_style.exp.json @@ -77,9 +77,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -152,9 +150,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/multiple_map_styles.exp.json b/testdata/d2oracle/TestDelete/multiple_map_styles.exp.json index be177a849..786326a20 100644 --- a/testdata/d2oracle/TestDelete/multiple_map_styles.exp.json +++ b/testdata/d2oracle/TestDelete/multiple_map_styles.exp.json @@ -113,9 +113,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -166,9 +164,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/near.exp.json b/testdata/d2oracle/TestDelete/near.exp.json index 66eadc967..0ce229964 100644 --- a/testdata/d2oracle/TestDelete/near.exp.json +++ b/testdata/d2oracle/TestDelete/near.exp.json @@ -49,9 +49,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -98,9 +96,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/nested.exp.json b/testdata/d2oracle/TestDelete/nested.exp.json index 0b8366219..462b1f7c6 100644 --- a/testdata/d2oracle/TestDelete/nested.exp.json +++ b/testdata/d2oracle/TestDelete/nested.exp.json @@ -71,9 +71,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -142,9 +140,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -211,9 +207,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -280,9 +274,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/nested_2.exp.json b/testdata/d2oracle/TestDelete/nested_2.exp.json index 79da6066b..d473f7e02 100644 --- a/testdata/d2oracle/TestDelete/nested_2.exp.json +++ b/testdata/d2oracle/TestDelete/nested_2.exp.json @@ -71,9 +71,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -142,9 +140,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -211,9 +207,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -280,9 +274,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json b/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json index d9e60c63c..4187ee863 100644 --- a/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json +++ b/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json @@ -101,9 +101,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -134,9 +132,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -183,9 +179,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -230,9 +224,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -277,9 +269,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/nested_flat_style.exp.json b/testdata/d2oracle/TestDelete/nested_flat_style.exp.json index 48543dc61..6536e0ab9 100644 --- a/testdata/d2oracle/TestDelete/nested_flat_style.exp.json +++ b/testdata/d2oracle/TestDelete/nested_flat_style.exp.json @@ -49,9 +49,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -98,9 +96,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/nested_reserved.exp.json b/testdata/d2oracle/TestDelete/nested_reserved.exp.json index bd59d8373..38b307002 100644 --- a/testdata/d2oracle/TestDelete/nested_reserved.exp.json +++ b/testdata/d2oracle/TestDelete/nested_reserved.exp.json @@ -105,9 +105,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -207,9 +205,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -307,9 +303,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -376,9 +370,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/nested_underscore_update.exp.json b/testdata/d2oracle/TestDelete/nested_underscore_update.exp.json index ae69040d8..075d9a1ac 100644 --- a/testdata/d2oracle/TestDelete/nested_underscore_update.exp.json +++ b/testdata/d2oracle/TestDelete/nested_underscore_update.exp.json @@ -89,9 +89,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -138,9 +136,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -196,9 +192,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/node_in_edge.exp.json b/testdata/d2oracle/TestDelete/node_in_edge.exp.json index 96becc9d0..37cddb5d0 100644 --- a/testdata/d2oracle/TestDelete/node_in_edge.exp.json +++ b/testdata/d2oracle/TestDelete/node_in_edge.exp.json @@ -170,9 +170,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -203,9 +201,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -235,9 +231,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -284,9 +278,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -331,9 +323,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -378,9 +368,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -425,9 +413,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -472,9 +458,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -519,9 +503,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json b/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json index 92bb37fcc..c870056ac 100644 --- a/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json +++ b/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json @@ -209,9 +209,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -242,9 +240,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -274,9 +270,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -306,9 +300,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -355,9 +347,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -422,9 +412,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -489,9 +477,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -536,9 +522,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -594,9 +578,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -652,9 +634,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -699,9 +679,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/only-underscore-nested.exp.json b/testdata/d2oracle/TestDelete/only-underscore-nested.exp.json index 0a3a1ad73..f82d339c6 100644 --- a/testdata/d2oracle/TestDelete/only-underscore-nested.exp.json +++ b/testdata/d2oracle/TestDelete/only-underscore-nested.exp.json @@ -101,9 +101,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -150,9 +148,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -197,9 +193,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -244,9 +238,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/only-underscore.exp.json b/testdata/d2oracle/TestDelete/only-underscore.exp.json index 675240729..c5893a70c 100644 --- a/testdata/d2oracle/TestDelete/only-underscore.exp.json +++ b/testdata/d2oracle/TestDelete/only-underscore.exp.json @@ -78,9 +78,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -127,9 +125,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -174,9 +170,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json b/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json index 42e4680c7..e28e01c0d 100644 --- a/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json +++ b/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json @@ -168,9 +168,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -201,9 +199,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -274,9 +270,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -341,9 +335,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json b/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json index 47aec3c7c..76eca003a 100644 --- a/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json +++ b/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json @@ -168,9 +168,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -205,9 +203,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -274,9 +270,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -341,9 +335,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/order_1.exp.json b/testdata/d2oracle/TestDelete/order_1.exp.json index 88dbcf13d..81c1a7f63 100644 --- a/testdata/d2oracle/TestDelete/order_1.exp.json +++ b/testdata/d2oracle/TestDelete/order_1.exp.json @@ -95,9 +95,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -128,9 +126,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -177,9 +173,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -224,9 +218,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -271,9 +263,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/order_2.exp.json b/testdata/d2oracle/TestDelete/order_2.exp.json index 03170d8fa..fb792b501 100644 --- a/testdata/d2oracle/TestDelete/order_2.exp.json +++ b/testdata/d2oracle/TestDelete/order_2.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -121,9 +119,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -168,9 +164,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/order_3.exp.json b/testdata/d2oracle/TestDelete/order_3.exp.json index 70949b8f9..3d12f9941 100644 --- a/testdata/d2oracle/TestDelete/order_3.exp.json +++ b/testdata/d2oracle/TestDelete/order_3.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -121,9 +119,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -168,9 +164,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/order_4.exp.json b/testdata/d2oracle/TestDelete/order_4.exp.json index 6a678dd41..b742e3635 100644 --- a/testdata/d2oracle/TestDelete/order_4.exp.json +++ b/testdata/d2oracle/TestDelete/order_4.exp.json @@ -49,9 +49,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -98,9 +96,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/order_5.exp.json b/testdata/d2oracle/TestDelete/order_5.exp.json index c9e2dbffd..cac44ab60 100644 --- a/testdata/d2oracle/TestDelete/order_5.exp.json +++ b/testdata/d2oracle/TestDelete/order_5.exp.json @@ -147,9 +147,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -180,9 +178,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -212,9 +208,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -261,9 +255,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -308,9 +300,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -355,9 +345,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -402,9 +390,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -449,9 +435,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/order_6.exp.json b/testdata/d2oracle/TestDelete/order_6.exp.json index 982b01acc..b34decb23 100644 --- a/testdata/d2oracle/TestDelete/order_6.exp.json +++ b/testdata/d2oracle/TestDelete/order_6.exp.json @@ -123,9 +123,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -214,9 +212,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -261,9 +257,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -330,9 +324,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -399,9 +391,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/order_7.exp.json b/testdata/d2oracle/TestDelete/order_7.exp.json index b4aaa8cf5..021a65f8c 100644 --- a/testdata/d2oracle/TestDelete/order_7.exp.json +++ b/testdata/d2oracle/TestDelete/order_7.exp.json @@ -134,9 +134,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -236,9 +234,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -283,9 +279,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -363,9 +357,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -443,9 +435,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -523,9 +513,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/order_8.exp.json b/testdata/d2oracle/TestDelete/order_8.exp.json index 670615295..962ecad45 100644 --- a/testdata/d2oracle/TestDelete/order_8.exp.json +++ b/testdata/d2oracle/TestDelete/order_8.exp.json @@ -141,9 +141,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -190,9 +188,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -237,9 +233,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -284,9 +278,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -331,9 +323,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -378,9 +368,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/save_map.exp.json b/testdata/d2oracle/TestDelete/save_map.exp.json index 90e716053..52ae16215 100644 --- a/testdata/d2oracle/TestDelete/save_map.exp.json +++ b/testdata/d2oracle/TestDelete/save_map.exp.json @@ -88,9 +88,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -137,9 +135,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/save_map_with_primary.exp.json b/testdata/d2oracle/TestDelete/save_map_with_primary.exp.json index 548eacac3..bbfef6014 100644 --- a/testdata/d2oracle/TestDelete/save_map_with_primary.exp.json +++ b/testdata/d2oracle/TestDelete/save_map_with_primary.exp.json @@ -98,9 +98,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -147,9 +145,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/shape_class.exp.json b/testdata/d2oracle/TestDelete/shape_class.exp.json index 30a5cbbf9..e5f1f7ea9 100644 --- a/testdata/d2oracle/TestDelete/shape_class.exp.json +++ b/testdata/d2oracle/TestDelete/shape_class.exp.json @@ -49,9 +49,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -98,9 +96,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/shape_sql_table.exp.json b/testdata/d2oracle/TestDelete/shape_sql_table.exp.json index 6d1681ec5..f60f61268 100644 --- a/testdata/d2oracle/TestDelete/shape_sql_table.exp.json +++ b/testdata/d2oracle/TestDelete/shape_sql_table.exp.json @@ -269,9 +269,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -302,9 +300,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -351,9 +347,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -460,7 +454,9 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" } ] @@ -481,9 +477,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -528,9 +522,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/singular_flat_style.exp.json b/testdata/d2oracle/TestDelete/singular_flat_style.exp.json index ceb705b2d..4468c2179 100644 --- a/testdata/d2oracle/TestDelete/singular_flat_style.exp.json +++ b/testdata/d2oracle/TestDelete/singular_flat_style.exp.json @@ -49,9 +49,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -98,9 +96,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/singular_map_style.exp.json b/testdata/d2oracle/TestDelete/singular_map_style.exp.json index 8c846d60e..341dfb3c4 100644 --- a/testdata/d2oracle/TestDelete/singular_map_style.exp.json +++ b/testdata/d2oracle/TestDelete/singular_map_style.exp.json @@ -49,9 +49,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -98,9 +96,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/table_refs.exp.json b/testdata/d2oracle/TestDelete/table_refs.exp.json index 7cd4b6e1a..3f8867f6f 100644 --- a/testdata/d2oracle/TestDelete/table_refs.exp.json +++ b/testdata/d2oracle/TestDelete/table_refs.exp.json @@ -145,9 +145,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -236,7 +234,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "", + "constraint": null, "reference": "" } ] @@ -257,9 +255,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/underscore_no_conflict.exp.json b/testdata/d2oracle/TestDelete/underscore_no_conflict.exp.json index ba51e7d5a..0d57688ed 100644 --- a/testdata/d2oracle/TestDelete/underscore_no_conflict.exp.json +++ b/testdata/d2oracle/TestDelete/underscore_no_conflict.exp.json @@ -112,9 +112,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -161,9 +159,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -219,9 +215,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -266,9 +260,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/underscore_remove.exp.json b/testdata/d2oracle/TestDelete/underscore_remove.exp.json index 942865d1e..17f728b9d 100644 --- a/testdata/d2oracle/TestDelete/underscore_remove.exp.json +++ b/testdata/d2oracle/TestDelete/underscore_remove.exp.json @@ -141,9 +141,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -174,9 +172,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -206,9 +202,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -255,9 +249,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -302,9 +294,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -349,9 +339,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -396,9 +384,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -443,9 +429,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/width.exp.json b/testdata/d2oracle/TestDelete/width.exp.json index 9f0aea140..9b46cd396 100644 --- a/testdata/d2oracle/TestDelete/width.exp.json +++ b/testdata/d2oracle/TestDelete/width.exp.json @@ -49,9 +49,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -98,9 +96,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/append_multiple_styles.exp.json b/testdata/d2oracle/TestMove/append_multiple_styles.exp.json index 4ae722c82..c85307811 100644 --- a/testdata/d2oracle/TestMove/append_multiple_styles.exp.json +++ b/testdata/d2oracle/TestMove/append_multiple_styles.exp.json @@ -233,9 +233,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -282,9 +280,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -356,9 +352,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/basic.exp.json b/testdata/d2oracle/TestMove/basic.exp.json index 395accc11..cf783246e 100644 --- a/testdata/d2oracle/TestMove/basic.exp.json +++ b/testdata/d2oracle/TestMove/basic.exp.json @@ -49,9 +49,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -98,9 +96,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/basic_nested.exp.json b/testdata/d2oracle/TestMove/basic_nested.exp.json index 3d50e422a..416933111 100644 --- a/testdata/d2oracle/TestMove/basic_nested.exp.json +++ b/testdata/d2oracle/TestMove/basic_nested.exp.json @@ -78,9 +78,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -127,9 +125,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -174,9 +170,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/basic_out_of_container.exp.json b/testdata/d2oracle/TestMove/basic_out_of_container.exp.json index 72d30748b..fbe57ba9f 100644 --- a/testdata/d2oracle/TestMove/basic_out_of_container.exp.json +++ b/testdata/d2oracle/TestMove/basic_out_of_container.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -121,9 +119,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -168,9 +164,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/between_containers.exp.json b/testdata/d2oracle/TestMove/between_containers.exp.json index 76f5a3554..539d1eb0f 100644 --- a/testdata/d2oracle/TestMove/between_containers.exp.json +++ b/testdata/d2oracle/TestMove/between_containers.exp.json @@ -101,9 +101,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -150,9 +148,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -197,9 +193,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -244,9 +238,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/chain_connected_nested.exp.json b/testdata/d2oracle/TestMove/chain_connected_nested.exp.json index b9f6efb5c..587de4889 100644 --- a/testdata/d2oracle/TestMove/chain_connected_nested.exp.json +++ b/testdata/d2oracle/TestMove/chain_connected_nested.exp.json @@ -132,9 +132,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -165,9 +163,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -197,9 +193,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -266,9 +260,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -333,9 +325,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -380,9 +370,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.exp.json b/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.exp.json index 7cc0e336c..d4d287d9b 100644 --- a/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.exp.json +++ b/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.exp.json @@ -120,9 +120,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -153,9 +151,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -185,9 +181,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -245,9 +239,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -303,9 +295,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -370,9 +360,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -417,9 +405,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/connected_nested.exp.json b/testdata/d2oracle/TestMove/connected_nested.exp.json index 586175cd4..895608ae8 100644 --- a/testdata/d2oracle/TestMove/connected_nested.exp.json +++ b/testdata/d2oracle/TestMove/connected_nested.exp.json @@ -95,9 +95,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -128,9 +126,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -177,9 +173,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -224,9 +218,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -271,9 +263,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/container_conflicts_generated.exp.json b/testdata/d2oracle/TestMove/container_conflicts_generated.exp.json index 5e3a6e282..0c7173d53 100644 --- a/testdata/d2oracle/TestMove/container_conflicts_generated.exp.json +++ b/testdata/d2oracle/TestMove/container_conflicts_generated.exp.json @@ -139,9 +139,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -188,9 +186,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -235,9 +231,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -282,9 +276,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -329,9 +321,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/container_multiple_refs_with_underscore.exp.json b/testdata/d2oracle/TestMove/container_multiple_refs_with_underscore.exp.json index 1d6a6ebc1..24692953a 100644 --- a/testdata/d2oracle/TestMove/container_multiple_refs_with_underscore.exp.json +++ b/testdata/d2oracle/TestMove/container_multiple_refs_with_underscore.exp.json @@ -78,9 +78,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -127,9 +125,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -174,9 +170,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/container_near.exp.json b/testdata/d2oracle/TestMove/container_near.exp.json index 05201a9b6..2ea7eccbb 100644 --- a/testdata/d2oracle/TestMove/container_near.exp.json +++ b/testdata/d2oracle/TestMove/container_near.exp.json @@ -203,9 +203,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -252,9 +250,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -336,9 +332,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -394,9 +388,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -452,9 +444,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -499,9 +489,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -546,9 +534,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/duplicate.exp.json b/testdata/d2oracle/TestMove/duplicate.exp.json index aeb168979..6ea0399ea 100644 --- a/testdata/d2oracle/TestMove/duplicate.exp.json +++ b/testdata/d2oracle/TestMove/duplicate.exp.json @@ -134,9 +134,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -203,9 +201,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -250,9 +246,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/duplicate_generated.exp.json b/testdata/d2oracle/TestMove/duplicate_generated.exp.json index 22654afcc..4412a6bb0 100644 --- a/testdata/d2oracle/TestMove/duplicate_generated.exp.json +++ b/testdata/d2oracle/TestMove/duplicate_generated.exp.json @@ -193,9 +193,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -242,9 +240,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -289,9 +285,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -336,9 +330,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -383,9 +375,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -430,9 +420,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -477,9 +465,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -524,9 +510,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/edge_across_containers.exp.json b/testdata/d2oracle/TestMove/edge_across_containers.exp.json index beb4e5634..0c1da31dc 100644 --- a/testdata/d2oracle/TestMove/edge_across_containers.exp.json +++ b/testdata/d2oracle/TestMove/edge_across_containers.exp.json @@ -146,9 +146,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -179,9 +177,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -228,9 +224,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -317,9 +311,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -386,9 +378,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -433,9 +423,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/edge_basic.exp.json b/testdata/d2oracle/TestMove/edge_basic.exp.json index 03f9339cf..fc1f00057 100644 --- a/testdata/d2oracle/TestMove/edge_basic.exp.json +++ b/testdata/d2oracle/TestMove/edge_basic.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -105,9 +103,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -154,9 +150,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -201,9 +195,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/edge_chain_basic.exp.json b/testdata/d2oracle/TestMove/edge_chain_basic.exp.json index dcc512ba0..1a72ed1fe 100644 --- a/testdata/d2oracle/TestMove/edge_chain_basic.exp.json +++ b/testdata/d2oracle/TestMove/edge_chain_basic.exp.json @@ -109,9 +109,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -142,9 +140,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -174,9 +170,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -223,9 +217,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -290,9 +282,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -337,9 +327,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/edge_chain_circular.exp.json b/testdata/d2oracle/TestMove/edge_chain_circular.exp.json index df87ea83e..f08962166 100644 --- a/testdata/d2oracle/TestMove/edge_chain_circular.exp.json +++ b/testdata/d2oracle/TestMove/edge_chain_circular.exp.json @@ -160,9 +160,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -193,9 +191,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -225,9 +221,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -274,9 +268,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -363,9 +355,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -430,9 +420,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json b/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json index 2cae2052f..c8c7aee24 100644 --- a/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json +++ b/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json @@ -143,9 +143,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -176,9 +174,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -208,9 +204,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -288,9 +282,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -346,9 +338,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -413,9 +403,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -460,9 +448,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json b/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json index 1b5d9b69f..306b01b2f 100644 --- a/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json +++ b/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json @@ -160,9 +160,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -193,9 +191,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -225,9 +221,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -274,9 +268,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -321,9 +313,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -410,9 +400,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -457,9 +445,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/edge_conflict.exp.json b/testdata/d2oracle/TestMove/edge_conflict.exp.json index cc2aab88b..d5536c5d6 100644 --- a/testdata/d2oracle/TestMove/edge_conflict.exp.json +++ b/testdata/d2oracle/TestMove/edge_conflict.exp.json @@ -146,9 +146,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -179,9 +177,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -270,9 +266,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -328,9 +322,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -386,9 +378,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -433,9 +423,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -480,9 +468,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/edge_into_container.exp.json b/testdata/d2oracle/TestMove/edge_into_container.exp.json index 943587e97..a63688556 100644 --- a/testdata/d2oracle/TestMove/edge_into_container.exp.json +++ b/testdata/d2oracle/TestMove/edge_into_container.exp.json @@ -135,9 +135,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -168,9 +166,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -248,9 +244,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -295,9 +289,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -353,9 +345,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -400,9 +390,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/edge_nested_basic.exp.json b/testdata/d2oracle/TestMove/edge_nested_basic.exp.json index fbe8d3aeb..053348323 100644 --- a/testdata/d2oracle/TestMove/edge_nested_basic.exp.json +++ b/testdata/d2oracle/TestMove/edge_nested_basic.exp.json @@ -101,9 +101,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -134,9 +132,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -183,9 +179,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -230,9 +224,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -277,9 +269,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/edge_out_of_container.exp.json b/testdata/d2oracle/TestMove/edge_out_of_container.exp.json index 76f20e41e..6a69f4dd8 100644 --- a/testdata/d2oracle/TestMove/edge_out_of_container.exp.json +++ b/testdata/d2oracle/TestMove/edge_out_of_container.exp.json @@ -112,9 +112,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -145,9 +143,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -194,9 +190,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -252,9 +246,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -299,9 +291,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/extend_map.exp.json b/testdata/d2oracle/TestMove/extend_map.exp.json index a9bc27742..5883a2402 100644 --- a/testdata/d2oracle/TestMove/extend_map.exp.json +++ b/testdata/d2oracle/TestMove/extend_map.exp.json @@ -159,9 +159,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -228,9 +226,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -275,9 +271,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -322,9 +316,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -369,9 +361,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/extend_stationary_path.exp.json b/testdata/d2oracle/TestMove/extend_stationary_path.exp.json index c1388762e..f65c5ef79 100644 --- a/testdata/d2oracle/TestMove/extend_stationary_path.exp.json +++ b/testdata/d2oracle/TestMove/extend_stationary_path.exp.json @@ -152,9 +152,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -243,9 +241,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -332,9 +328,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -421,9 +415,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/flat_between_containers.exp.json b/testdata/d2oracle/TestMove/flat_between_containers.exp.json index f383bbd08..ed420bc52 100644 --- a/testdata/d2oracle/TestMove/flat_between_containers.exp.json +++ b/testdata/d2oracle/TestMove/flat_between_containers.exp.json @@ -101,9 +101,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -150,9 +148,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -197,9 +193,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -244,9 +238,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/flat_merge.exp.json b/testdata/d2oracle/TestMove/flat_merge.exp.json index 1a71d4059..f9404e9b9 100644 --- a/testdata/d2oracle/TestMove/flat_merge.exp.json +++ b/testdata/d2oracle/TestMove/flat_merge.exp.json @@ -134,9 +134,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -183,9 +181,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -230,9 +226,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -277,9 +271,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -324,9 +316,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/flat_middle_container.exp.json b/testdata/d2oracle/TestMove/flat_middle_container.exp.json index 7ee1856dc..fe7060966 100644 --- a/testdata/d2oracle/TestMove/flat_middle_container.exp.json +++ b/testdata/d2oracle/TestMove/flat_middle_container.exp.json @@ -112,9 +112,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -172,9 +170,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -230,9 +226,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -277,9 +271,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -324,9 +316,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/flat_near.exp.json b/testdata/d2oracle/TestMove/flat_near.exp.json index 817f025d2..ccf11b820 100644 --- a/testdata/d2oracle/TestMove/flat_near.exp.json +++ b/testdata/d2oracle/TestMove/flat_near.exp.json @@ -122,9 +122,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -208,9 +206,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -255,9 +251,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -302,9 +296,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/flat_nested_merge.exp.json b/testdata/d2oracle/TestMove/flat_nested_merge.exp.json index 455a2f981..12346aca8 100644 --- a/testdata/d2oracle/TestMove/flat_nested_merge.exp.json +++ b/testdata/d2oracle/TestMove/flat_nested_merge.exp.json @@ -190,9 +190,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -272,9 +270,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -352,9 +348,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -432,9 +426,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -512,9 +504,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -570,9 +560,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -628,9 +616,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -697,9 +683,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -766,9 +750,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -835,9 +817,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -882,9 +862,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/flat_nested_merge_multiple_refs.exp.json b/testdata/d2oracle/TestMove/flat_nested_merge_multiple_refs.exp.json index 177336e19..9eda1abc2 100644 --- a/testdata/d2oracle/TestMove/flat_nested_merge_multiple_refs.exp.json +++ b/testdata/d2oracle/TestMove/flat_nested_merge_multiple_refs.exp.json @@ -288,9 +288,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -432,9 +430,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -585,9 +581,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -738,9 +732,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -785,9 +777,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -832,9 +822,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -879,9 +867,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -926,9 +912,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1006,9 +990,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/flat_reparent_with_map_value.exp.json b/testdata/d2oracle/TestMove/flat_reparent_with_map_value.exp.json index 6da1ee6d5..f587d63fd 100644 --- a/testdata/d2oracle/TestMove/flat_reparent_with_map_value.exp.json +++ b/testdata/d2oracle/TestMove/flat_reparent_with_map_value.exp.json @@ -111,9 +111,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -160,9 +158,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -207,9 +203,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/flat_reparent_with_mixed_map_value.exp.json b/testdata/d2oracle/TestMove/flat_reparent_with_mixed_map_value.exp.json index c5c8e6e7d..4210e6a2a 100644 --- a/testdata/d2oracle/TestMove/flat_reparent_with_mixed_map_value.exp.json +++ b/testdata/d2oracle/TestMove/flat_reparent_with_mixed_map_value.exp.json @@ -152,9 +152,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -201,9 +199,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -248,9 +244,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -295,9 +289,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/flat_reparent_with_value.exp.json b/testdata/d2oracle/TestMove/flat_reparent_with_value.exp.json index f17aff8a0..936069718 100644 --- a/testdata/d2oracle/TestMove/flat_reparent_with_value.exp.json +++ b/testdata/d2oracle/TestMove/flat_reparent_with_value.exp.json @@ -82,9 +82,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -131,9 +129,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -178,9 +174,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/flat_style.exp.json b/testdata/d2oracle/TestMove/flat_style.exp.json index 66f168b08..9a3353650 100644 --- a/testdata/d2oracle/TestMove/flat_style.exp.json +++ b/testdata/d2oracle/TestMove/flat_style.exp.json @@ -161,9 +161,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -210,9 +208,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -328,9 +324,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/full_edge_slice.exp.json b/testdata/d2oracle/TestMove/full_edge_slice.exp.json index dca6fdaa0..ecd84c941 100644 --- a/testdata/d2oracle/TestMove/full_edge_slice.exp.json +++ b/testdata/d2oracle/TestMove/full_edge_slice.exp.json @@ -215,9 +215,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -248,9 +246,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -280,9 +276,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -360,9 +354,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -407,9 +399,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -505,9 +495,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -583,9 +571,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/full_slice.exp.json b/testdata/d2oracle/TestMove/full_slice.exp.json index bd3bf0e72..5264e53dd 100644 --- a/testdata/d2oracle/TestMove/full_slice.exp.json +++ b/testdata/d2oracle/TestMove/full_slice.exp.json @@ -101,9 +101,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -150,9 +148,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -197,9 +193,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -244,9 +238,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/gnarly_1.exp.json b/testdata/d2oracle/TestMove/gnarly_1.exp.json index f0eeecdc3..17cf799c8 100644 --- a/testdata/d2oracle/TestMove/gnarly_1.exp.json +++ b/testdata/d2oracle/TestMove/gnarly_1.exp.json @@ -359,9 +359,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -392,9 +390,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -424,9 +420,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -456,9 +450,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -527,9 +519,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -596,9 +586,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -665,9 +653,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -774,9 +760,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -843,9 +827,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -912,9 +894,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -959,9 +939,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1068,9 +1046,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1146,9 +1122,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1204,9 +1178,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1262,9 +1234,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1320,9 +1290,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/hoist_container_children.exp.json b/testdata/d2oracle/TestMove/hoist_container_children.exp.json index da7bbfa2f..828b515b7 100644 --- a/testdata/d2oracle/TestMove/hoist_container_children.exp.json +++ b/testdata/d2oracle/TestMove/hoist_container_children.exp.json @@ -124,9 +124,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -173,9 +171,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -220,9 +216,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -267,9 +261,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -314,9 +306,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/include_descendants_conflict.exp.json b/testdata/d2oracle/TestMove/include_descendants_conflict.exp.json index 5c70c063b..f6bfb0cac 100644 --- a/testdata/d2oracle/TestMove/include_descendants_conflict.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_conflict.exp.json @@ -112,9 +112,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -161,9 +159,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -208,9 +204,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -266,9 +260,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -324,9 +316,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/include_descendants_edge_child.exp.json b/testdata/d2oracle/TestMove/include_descendants_edge_child.exp.json index 8041bc7c9..51160c4ee 100644 --- a/testdata/d2oracle/TestMove/include_descendants_edge_child.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_edge_child.exp.json @@ -130,9 +130,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -163,9 +161,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -212,9 +208,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -259,9 +253,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -306,9 +298,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -353,9 +343,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/include_descendants_edge_ref_1.exp.json b/testdata/d2oracle/TestMove/include_descendants_edge_ref_1.exp.json index fcaf3d582..9476e014c 100644 --- a/testdata/d2oracle/TestMove/include_descendants_edge_ref_1.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_edge_ref_1.exp.json @@ -168,9 +168,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -201,9 +199,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -334,9 +330,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -465,9 +459,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -534,9 +526,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -603,9 +593,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/include_descendants_edge_ref_2.exp.json b/testdata/d2oracle/TestMove/include_descendants_edge_ref_2.exp.json index 019333be7..6398bdbee 100644 --- a/testdata/d2oracle/TestMove/include_descendants_edge_ref_2.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_edge_ref_2.exp.json @@ -95,9 +95,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -128,9 +126,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -177,9 +173,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -224,9 +218,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -271,9 +263,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/include_descendants_edge_ref_3.exp.json b/testdata/d2oracle/TestMove/include_descendants_edge_ref_3.exp.json index 9cdadea96..49eeceb6a 100644 --- a/testdata/d2oracle/TestMove/include_descendants_edge_ref_3.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_edge_ref_3.exp.json @@ -106,9 +106,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -139,9 +137,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -188,9 +184,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -246,9 +240,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -304,9 +296,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -351,9 +341,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/include_descendants_edge_ref_4.exp.json b/testdata/d2oracle/TestMove/include_descendants_edge_ref_4.exp.json index 1a4a2ff4d..a0401b010 100644 --- a/testdata/d2oracle/TestMove/include_descendants_edge_ref_4.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_edge_ref_4.exp.json @@ -140,9 +140,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -173,9 +171,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -222,9 +218,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -311,9 +305,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -380,9 +372,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -449,9 +439,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -496,9 +484,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/include_descendants_edge_ref_5.exp.json b/testdata/d2oracle/TestMove/include_descendants_edge_ref_5.exp.json index 283221e09..ade1aa941 100644 --- a/testdata/d2oracle/TestMove/include_descendants_edge_ref_5.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_edge_ref_5.exp.json @@ -169,9 +169,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -202,9 +200,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -251,9 +247,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -298,9 +292,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -387,9 +379,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -456,9 +446,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -525,9 +513,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -572,9 +558,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/include_descendants_edge_ref_6.exp.json b/testdata/d2oracle/TestMove/include_descendants_edge_ref_6.exp.json index ce7935bc1..6e965a5c1 100644 --- a/testdata/d2oracle/TestMove/include_descendants_edge_ref_6.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_edge_ref_6.exp.json @@ -106,9 +106,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -139,9 +137,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -188,9 +184,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -266,9 +260,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -324,9 +316,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/include_descendants_edge_ref_7.exp.json b/testdata/d2oracle/TestMove/include_descendants_edge_ref_7.exp.json index 24d8d6767..e4786e442 100644 --- a/testdata/d2oracle/TestMove/include_descendants_edge_ref_7.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_edge_ref_7.exp.json @@ -128,9 +128,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -161,9 +159,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -283,9 +279,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -341,9 +335,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -399,9 +391,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -457,9 +447,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/include_descendants_edge_ref_underscore.exp.json b/testdata/d2oracle/TestMove/include_descendants_edge_ref_underscore.exp.json index 6c3f40f55..14b24fa95 100644 --- a/testdata/d2oracle/TestMove/include_descendants_edge_ref_underscore.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_edge_ref_underscore.exp.json @@ -309,9 +309,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -342,9 +340,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -374,9 +370,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -613,9 +607,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -850,9 +842,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -972,9 +962,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1094,9 +1082,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1141,9 +1127,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/include_descendants_flat_1.exp.json b/testdata/d2oracle/TestMove/include_descendants_flat_1.exp.json index c7fe1680b..8b51aca65 100644 --- a/testdata/d2oracle/TestMove/include_descendants_flat_1.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_flat_1.exp.json @@ -89,9 +89,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -138,9 +136,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -196,9 +192,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -254,9 +248,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/include_descendants_flat_2.exp.json b/testdata/d2oracle/TestMove/include_descendants_flat_2.exp.json index 6f1a77e95..db68a2c68 100644 --- a/testdata/d2oracle/TestMove/include_descendants_flat_2.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_flat_2.exp.json @@ -123,9 +123,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -203,9 +201,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -261,9 +257,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -319,9 +313,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -377,9 +369,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/include_descendants_flat_3.exp.json b/testdata/d2oracle/TestMove/include_descendants_flat_3.exp.json index c808f2c1d..53a6d1c9a 100644 --- a/testdata/d2oracle/TestMove/include_descendants_flat_3.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_flat_3.exp.json @@ -117,9 +117,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -197,9 +195,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -255,9 +251,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -313,9 +307,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -371,9 +363,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/include_descendants_flat_4.exp.json b/testdata/d2oracle/TestMove/include_descendants_flat_4.exp.json index 278b3de45..2f602a41c 100644 --- a/testdata/d2oracle/TestMove/include_descendants_flat_4.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_flat_4.exp.json @@ -117,9 +117,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -208,9 +206,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -266,9 +262,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -324,9 +318,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -371,9 +363,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/include_descendants_grandchild.exp.json b/testdata/d2oracle/TestMove/include_descendants_grandchild.exp.json index 3c7e78246..5e5b351fb 100644 --- a/testdata/d2oracle/TestMove/include_descendants_grandchild.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_grandchild.exp.json @@ -170,9 +170,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -219,9 +217,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -266,9 +262,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -344,9 +338,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -402,9 +394,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -449,9 +439,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/include_descendants_map_1.exp.json b/testdata/d2oracle/TestMove/include_descendants_map_1.exp.json index 4ed6904f5..693057a01 100644 --- a/testdata/d2oracle/TestMove/include_descendants_map_1.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_map_1.exp.json @@ -107,9 +107,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -156,9 +154,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -203,9 +199,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -250,9 +244,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/include_descendants_map_2.exp.json b/testdata/d2oracle/TestMove/include_descendants_map_2.exp.json index f142a1f98..d956b21f3 100644 --- a/testdata/d2oracle/TestMove/include_descendants_map_2.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_map_2.exp.json @@ -181,9 +181,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -250,9 +248,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -297,9 +293,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -375,9 +369,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -422,9 +414,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -480,9 +470,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/include_descendants_move_out.exp.json b/testdata/d2oracle/TestMove/include_descendants_move_out.exp.json index db22e48e9..b01d1853c 100644 --- a/testdata/d2oracle/TestMove/include_descendants_move_out.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_move_out.exp.json @@ -130,9 +130,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -179,9 +177,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -226,9 +222,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -273,9 +267,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -320,9 +312,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/include_descendants_near.exp.json b/testdata/d2oracle/TestMove/include_descendants_near.exp.json index 95ed643c3..1d2fadc77 100644 --- a/testdata/d2oracle/TestMove/include_descendants_near.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_near.exp.json @@ -133,9 +133,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -182,9 +180,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -240,9 +236,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -298,9 +292,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -393,9 +385,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/include_descendants_nested_1.exp.json b/testdata/d2oracle/TestMove/include_descendants_nested_1.exp.json index c8334c5b0..8878cedec 100644 --- a/testdata/d2oracle/TestMove/include_descendants_nested_1.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_nested_1.exp.json @@ -101,9 +101,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -150,9 +148,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -197,9 +193,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -244,9 +238,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/include_descendants_nested_2.exp.json b/testdata/d2oracle/TestMove/include_descendants_nested_2.exp.json index ffcdc9ec2..47d6bcde2 100644 --- a/testdata/d2oracle/TestMove/include_descendants_nested_2.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_nested_2.exp.json @@ -112,9 +112,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -192,9 +190,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -250,9 +246,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -297,9 +291,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/include_descendants_nested_reserved_2.exp.json b/testdata/d2oracle/TestMove/include_descendants_nested_reserved_2.exp.json index 77a8ac776..16780889e 100644 --- a/testdata/d2oracle/TestMove/include_descendants_nested_reserved_2.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_nested_reserved_2.exp.json @@ -104,9 +104,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -164,9 +162,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -222,9 +218,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -280,9 +274,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/include_descendants_nested_reserved_3.exp.json b/testdata/d2oracle/TestMove/include_descendants_nested_reserved_3.exp.json index 7eadb5fc4..354853776 100644 --- a/testdata/d2oracle/TestMove/include_descendants_nested_reserved_3.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_nested_reserved_3.exp.json @@ -104,9 +104,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -153,9 +151,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -222,9 +218,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -291,9 +285,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/include_descendants_non_conflict.exp.json b/testdata/d2oracle/TestMove/include_descendants_non_conflict.exp.json index 0efe58b19..fc7a75e85 100644 --- a/testdata/d2oracle/TestMove/include_descendants_non_conflict.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_non_conflict.exp.json @@ -135,9 +135,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -184,9 +182,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -231,9 +227,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -289,9 +283,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -347,9 +339,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -394,9 +384,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/include_descendants_sql.exp.json b/testdata/d2oracle/TestMove/include_descendants_sql.exp.json index 3daa5414f..1ef1f7e70 100644 --- a/testdata/d2oracle/TestMove/include_descendants_sql.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_sql.exp.json @@ -150,9 +150,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -199,9 +197,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -257,7 +253,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "", + "constraint": null, "reference": "" } ] @@ -278,9 +274,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/include_descendants_underscore.exp.json b/testdata/d2oracle/TestMove/include_descendants_underscore.exp.json index 32dbb24e5..e5fb57ee6 100644 --- a/testdata/d2oracle/TestMove/include_descendants_underscore.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_underscore.exp.json @@ -248,9 +248,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -281,9 +279,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -313,9 +309,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -393,9 +387,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -451,9 +443,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -551,9 +541,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -651,9 +639,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -718,9 +704,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -776,9 +760,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/include_descendants_underscore_2.exp.json b/testdata/d2oracle/TestMove/include_descendants_underscore_2.exp.json index 2e08bff1c..435c47c15 100644 --- a/testdata/d2oracle/TestMove/include_descendants_underscore_2.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_underscore_2.exp.json @@ -123,9 +123,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -214,9 +212,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -261,9 +257,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -330,9 +324,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/include_descendants_underscore_3.exp.json b/testdata/d2oracle/TestMove/include_descendants_underscore_3.exp.json index 797e1014d..169f4bb3b 100644 --- a/testdata/d2oracle/TestMove/include_descendants_underscore_3.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_underscore_3.exp.json @@ -236,9 +236,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -269,9 +267,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -301,9 +297,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -476,9 +470,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -523,9 +515,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -634,9 +624,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -681,9 +669,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -750,9 +736,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/include_descendants_underscore_regression.exp.json b/testdata/d2oracle/TestMove/include_descendants_underscore_regression.exp.json index a4876c486..cf2f11d24 100644 --- a/testdata/d2oracle/TestMove/include_descendants_underscore_regression.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_underscore_regression.exp.json @@ -78,9 +78,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -127,9 +125,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -174,9 +170,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/include_descendants_underscore_regression_2.exp.json b/testdata/d2oracle/TestMove/include_descendants_underscore_regression_2.exp.json index 153524784..f89c68396 100644 --- a/testdata/d2oracle/TestMove/include_descendants_underscore_regression_2.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_underscore_regression_2.exp.json @@ -89,9 +89,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -138,9 +136,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -196,9 +192,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -254,9 +248,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/into_container_existing_map.exp.json b/testdata/d2oracle/TestMove/into_container_existing_map.exp.json index d693f7bd4..fdb447e25 100644 --- a/testdata/d2oracle/TestMove/into_container_existing_map.exp.json +++ b/testdata/d2oracle/TestMove/into_container_existing_map.exp.json @@ -101,9 +101,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -150,9 +148,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -197,9 +193,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -244,9 +238,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/into_container_nonexisting_map.exp.json b/testdata/d2oracle/TestMove/into_container_nonexisting_map.exp.json index 406d1ef9f..787da3561 100644 --- a/testdata/d2oracle/TestMove/into_container_nonexisting_map.exp.json +++ b/testdata/d2oracle/TestMove/into_container_nonexisting_map.exp.json @@ -78,9 +78,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -127,9 +125,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -174,9 +170,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/into_container_with_flat_keys.exp.json b/testdata/d2oracle/TestMove/into_container_with_flat_keys.exp.json index 135a83ef7..7ed84d7a5 100644 --- a/testdata/d2oracle/TestMove/into_container_with_flat_keys.exp.json +++ b/testdata/d2oracle/TestMove/into_container_with_flat_keys.exp.json @@ -212,9 +212,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -261,9 +259,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -318,9 +314,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/into_container_with_flat_style.exp.json b/testdata/d2oracle/TestMove/into_container_with_flat_style.exp.json index bba5f98b6..22709097f 100644 --- a/testdata/d2oracle/TestMove/into_container_with_flat_style.exp.json +++ b/testdata/d2oracle/TestMove/into_container_with_flat_style.exp.json @@ -118,9 +118,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -171,9 +169,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -218,9 +214,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/map_transplant.exp.json b/testdata/d2oracle/TestMove/map_transplant.exp.json index 586e8b616..223c5c8d3 100644 --- a/testdata/d2oracle/TestMove/map_transplant.exp.json +++ b/testdata/d2oracle/TestMove/map_transplant.exp.json @@ -221,9 +221,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -270,9 +268,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -317,9 +313,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -364,9 +358,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -415,9 +407,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/map_with_label.exp.json b/testdata/d2oracle/TestMove/map_with_label.exp.json index 7a1c7fd9f..45253ad5f 100644 --- a/testdata/d2oracle/TestMove/map_with_label.exp.json +++ b/testdata/d2oracle/TestMove/map_with_label.exp.json @@ -111,9 +111,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -160,9 +158,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -207,9 +203,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -254,9 +248,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/merge_nested_maps.exp.json b/testdata/d2oracle/TestMove/merge_nested_maps.exp.json index b6c858933..54b97c569 100644 --- a/testdata/d2oracle/TestMove/merge_nested_maps.exp.json +++ b/testdata/d2oracle/TestMove/merge_nested_maps.exp.json @@ -272,9 +272,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -321,9 +319,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -472,9 +468,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -530,9 +524,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -608,9 +600,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -677,9 +667,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -746,9 +734,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -793,9 +779,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -840,9 +824,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/merge_reserved.exp.json b/testdata/d2oracle/TestMove/merge_reserved.exp.json index 59eadcb67..15bad681f 100644 --- a/testdata/d2oracle/TestMove/merge_reserved.exp.json +++ b/testdata/d2oracle/TestMove/merge_reserved.exp.json @@ -263,9 +263,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -312,9 +310,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -452,9 +448,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -510,9 +504,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -568,9 +560,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -626,9 +616,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -673,9 +661,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/middle_container.exp.json b/testdata/d2oracle/TestMove/middle_container.exp.json index 12bae318b..1b3c7ee23 100644 --- a/testdata/d2oracle/TestMove/middle_container.exp.json +++ b/testdata/d2oracle/TestMove/middle_container.exp.json @@ -101,9 +101,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -150,9 +148,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -197,9 +193,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -244,9 +238,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/middle_container_generated_conflict.exp.json b/testdata/d2oracle/TestMove/middle_container_generated_conflict.exp.json index 518469ce4..6a854d6f7 100644 --- a/testdata/d2oracle/TestMove/middle_container_generated_conflict.exp.json +++ b/testdata/d2oracle/TestMove/middle_container_generated_conflict.exp.json @@ -295,9 +295,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -328,9 +326,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -360,9 +356,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -502,9 +496,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -580,9 +572,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -658,9 +648,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -725,9 +713,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -803,9 +789,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -850,9 +834,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/move_container_children.exp.json b/testdata/d2oracle/TestMove/move_container_children.exp.json index 3a76c1c31..4df2648ca 100644 --- a/testdata/d2oracle/TestMove/move_container_children.exp.json +++ b/testdata/d2oracle/TestMove/move_container_children.exp.json @@ -147,9 +147,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -196,9 +194,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -243,9 +239,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -290,9 +284,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -337,9 +329,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -384,9 +374,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/move_container_conflict_children.exp.json b/testdata/d2oracle/TestMove/move_container_conflict_children.exp.json index 1f7889425..513f59915 100644 --- a/testdata/d2oracle/TestMove/move_container_conflict_children.exp.json +++ b/testdata/d2oracle/TestMove/move_container_conflict_children.exp.json @@ -147,9 +147,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -196,9 +194,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -243,9 +239,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -290,9 +284,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -337,9 +329,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -384,9 +374,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/move_into_key_with_value.exp.json b/testdata/d2oracle/TestMove/move_into_key_with_value.exp.json index 2feb2e4b4..4f3b67fa0 100644 --- a/testdata/d2oracle/TestMove/move_into_key_with_value.exp.json +++ b/testdata/d2oracle/TestMove/move_into_key_with_value.exp.json @@ -88,9 +88,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -137,9 +135,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -184,9 +180,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/move_out_of_edge.exp.json b/testdata/d2oracle/TestMove/move_out_of_edge.exp.json index c0bc0b3a8..6805aaf32 100644 --- a/testdata/d2oracle/TestMove/move_out_of_edge.exp.json +++ b/testdata/d2oracle/TestMove/move_out_of_edge.exp.json @@ -128,9 +128,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -161,9 +159,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -221,9 +217,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -279,9 +273,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -348,9 +340,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -417,9 +407,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -486,9 +474,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -533,9 +519,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/move_out_of_nested_edge.exp.json b/testdata/d2oracle/TestMove/move_out_of_nested_edge.exp.json index 42428a39a..68a971858 100644 --- a/testdata/d2oracle/TestMove/move_out_of_nested_edge.exp.json +++ b/testdata/d2oracle/TestMove/move_out_of_nested_edge.exp.json @@ -168,9 +168,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -201,9 +199,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -261,9 +257,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -319,9 +313,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -419,9 +411,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -519,9 +509,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -588,9 +576,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -635,9 +621,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/multiple_nesting_levels.exp.json b/testdata/d2oracle/TestMove/multiple_nesting_levels.exp.json index 3bfdd13a4..a954f0406 100644 --- a/testdata/d2oracle/TestMove/multiple_nesting_levels.exp.json +++ b/testdata/d2oracle/TestMove/multiple_nesting_levels.exp.json @@ -283,9 +283,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -385,9 +383,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -527,9 +523,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -689,9 +683,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -736,9 +728,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -783,9 +773,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -852,9 +840,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -932,9 +918,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/near.exp.json b/testdata/d2oracle/TestMove/near.exp.json index 31cde246f..852a73b54 100644 --- a/testdata/d2oracle/TestMove/near.exp.json +++ b/testdata/d2oracle/TestMove/near.exp.json @@ -140,9 +140,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -215,9 +213,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -262,9 +258,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -309,9 +303,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/nested-underscore-move-out.exp.json b/testdata/d2oracle/TestMove/nested-underscore-move-out.exp.json index 1dc1b90c3..b0c57105a 100644 --- a/testdata/d2oracle/TestMove/nested-underscore-move-out.exp.json +++ b/testdata/d2oracle/TestMove/nested-underscore-move-out.exp.json @@ -101,9 +101,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -150,9 +148,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -197,9 +193,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -244,9 +238,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/nested_reserved_2.exp.json b/testdata/d2oracle/TestMove/nested_reserved_2.exp.json index 8af4f55ee..178643bd1 100644 --- a/testdata/d2oracle/TestMove/nested_reserved_2.exp.json +++ b/testdata/d2oracle/TestMove/nested_reserved_2.exp.json @@ -104,9 +104,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -164,9 +162,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -222,9 +218,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -280,9 +274,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/nested_reserved_3.exp.json b/testdata/d2oracle/TestMove/nested_reserved_3.exp.json index 3d1722af3..ff80eff44 100644 --- a/testdata/d2oracle/TestMove/nested_reserved_3.exp.json +++ b/testdata/d2oracle/TestMove/nested_reserved_3.exp.json @@ -196,9 +196,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -287,9 +285,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -376,9 +372,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -423,9 +417,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -501,9 +493,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/nhooyr_one.exp.json b/testdata/d2oracle/TestMove/nhooyr_one.exp.json index 59cd0e06b..d66f6960c 100644 --- a/testdata/d2oracle/TestMove/nhooyr_one.exp.json +++ b/testdata/d2oracle/TestMove/nhooyr_one.exp.json @@ -130,9 +130,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -179,9 +177,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -226,9 +222,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -273,9 +267,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -320,9 +312,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/nhooyr_two.exp.json b/testdata/d2oracle/TestMove/nhooyr_two.exp.json index 4cb5a41cc..63cde5566 100644 --- a/testdata/d2oracle/TestMove/nhooyr_two.exp.json +++ b/testdata/d2oracle/TestMove/nhooyr_two.exp.json @@ -176,9 +176,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -209,9 +207,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -258,9 +254,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -305,9 +299,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -352,9 +344,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -399,9 +389,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -446,9 +434,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -493,9 +479,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/out_of_newline_container.exp.json b/testdata/d2oracle/TestMove/out_of_newline_container.exp.json index b4979b03d..406266d42 100644 --- a/testdata/d2oracle/TestMove/out_of_newline_container.exp.json +++ b/testdata/d2oracle/TestMove/out_of_newline_container.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -121,9 +119,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -168,9 +164,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/parentheses.exp.json b/testdata/d2oracle/TestMove/parentheses.exp.json index f24b66fa8..8550114db 100644 --- a/testdata/d2oracle/TestMove/parentheses.exp.json +++ b/testdata/d2oracle/TestMove/parentheses.exp.json @@ -111,9 +111,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -144,9 +142,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -193,9 +189,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -271,9 +265,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -329,9 +321,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/partial_edge_slice.exp.json b/testdata/d2oracle/TestMove/partial_edge_slice.exp.json index 581b66537..25c508d64 100644 --- a/testdata/d2oracle/TestMove/partial_edge_slice.exp.json +++ b/testdata/d2oracle/TestMove/partial_edge_slice.exp.json @@ -118,9 +118,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -151,9 +149,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -200,9 +196,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -267,9 +261,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -314,9 +306,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/partial_slice.exp.json b/testdata/d2oracle/TestMove/partial_slice.exp.json index b2ff45583..adc1a450c 100644 --- a/testdata/d2oracle/TestMove/partial_slice.exp.json +++ b/testdata/d2oracle/TestMove/partial_slice.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -121,9 +119,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -168,9 +164,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/rename_2.exp.json b/testdata/d2oracle/TestMove/rename_2.exp.json index c998f5188..4d9afd231 100644 --- a/testdata/d2oracle/TestMove/rename_2.exp.json +++ b/testdata/d2oracle/TestMove/rename_2.exp.json @@ -147,9 +147,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -196,9 +194,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -243,9 +239,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -290,9 +284,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -337,9 +329,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -384,9 +374,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/reuse_map.exp.json b/testdata/d2oracle/TestMove/reuse_map.exp.json index 4913ec646..d50ff4940 100644 --- a/testdata/d2oracle/TestMove/reuse_map.exp.json +++ b/testdata/d2oracle/TestMove/reuse_map.exp.json @@ -164,9 +164,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -213,9 +211,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -291,9 +287,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -338,9 +332,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -385,9 +377,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -443,9 +433,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/slice_style.exp.json b/testdata/d2oracle/TestMove/slice_style.exp.json index 143be025c..ab093f083 100644 --- a/testdata/d2oracle/TestMove/slice_style.exp.json +++ b/testdata/d2oracle/TestMove/slice_style.exp.json @@ -139,9 +139,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -208,9 +206,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -299,9 +295,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/underscore-connection.exp.json b/testdata/d2oracle/TestMove/underscore-connection.exp.json index 2fb89411a..f81f9c5ed 100644 --- a/testdata/d2oracle/TestMove/underscore-connection.exp.json +++ b/testdata/d2oracle/TestMove/underscore-connection.exp.json @@ -220,9 +220,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -253,9 +251,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -302,9 +298,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -433,9 +427,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -522,9 +514,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -611,9 +601,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/underscore_children.exp.json b/testdata/d2oracle/TestMove/underscore_children.exp.json index 34035e86c..e12a60427 100644 --- a/testdata/d2oracle/TestMove/underscore_children.exp.json +++ b/testdata/d2oracle/TestMove/underscore_children.exp.json @@ -112,9 +112,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -161,9 +159,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -239,9 +235,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/underscore_edge_children.exp.json b/testdata/d2oracle/TestMove/underscore_edge_children.exp.json index eaa941d03..46e2770bf 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_children.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_children.exp.json @@ -135,9 +135,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -168,9 +166,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -217,9 +213,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -295,9 +289,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -342,9 +334,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json index 2deaee517..6bba37216 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json @@ -101,9 +101,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -134,9 +132,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -183,9 +179,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -230,9 +224,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -277,9 +269,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json index 502a6ae7f..dee3bfa4f 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json @@ -112,9 +112,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -145,9 +143,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -194,9 +190,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -272,9 +266,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -330,9 +322,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json index c9d972e26..bb22351f3 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json @@ -112,9 +112,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -145,9 +143,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -194,9 +190,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -252,9 +246,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -299,9 +291,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json index c90c19765..136ceb6ed 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json @@ -101,9 +101,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -134,9 +132,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -183,9 +179,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -230,9 +224,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -277,9 +269,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json index 14a1fee58..ccbc2ac18 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json @@ -134,9 +134,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -167,9 +165,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -216,9 +212,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -316,9 +310,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -385,9 +377,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_6.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_6.exp.json index d8fc3cf89..a21e3fdcd 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_6.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_6.exp.json @@ -123,9 +123,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -156,9 +154,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -205,9 +201,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -294,9 +288,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -352,9 +344,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -410,9 +400,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/underscore_edge_split.exp.json b/testdata/d2oracle/TestMove/underscore_edge_split.exp.json index 99b9b1abe..340a9f227 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_split.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_split.exp.json @@ -164,9 +164,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -197,9 +195,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -246,9 +242,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -293,9 +287,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -351,9 +343,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -398,9 +388,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -445,9 +433,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/underscore_merge.exp.json b/testdata/d2oracle/TestMove/underscore_merge.exp.json index 6c3414052..853d19030 100644 --- a/testdata/d2oracle/TestMove/underscore_merge.exp.json +++ b/testdata/d2oracle/TestMove/underscore_merge.exp.json @@ -144,9 +144,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -193,9 +191,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -240,9 +236,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -307,9 +301,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/underscore_split.exp.json b/testdata/d2oracle/TestMove/underscore_split.exp.json index e190dfd0e..46394f97a 100644 --- a/testdata/d2oracle/TestMove/underscore_split.exp.json +++ b/testdata/d2oracle/TestMove/underscore_split.exp.json @@ -141,9 +141,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -190,9 +188,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -237,9 +233,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -295,9 +289,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -342,9 +334,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/underscore_split_out.exp.json b/testdata/d2oracle/TestMove/underscore_split_out.exp.json index 2656b7b49..502f2ad3b 100644 --- a/testdata/d2oracle/TestMove/underscore_split_out.exp.json +++ b/testdata/d2oracle/TestMove/underscore_split_out.exp.json @@ -199,9 +199,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -248,9 +246,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -295,9 +291,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -373,9 +367,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -420,9 +412,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -467,9 +457,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/underscore_transplant.exp.json b/testdata/d2oracle/TestMove/underscore_transplant.exp.json index 1c92d49c1..3f94db4a3 100644 --- a/testdata/d2oracle/TestMove/underscore_transplant.exp.json +++ b/testdata/d2oracle/TestMove/underscore_transplant.exp.json @@ -101,9 +101,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -150,9 +148,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -197,9 +193,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -244,9 +238,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/unique_name.exp.json b/testdata/d2oracle/TestMove/unique_name.exp.json index 7f676ea29..db79c3a90 100644 --- a/testdata/d2oracle/TestMove/unique_name.exp.json +++ b/testdata/d2oracle/TestMove/unique_name.exp.json @@ -158,9 +158,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -238,9 +236,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -316,9 +312,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -363,9 +357,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -410,9 +402,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/unique_name_with_references.exp.json b/testdata/d2oracle/TestMove/unique_name_with_references.exp.json index 37085ae05..49a87a9a0 100644 --- a/testdata/d2oracle/TestMove/unique_name_with_references.exp.json +++ b/testdata/d2oracle/TestMove/unique_name_with_references.exp.json @@ -181,9 +181,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -214,9 +212,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -294,9 +290,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -341,9 +335,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -419,9 +411,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -466,9 +456,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -513,9 +501,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestReconnectEdge/basic.exp.json b/testdata/d2oracle/TestReconnectEdge/basic.exp.json index de1448f24..8d1d03e08 100644 --- a/testdata/d2oracle/TestReconnectEdge/basic.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/basic.exp.json @@ -141,9 +141,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -174,9 +172,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -243,9 +239,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -290,9 +284,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -357,9 +349,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestReconnectEdge/both.exp.json b/testdata/d2oracle/TestReconnectEdge/both.exp.json index a0576bd06..8350d974a 100644 --- a/testdata/d2oracle/TestReconnectEdge/both.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/both.exp.json @@ -141,9 +141,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -174,9 +172,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -243,9 +239,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -310,9 +304,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -357,9 +349,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestReconnectEdge/contained.exp.json b/testdata/d2oracle/TestReconnectEdge/contained.exp.json index e8dc7cb8c..96fc260b0 100644 --- a/testdata/d2oracle/TestReconnectEdge/contained.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/contained.exp.json @@ -162,9 +162,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -195,9 +193,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -348,9 +344,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -406,9 +400,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -495,9 +487,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -553,9 +543,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestReconnectEdge/in_chain_3.exp.json b/testdata/d2oracle/TestReconnectEdge/in_chain_3.exp.json index 4ce97de19..bf08c88b8 100644 --- a/testdata/d2oracle/TestReconnectEdge/in_chain_3.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/in_chain_3.exp.json @@ -155,9 +155,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -188,9 +186,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -220,9 +216,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -252,9 +246,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -301,9 +293,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -388,9 +378,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -455,9 +443,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestReconnectEdge/in_chain_4.exp.json b/testdata/d2oracle/TestReconnectEdge/in_chain_4.exp.json index 95dca10fa..4d3111d03 100644 --- a/testdata/d2oracle/TestReconnectEdge/in_chain_4.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/in_chain_4.exp.json @@ -178,9 +178,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -211,9 +209,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -243,9 +239,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -275,9 +269,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -344,9 +336,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -431,9 +421,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -498,9 +486,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestReconnectEdge/indexed_ref.exp.json b/testdata/d2oracle/TestReconnectEdge/indexed_ref.exp.json index c0a19b4e2..02ecdaa4f 100644 --- a/testdata/d2oracle/TestReconnectEdge/indexed_ref.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/indexed_ref.exp.json @@ -206,9 +206,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -246,9 +244,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -315,9 +311,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -402,9 +396,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -449,9 +441,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestReconnectEdge/loop.exp.json b/testdata/d2oracle/TestReconnectEdge/loop.exp.json index ade8dc21c..e7470d3fd 100644 --- a/testdata/d2oracle/TestReconnectEdge/loop.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/loop.exp.json @@ -95,9 +95,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -128,9 +126,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -177,9 +173,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -244,9 +238,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestReconnectEdge/middle_chain.exp.json b/testdata/d2oracle/TestReconnectEdge/middle_chain.exp.json index cdf52c2c7..e43b962c7 100644 --- a/testdata/d2oracle/TestReconnectEdge/middle_chain.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/middle_chain.exp.json @@ -141,9 +141,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -174,9 +172,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -206,9 +202,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -255,9 +249,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -302,9 +294,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -349,9 +339,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -416,9 +404,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestReconnectEdge/middle_chain_both.exp.json b/testdata/d2oracle/TestReconnectEdge/middle_chain_both.exp.json index d7ae830db..72a5b6d19 100644 --- a/testdata/d2oracle/TestReconnectEdge/middle_chain_both.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/middle_chain_both.exp.json @@ -187,9 +187,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -220,9 +218,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -252,9 +248,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -284,9 +278,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -333,9 +325,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -380,9 +370,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -427,9 +415,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -474,9 +460,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -561,9 +545,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestReconnectEdge/middle_chain_first.exp.json b/testdata/d2oracle/TestReconnectEdge/middle_chain_first.exp.json index 98730392c..2ed26f0b5 100644 --- a/testdata/d2oracle/TestReconnectEdge/middle_chain_first.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/middle_chain_first.exp.json @@ -192,9 +192,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -225,9 +223,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -257,9 +253,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -289,9 +283,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -338,9 +330,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -405,9 +395,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -472,9 +460,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -539,9 +525,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -586,9 +570,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestReconnectEdge/middle_chain_last.exp.json b/testdata/d2oracle/TestReconnectEdge/middle_chain_last.exp.json index 4eeebb991..da052e0f4 100644 --- a/testdata/d2oracle/TestReconnectEdge/middle_chain_last.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/middle_chain_last.exp.json @@ -192,9 +192,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -225,9 +223,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -257,9 +253,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -289,9 +283,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -338,9 +330,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -405,9 +395,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -472,9 +460,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -539,9 +525,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -586,9 +570,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestReconnectEdge/middle_chain_src.exp.json b/testdata/d2oracle/TestReconnectEdge/middle_chain_src.exp.json index f34d227e4..23eec563f 100644 --- a/testdata/d2oracle/TestReconnectEdge/middle_chain_src.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/middle_chain_src.exp.json @@ -141,9 +141,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -174,9 +172,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -206,9 +202,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -255,9 +249,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -302,9 +294,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -369,9 +359,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -416,9 +404,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestReconnectEdge/preserve_old_obj.exp.json b/testdata/d2oracle/TestReconnectEdge/preserve_old_obj.exp.json index f8bff7817..aef393151 100644 --- a/testdata/d2oracle/TestReconnectEdge/preserve_old_obj.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/preserve_old_obj.exp.json @@ -206,9 +206,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -246,9 +244,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -315,9 +311,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -402,9 +396,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -449,9 +441,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestReconnectEdge/reverse.exp.json b/testdata/d2oracle/TestReconnectEdge/reverse.exp.json index 75faa2ad7..601d36ca8 100644 --- a/testdata/d2oracle/TestReconnectEdge/reverse.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/reverse.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -105,9 +103,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -154,9 +150,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -201,9 +195,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestReconnectEdge/scope_inner.exp.json b/testdata/d2oracle/TestReconnectEdge/scope_inner.exp.json index ecc1c84f4..ad4056545 100644 --- a/testdata/d2oracle/TestReconnectEdge/scope_inner.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/scope_inner.exp.json @@ -187,9 +187,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -220,9 +218,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -269,9 +265,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -316,9 +310,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -394,9 +386,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -472,9 +462,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -519,9 +507,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestReconnectEdge/scope_outer.exp.json b/testdata/d2oracle/TestReconnectEdge/scope_outer.exp.json index a80bd4e6a..3d9a2adf5 100644 --- a/testdata/d2oracle/TestReconnectEdge/scope_outer.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/scope_outer.exp.json @@ -158,9 +158,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -191,9 +189,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -240,9 +236,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -287,9 +281,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -365,9 +357,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -412,9 +402,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestReconnectEdge/second_index.exp.json b/testdata/d2oracle/TestReconnectEdge/second_index.exp.json index 0e31d4886..325e30cd8 100644 --- a/testdata/d2oracle/TestReconnectEdge/second_index.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/second_index.exp.json @@ -241,9 +241,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -278,9 +276,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -314,9 +310,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -383,9 +377,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -430,9 +422,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -497,9 +487,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestReconnectEdge/src.exp.json b/testdata/d2oracle/TestReconnectEdge/src.exp.json index c7177e566..9dfbcdefe 100644 --- a/testdata/d2oracle/TestReconnectEdge/src.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/src.exp.json @@ -141,9 +141,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -174,9 +172,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -223,9 +219,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -290,9 +284,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -357,9 +349,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestRename/arrows.exp.json b/testdata/d2oracle/TestRename/arrows.exp.json index 067a3c7c0..a21353e07 100644 --- a/testdata/d2oracle/TestRename/arrows.exp.json +++ b/testdata/d2oracle/TestRename/arrows.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -105,9 +103,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -154,9 +150,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -201,9 +195,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestRename/arrows_chain.exp.json b/testdata/d2oracle/TestRename/arrows_chain.exp.json index 379f15249..f3ccd7a27 100644 --- a/testdata/d2oracle/TestRename/arrows_chain.exp.json +++ b/testdata/d2oracle/TestRename/arrows_chain.exp.json @@ -146,9 +146,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -179,9 +177,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -211,9 +207,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -243,9 +237,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -292,9 +284,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -359,9 +349,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -426,9 +414,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -473,9 +459,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestRename/arrows_complex.exp.json b/testdata/d2oracle/TestRename/arrows_complex.exp.json index 6cca60a8d..9d5616878 100644 --- a/testdata/d2oracle/TestRename/arrows_complex.exp.json +++ b/testdata/d2oracle/TestRename/arrows_complex.exp.json @@ -126,9 +126,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -159,9 +157,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -219,9 +215,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -277,9 +271,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -324,9 +316,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -371,9 +361,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestRename/arrows_trim_common.exp.json b/testdata/d2oracle/TestRename/arrows_trim_common.exp.json index 29de1a2e5..eb75e2e55 100644 --- a/testdata/d2oracle/TestRename/arrows_trim_common.exp.json +++ b/testdata/d2oracle/TestRename/arrows_trim_common.exp.json @@ -162,9 +162,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -195,9 +193,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -227,9 +223,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -259,9 +253,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -308,9 +300,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -355,9 +345,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -422,9 +410,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -489,9 +475,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -536,9 +520,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json b/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json index 66322ba2c..ab086e248 100644 --- a/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json +++ b/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json @@ -212,9 +212,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -245,9 +243,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -277,9 +273,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -309,9 +303,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -524,9 +516,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -582,9 +572,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -671,9 +659,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -760,9 +746,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -818,9 +802,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestRename/complex_edge_1.exp.json b/testdata/d2oracle/TestRename/complex_edge_1.exp.json index d86bd9aa6..3446d9da4 100644 --- a/testdata/d2oracle/TestRename/complex_edge_1.exp.json +++ b/testdata/d2oracle/TestRename/complex_edge_1.exp.json @@ -126,9 +126,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -159,9 +157,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -219,9 +215,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -277,9 +271,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -324,9 +316,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -371,9 +361,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestRename/complex_edge_2.exp.json b/testdata/d2oracle/TestRename/complex_edge_2.exp.json index 214be7198..43ca3dd0d 100644 --- a/testdata/d2oracle/TestRename/complex_edge_2.exp.json +++ b/testdata/d2oracle/TestRename/complex_edge_2.exp.json @@ -126,9 +126,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -159,9 +157,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -219,9 +215,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -277,9 +271,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -324,9 +316,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -371,9 +361,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestRename/conflict.exp.json b/testdata/d2oracle/TestRename/conflict.exp.json index bda1da047..c882e1f56 100644 --- a/testdata/d2oracle/TestRename/conflict.exp.json +++ b/testdata/d2oracle/TestRename/conflict.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -121,9 +119,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -168,9 +164,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestRename/conflict_2.exp.json b/testdata/d2oracle/TestRename/conflict_2.exp.json index dd888cf03..3fbd503aa 100644 --- a/testdata/d2oracle/TestRename/conflict_2.exp.json +++ b/testdata/d2oracle/TestRename/conflict_2.exp.json @@ -123,9 +123,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -194,9 +192,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -263,9 +259,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -332,9 +326,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -379,9 +371,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -426,9 +416,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestRename/conflict_with_dots.exp.json b/testdata/d2oracle/TestRename/conflict_with_dots.exp.json index 09834764a..229aff72e 100644 --- a/testdata/d2oracle/TestRename/conflict_with_dots.exp.json +++ b/testdata/d2oracle/TestRename/conflict_with_dots.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -121,9 +119,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -168,9 +164,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestRename/conflict_with_numbers.exp.json b/testdata/d2oracle/TestRename/conflict_with_numbers.exp.json index 73c080df8..85b87e0db 100644 --- a/testdata/d2oracle/TestRename/conflict_with_numbers.exp.json +++ b/testdata/d2oracle/TestRename/conflict_with_numbers.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -121,9 +119,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -168,9 +164,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestRename/container.exp.json b/testdata/d2oracle/TestRename/container.exp.json index 9b29a3155..4ec0b8557 100644 --- a/testdata/d2oracle/TestRename/container.exp.json +++ b/testdata/d2oracle/TestRename/container.exp.json @@ -751,9 +751,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -787,9 +785,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -819,9 +815,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -851,9 +845,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -883,9 +875,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -915,9 +905,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -947,9 +935,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -979,9 +965,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -1269,9 +1253,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1557,9 +1539,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1834,9 +1814,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1954,9 +1932,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -2074,9 +2050,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -2163,9 +2137,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -2252,9 +2224,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -2299,9 +2269,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -2366,9 +2334,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -2413,9 +2379,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -2460,9 +2424,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -2529,9 +2491,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -2598,9 +2558,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -2667,9 +2625,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -2725,9 +2681,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -2783,9 +2737,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestRename/edges.exp.json b/testdata/d2oracle/TestRename/edges.exp.json index 40be42dcf..cb92db67d 100644 --- a/testdata/d2oracle/TestRename/edges.exp.json +++ b/testdata/d2oracle/TestRename/edges.exp.json @@ -416,9 +416,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -449,9 +447,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -481,9 +477,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -513,9 +507,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -545,9 +537,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -577,9 +567,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -609,9 +597,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -782,9 +768,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -973,9 +957,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1062,9 +1044,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1151,9 +1131,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1240,9 +1218,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1329,9 +1305,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1376,9 +1350,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1443,9 +1415,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestRename/flat.exp.json b/testdata/d2oracle/TestRename/flat.exp.json index f8921a5c2..028991927 100644 --- a/testdata/d2oracle/TestRename/flat.exp.json +++ b/testdata/d2oracle/TestRename/flat.exp.json @@ -49,9 +49,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -98,9 +96,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestRename/generated-conflict.exp.json b/testdata/d2oracle/TestRename/generated-conflict.exp.json index 9e3866c39..c47aae643 100644 --- a/testdata/d2oracle/TestRename/generated-conflict.exp.json +++ b/testdata/d2oracle/TestRename/generated-conflict.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -121,9 +119,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -168,9 +164,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestRename/generated.exp.json b/testdata/d2oracle/TestRename/generated.exp.json index 443c2a35e..7d2554939 100644 --- a/testdata/d2oracle/TestRename/generated.exp.json +++ b/testdata/d2oracle/TestRename/generated.exp.json @@ -49,9 +49,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -98,9 +96,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestRename/near.exp.json b/testdata/d2oracle/TestRename/near.exp.json index 13468f6f7..50bf9b91d 100644 --- a/testdata/d2oracle/TestRename/near.exp.json +++ b/testdata/d2oracle/TestRename/near.exp.json @@ -111,9 +111,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -175,9 +173,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -222,9 +218,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestRename/nested.exp.json b/testdata/d2oracle/TestRename/nested.exp.json index 710fc49b7..9fde64d16 100644 --- a/testdata/d2oracle/TestRename/nested.exp.json +++ b/testdata/d2oracle/TestRename/nested.exp.json @@ -178,9 +178,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -324,9 +322,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -468,9 +464,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -612,9 +606,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -756,9 +748,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -867,9 +857,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/base.exp.json b/testdata/d2oracle/TestSet/base.exp.json index f7f02cc90..18dbe52f0 100644 --- a/testdata/d2oracle/TestSet/base.exp.json +++ b/testdata/d2oracle/TestSet/base.exp.json @@ -49,9 +49,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -98,9 +96,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/block_string_multiline.exp.json b/testdata/d2oracle/TestSet/block_string_multiline.exp.json index 700fc13d6..b42981de5 100644 --- a/testdata/d2oracle/TestSet/block_string_multiline.exp.json +++ b/testdata/d2oracle/TestSet/block_string_multiline.exp.json @@ -56,9 +56,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -106,9 +104,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/block_string_oneline.exp.json b/testdata/d2oracle/TestSet/block_string_oneline.exp.json index 4e6c158d4..2324b55be 100644 --- a/testdata/d2oracle/TestSet/block_string_oneline.exp.json +++ b/testdata/d2oracle/TestSet/block_string_oneline.exp.json @@ -56,9 +56,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -106,9 +104,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/classes-style.exp.json b/testdata/d2oracle/TestSet/classes-style.exp.json index 7606c8653..bd8c593c8 100644 --- a/testdata/d2oracle/TestSet/classes-style.exp.json +++ b/testdata/d2oracle/TestSet/classes-style.exp.json @@ -227,9 +227,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -333,9 +331,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - }, + "constraint": null, "classes": [ "a" ] diff --git a/testdata/d2oracle/TestSet/dupe-classes-style.exp.json b/testdata/d2oracle/TestSet/dupe-classes-style.exp.json index 50a62f7bf..04d724c19 100644 --- a/testdata/d2oracle/TestSet/dupe-classes-style.exp.json +++ b/testdata/d2oracle/TestSet/dupe-classes-style.exp.json @@ -227,9 +227,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -333,9 +331,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - }, + "constraint": null, "classes": [ "a" ] diff --git a/testdata/d2oracle/TestSet/edge.exp.json b/testdata/d2oracle/TestSet/edge.exp.json index 8df095e63..f9568af91 100644 --- a/testdata/d2oracle/TestSet/edge.exp.json +++ b/testdata/d2oracle/TestSet/edge.exp.json @@ -82,9 +82,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -115,9 +113,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -164,9 +160,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -211,9 +205,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/edge_append_style.exp.json b/testdata/d2oracle/TestSet/edge_append_style.exp.json index 9c0be60cd..7d1cd5940 100644 --- a/testdata/d2oracle/TestSet/edge_append_style.exp.json +++ b/testdata/d2oracle/TestSet/edge_append_style.exp.json @@ -117,9 +117,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -154,9 +152,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -203,9 +199,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -250,9 +244,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/edge_chain.exp.json b/testdata/d2oracle/TestSet/edge_chain.exp.json index 106987b19..1ab50e97c 100644 --- a/testdata/d2oracle/TestSet/edge_chain.exp.json +++ b/testdata/d2oracle/TestSet/edge_chain.exp.json @@ -209,9 +209,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -245,9 +243,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -277,9 +273,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -326,9 +320,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -393,9 +385,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -480,9 +470,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -527,9 +515,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json b/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json index c4288de67..193d30de7 100644 --- a/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json +++ b/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json @@ -192,9 +192,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -232,9 +230,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -264,9 +260,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -333,9 +327,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -420,9 +412,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -467,9 +457,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json b/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json index a4ddf5104..e688fa412 100644 --- a/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json +++ b/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json @@ -276,9 +276,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -309,9 +307,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -354,9 +350,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -403,9 +397,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -510,9 +502,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -597,9 +587,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json b/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json index 77f29a89f..e2bcb827e 100644 --- a/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json +++ b/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json @@ -232,9 +232,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -272,9 +270,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -304,9 +300,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -353,9 +347,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -420,9 +412,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -507,9 +497,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -554,9 +542,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.exp.json b/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.exp.json index 982c8f52f..fe8208050 100644 --- a/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.exp.json +++ b/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.exp.json @@ -197,9 +197,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -225,9 +223,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "references": [ { @@ -253,9 +249,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -285,9 +279,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -354,9 +346,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -441,9 +431,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -488,9 +476,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/edge_index_case.exp.json b/testdata/d2oracle/TestSet/edge_index_case.exp.json index 0ac79eff4..f7f5e5dbe 100644 --- a/testdata/d2oracle/TestSet/edge_index_case.exp.json +++ b/testdata/d2oracle/TestSet/edge_index_case.exp.json @@ -186,9 +186,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -219,9 +217,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -251,9 +247,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -300,9 +294,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -347,9 +339,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -394,9 +384,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -441,9 +429,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -488,9 +474,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -535,9 +519,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/edge_index_merge_style.exp.json b/testdata/d2oracle/TestSet/edge_index_merge_style.exp.json index 1cb85fb45..c9a5de043 100644 --- a/testdata/d2oracle/TestSet/edge_index_merge_style.exp.json +++ b/testdata/d2oracle/TestSet/edge_index_merge_style.exp.json @@ -193,9 +193,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -233,9 +231,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -265,9 +261,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -334,9 +328,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -421,9 +413,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -468,9 +458,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/edge_index_nested.exp.json b/testdata/d2oracle/TestSet/edge_index_nested.exp.json index f1aa1ad6c..a26d823aa 100644 --- a/testdata/d2oracle/TestSet/edge_index_nested.exp.json +++ b/testdata/d2oracle/TestSet/edge_index_nested.exp.json @@ -111,9 +111,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -144,9 +142,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -193,9 +189,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -240,9 +234,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -287,9 +279,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/edge_key_and_key.exp.json b/testdata/d2oracle/TestSet/edge_key_and_key.exp.json index dcc248bb9..a3a7b1cac 100644 --- a/testdata/d2oracle/TestSet/edge_key_and_key.exp.json +++ b/testdata/d2oracle/TestSet/edge_key_and_key.exp.json @@ -162,9 +162,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -199,9 +197,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -310,9 +306,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -368,9 +362,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -426,9 +418,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/edge_label.exp.json b/testdata/d2oracle/TestSet/edge_label.exp.json index e7649247a..1d4e28f4d 100644 --- a/testdata/d2oracle/TestSet/edge_label.exp.json +++ b/testdata/d2oracle/TestSet/edge_label.exp.json @@ -127,9 +127,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -164,9 +162,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -213,9 +209,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -260,9 +254,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/edge_merge_arrowhead.exp.json b/testdata/d2oracle/TestSet/edge_merge_arrowhead.exp.json index 0fbdc6921..c99a09b74 100644 --- a/testdata/d2oracle/TestSet/edge_merge_arrowhead.exp.json +++ b/testdata/d2oracle/TestSet/edge_merge_arrowhead.exp.json @@ -169,9 +169,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -197,9 +195,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "references": [ { @@ -222,9 +218,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -271,9 +265,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -318,9 +310,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/edge_merge_style.exp.json b/testdata/d2oracle/TestSet/edge_merge_style.exp.json index d74f7c436..c0877a17c 100644 --- a/testdata/d2oracle/TestSet/edge_merge_style.exp.json +++ b/testdata/d2oracle/TestSet/edge_merge_style.exp.json @@ -164,9 +164,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -204,9 +202,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -253,9 +249,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -300,9 +294,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json b/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json index 19305fea6..db265b1bc 100644 --- a/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json +++ b/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json @@ -111,9 +111,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -144,9 +142,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -193,9 +189,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -240,9 +234,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -287,9 +279,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json b/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json index 848b41a6b..031574600 100644 --- a/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json +++ b/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json @@ -157,9 +157,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -194,9 +192,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -243,9 +239,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -290,9 +284,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -337,9 +329,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/edge_replace_arrowhead.exp.json b/testdata/d2oracle/TestSet/edge_replace_arrowhead.exp.json index 07bc4b429..e0c481e61 100644 --- a/testdata/d2oracle/TestSet/edge_replace_arrowhead.exp.json +++ b/testdata/d2oracle/TestSet/edge_replace_arrowhead.exp.json @@ -122,9 +122,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -150,9 +148,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "references": [ { @@ -175,9 +171,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -224,9 +218,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -271,9 +263,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.exp.json b/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.exp.json index b08a28eb2..7b3b4168a 100644 --- a/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.exp.json +++ b/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.exp.json @@ -160,9 +160,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -188,9 +186,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "references": [ { @@ -216,9 +212,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -285,9 +279,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -352,9 +344,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/edge_set_arrowhead.exp.json b/testdata/d2oracle/TestSet/edge_set_arrowhead.exp.json index 628da4b0d..3ef4a43cb 100644 --- a/testdata/d2oracle/TestSet/edge_set_arrowhead.exp.json +++ b/testdata/d2oracle/TestSet/edge_set_arrowhead.exp.json @@ -122,9 +122,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -150,9 +148,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "references": [ { @@ -175,9 +171,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -224,9 +218,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -271,9 +263,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/expanded_map_style.exp.json b/testdata/d2oracle/TestSet/expanded_map_style.exp.json index 0ce80a7cf..eab037808 100644 --- a/testdata/d2oracle/TestSet/expanded_map_style.exp.json +++ b/testdata/d2oracle/TestSet/expanded_map_style.exp.json @@ -113,9 +113,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -166,9 +164,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/icon.exp.json b/testdata/d2oracle/TestSet/icon.exp.json index 529342cc8..1ccc50dfe 100644 --- a/testdata/d2oracle/TestSet/icon.exp.json +++ b/testdata/d2oracle/TestSet/icon.exp.json @@ -88,9 +88,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -150,9 +148,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/inline_style.exp.json b/testdata/d2oracle/TestSet/inline_style.exp.json index 25d9c3795..2d9c5fe49 100644 --- a/testdata/d2oracle/TestSet/inline_style.exp.json +++ b/testdata/d2oracle/TestSet/inline_style.exp.json @@ -139,9 +139,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -195,9 +193,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/label.exp.json b/testdata/d2oracle/TestSet/label.exp.json index c6f1534ec..b091d0d7e 100644 --- a/testdata/d2oracle/TestSet/label.exp.json +++ b/testdata/d2oracle/TestSet/label.exp.json @@ -59,9 +59,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -108,9 +106,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/label_primary.exp.json b/testdata/d2oracle/TestSet/label_primary.exp.json index a43045369..46e3130b2 100644 --- a/testdata/d2oracle/TestSet/label_primary.exp.json +++ b/testdata/d2oracle/TestSet/label_primary.exp.json @@ -107,9 +107,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -140,9 +138,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -189,9 +185,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -236,9 +230,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -283,9 +275,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/label_replace.exp.json b/testdata/d2oracle/TestSet/label_replace.exp.json index 81e138012..976aa222f 100644 --- a/testdata/d2oracle/TestSet/label_replace.exp.json +++ b/testdata/d2oracle/TestSet/label_replace.exp.json @@ -59,9 +59,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -108,9 +106,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/label_unset.exp.json b/testdata/d2oracle/TestSet/label_unset.exp.json index dc2d78f06..c1cd12102 100644 --- a/testdata/d2oracle/TestSet/label_unset.exp.json +++ b/testdata/d2oracle/TestSet/label_unset.exp.json @@ -49,9 +49,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -98,9 +96,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/map_key_missing.exp.json b/testdata/d2oracle/TestSet/map_key_missing.exp.json index 99d831ce6..e26a74490 100644 --- a/testdata/d2oracle/TestSet/map_key_missing.exp.json +++ b/testdata/d2oracle/TestSet/map_key_missing.exp.json @@ -105,9 +105,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -138,9 +136,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -207,9 +203,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -254,9 +248,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/nested_alex.exp.json b/testdata/d2oracle/TestSet/nested_alex.exp.json index a022a2076..4b51a18e3 100644 --- a/testdata/d2oracle/TestSet/nested_alex.exp.json +++ b/testdata/d2oracle/TestSet/nested_alex.exp.json @@ -177,9 +177,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -210,9 +208,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -259,9 +255,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -306,9 +300,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -373,9 +365,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/new_style.exp.json b/testdata/d2oracle/TestSet/new_style.exp.json index ca0879f88..79c6afd5d 100644 --- a/testdata/d2oracle/TestSet/new_style.exp.json +++ b/testdata/d2oracle/TestSet/new_style.exp.json @@ -95,9 +95,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -148,9 +146,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/replace_arrowhead.exp.json b/testdata/d2oracle/TestSet/replace_arrowhead.exp.json index eba63f5ee..51cc89c13 100644 --- a/testdata/d2oracle/TestSet/replace_arrowhead.exp.json +++ b/testdata/d2oracle/TestSet/replace_arrowhead.exp.json @@ -122,9 +122,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -150,9 +148,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "references": [ { @@ -175,9 +171,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -224,9 +218,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -271,9 +263,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/replace_arrowhead_map.exp.json b/testdata/d2oracle/TestSet/replace_arrowhead_map.exp.json index 466375933..600f2ae4b 100644 --- a/testdata/d2oracle/TestSet/replace_arrowhead_map.exp.json +++ b/testdata/d2oracle/TestSet/replace_arrowhead_map.exp.json @@ -140,9 +140,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -168,9 +166,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "references": [ { @@ -193,9 +189,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -242,9 +236,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -289,9 +281,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/replace_dimensions.exp.json b/testdata/d2oracle/TestSet/replace_dimensions.exp.json index b999b3e57..958b2baa9 100644 --- a/testdata/d2oracle/TestSet/replace_dimensions.exp.json +++ b/testdata/d2oracle/TestSet/replace_dimensions.exp.json @@ -84,9 +84,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -136,9 +134,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/replace_edge_style.exp.json b/testdata/d2oracle/TestSet/replace_edge_style.exp.json index a4de62e89..a8988ce51 100644 --- a/testdata/d2oracle/TestSet/replace_edge_style.exp.json +++ b/testdata/d2oracle/TestSet/replace_edge_style.exp.json @@ -158,9 +158,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -198,9 +196,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -247,9 +243,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -294,9 +288,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/replace_edge_style_map.exp.json b/testdata/d2oracle/TestSet/replace_edge_style_map.exp.json index aefa1e8f2..09dc780b2 100644 --- a/testdata/d2oracle/TestSet/replace_edge_style_map.exp.json +++ b/testdata/d2oracle/TestSet/replace_edge_style_map.exp.json @@ -136,9 +136,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -173,9 +171,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -222,9 +218,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -269,9 +263,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/replace_fill_pattern.exp.json b/testdata/d2oracle/TestSet/replace_fill_pattern.exp.json index c783b3862..876fd7eac 100644 --- a/testdata/d2oracle/TestSet/replace_fill_pattern.exp.json +++ b/testdata/d2oracle/TestSet/replace_fill_pattern.exp.json @@ -99,9 +99,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -152,9 +150,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/replace_link.exp.json b/testdata/d2oracle/TestSet/replace_link.exp.json index 24e0ad009..028881270 100644 --- a/testdata/d2oracle/TestSet/replace_link.exp.json +++ b/testdata/d2oracle/TestSet/replace_link.exp.json @@ -88,9 +88,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -140,9 +138,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/replace_position.exp.json b/testdata/d2oracle/TestSet/replace_position.exp.json index eb08e4668..e41ab8f9a 100644 --- a/testdata/d2oracle/TestSet/replace_position.exp.json +++ b/testdata/d2oracle/TestSet/replace_position.exp.json @@ -142,9 +142,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -200,9 +198,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/replace_shape.exp.json b/testdata/d2oracle/TestSet/replace_shape.exp.json index 93089429f..9fa391b04 100644 --- a/testdata/d2oracle/TestSet/replace_shape.exp.json +++ b/testdata/d2oracle/TestSet/replace_shape.exp.json @@ -70,9 +70,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -130,9 +128,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/replace_style.exp.json b/testdata/d2oracle/TestSet/replace_style.exp.json index 424697d3c..47a623194 100644 --- a/testdata/d2oracle/TestSet/replace_style.exp.json +++ b/testdata/d2oracle/TestSet/replace_style.exp.json @@ -77,9 +77,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -152,9 +150,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/replace_style_edgecase.exp.json b/testdata/d2oracle/TestSet/replace_style_edgecase.exp.json index 346ff1af8..197c9461b 100644 --- a/testdata/d2oracle/TestSet/replace_style_edgecase.exp.json +++ b/testdata/d2oracle/TestSet/replace_style_edgecase.exp.json @@ -132,9 +132,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -252,9 +250,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/replace_tooltip.exp.json b/testdata/d2oracle/TestSet/replace_tooltip.exp.json index a5d18437f..323a44945 100644 --- a/testdata/d2oracle/TestSet/replace_tooltip.exp.json +++ b/testdata/d2oracle/TestSet/replace_tooltip.exp.json @@ -88,9 +88,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -140,9 +138,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/set_dimensions.exp.json b/testdata/d2oracle/TestSet/set_dimensions.exp.json index adfb943b6..ee588adbb 100644 --- a/testdata/d2oracle/TestSet/set_dimensions.exp.json +++ b/testdata/d2oracle/TestSet/set_dimensions.exp.json @@ -84,9 +84,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -136,9 +134,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/set_fill_pattern.exp.json b/testdata/d2oracle/TestSet/set_fill_pattern.exp.json index 6984ebd04..3f1377fda 100644 --- a/testdata/d2oracle/TestSet/set_fill_pattern.exp.json +++ b/testdata/d2oracle/TestSet/set_fill_pattern.exp.json @@ -99,9 +99,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -152,9 +150,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/set_position.exp.json b/testdata/d2oracle/TestSet/set_position.exp.json index 5b0379637..7ae4b113f 100644 --- a/testdata/d2oracle/TestSet/set_position.exp.json +++ b/testdata/d2oracle/TestSet/set_position.exp.json @@ -84,9 +84,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -136,9 +134,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/set_tooltip.exp.json b/testdata/d2oracle/TestSet/set_tooltip.exp.json index ac8684a61..c8bc0b3b1 100644 --- a/testdata/d2oracle/TestSet/set_tooltip.exp.json +++ b/testdata/d2oracle/TestSet/set_tooltip.exp.json @@ -88,9 +88,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -140,9 +138,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/shape.exp.json b/testdata/d2oracle/TestSet/shape.exp.json index b972a20aa..96f6dc008 100644 --- a/testdata/d2oracle/TestSet/shape.exp.json +++ b/testdata/d2oracle/TestSet/shape.exp.json @@ -88,9 +88,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -137,9 +135,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/shape_nested_style_set.exp.json b/testdata/d2oracle/TestSet/shape_nested_style_set.exp.json index 301e3e04b..1b73a82ac 100644 --- a/testdata/d2oracle/TestSet/shape_nested_style_set.exp.json +++ b/testdata/d2oracle/TestSet/shape_nested_style_set.exp.json @@ -95,9 +95,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -148,9 +146,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/unapplied-classes-style-2.exp.json b/testdata/d2oracle/TestSet/unapplied-classes-style-2.exp.json index 9821f6bd4..cc1895eef 100644 --- a/testdata/d2oracle/TestSet/unapplied-classes-style-2.exp.json +++ b/testdata/d2oracle/TestSet/unapplied-classes-style-2.exp.json @@ -201,9 +201,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -254,9 +252,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/unapplied-classes-style.exp.json b/testdata/d2oracle/TestSet/unapplied-classes-style.exp.json index 003a21036..e8fb954b9 100644 --- a/testdata/d2oracle/TestSet/unapplied-classes-style.exp.json +++ b/testdata/d2oracle/TestSet/unapplied-classes-style.exp.json @@ -183,9 +183,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -258,9 +256,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } From 0ee9ce42419d586cb250ce28a23c83abe2b1cb0f Mon Sep 17 00:00:00 2001 From: satoqz Date: Sat, 3 Jun 2023 14:11:52 +0200 Subject: [PATCH 50/62] changelog entry --- ci/release/changelogs/next.md | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/release/changelogs/next.md b/ci/release/changelogs/next.md index d38d71c61..d328fe420 100644 --- a/ci/release/changelogs/next.md +++ b/ci/release/changelogs/next.md @@ -8,6 +8,7 @@ - Watch mode browser uses an error favicon to easily indicate compiler errors. Thanks @sinyo-matu ! [#1240](https://github.com/terrastruct/d2/pull/1240) - Improves grid layout performance when there are many similarly sized shapes. [#1315](https://github.com/terrastruct/d2/pull/1315) - Connections and labels now are adjusted for shapes with `3d` or `multiple`. [#1340](https://github.com/terrastruct/d2/pull/1340) +- `sql_table` now alternatively takes an array of constraints instead of being limited to a single one. [#1245](https://github.com/terrastruct/d2/pull/1245) #### Bugfixes ⛑️ From 24f48ee438de74cee8660fd3ecd73405b648ef61 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Sat, 3 Jun 2023 12:21:25 -0700 Subject: [PATCH 51/62] Update next.md --- ci/release/changelogs/next.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/release/changelogs/next.md b/ci/release/changelogs/next.md index d328fe420..872f4a7a3 100644 --- a/ci/release/changelogs/next.md +++ b/ci/release/changelogs/next.md @@ -8,7 +8,7 @@ - Watch mode browser uses an error favicon to easily indicate compiler errors. Thanks @sinyo-matu ! [#1240](https://github.com/terrastruct/d2/pull/1240) - Improves grid layout performance when there are many similarly sized shapes. [#1315](https://github.com/terrastruct/d2/pull/1315) - Connections and labels now are adjusted for shapes with `3d` or `multiple`. [#1340](https://github.com/terrastruct/d2/pull/1340) -- `sql_table` now alternatively takes an array of constraints instead of being limited to a single one. [#1245](https://github.com/terrastruct/d2/pull/1245) +- `sql_table` now alternatively takes an array of constraints instead of being limited to a single one. Thanks @satoqz ! [#1245](https://github.com/terrastruct/d2/pull/1245) #### Bugfixes ⛑️ From 4147c4506cf4cf3ebb5ed6869f9988f2d244f236 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Mon, 5 Jun 2023 11:33:34 -0700 Subject: [PATCH 52/62] tests --- d2graph/d2graph.go | 17 +- .../sketch.exp.svg | 162 ++++++------- .../testdata/sql_tables/sketch.exp.svg | 156 ++++++------ .../testdata/sql_tables_dark/sketch.exp.svg | 156 ++++++------ .../testdata/opacity/dark_theme.exp.svg | 2 +- .../testdata/sql_tables/dark_theme.exp.svg | 154 ++++++------ d2renderers/d2svg/table.go | 19 +- d2target/sqltable.go | 30 ++- .../TestCLI_E2E/internal_linked_pdf.exp.pdf | Bin 79993 -> 79993 bytes e2etests/stable_test.go | 10 + .../patterns/real-lines/dagre/board.exp.json | 12 +- .../patterns/real-lines/dagre/sketch.exp.svg | 168 ++++++------- .../dagre/sketch.exp.svg | 2 +- .../elk/sketch.exp.svg | 2 +- .../sql_table_overflow/dagre/board.exp.json | 2 +- .../sql_table_overflow/dagre/sketch.exp.svg | 154 ++++++------ .../sql_table_overflow/elk/board.exp.json | 2 +- .../sql_table_overflow/elk/sketch.exp.svg | 154 ++++++------ .../dagre/sketch.exp.svg | 2 +- .../elk/sketch.exp.svg | 2 +- .../dagre/board.exp.json | 8 +- .../dagre/sketch.exp.svg | 160 ++++++------ .../elk/board.exp.json | 8 +- .../elk/sketch.exp.svg | 160 ++++++------ .../stable/ent2d2_basic/dagre/board.exp.json | 146 +++++------ .../stable/ent2d2_basic/dagre/sketch.exp.svg | 174 ++++++------- .../stable/ent2d2_basic/elk/board.exp.json | 72 +++--- .../stable/ent2d2_basic/elk/sketch.exp.svg | 174 ++++++------- .../stable/ent2d2_right/dagre/board.exp.json | 110 ++++----- .../stable/ent2d2_right/dagre/sketch.exp.svg | 174 ++++++------- .../stable/ent2d2_right/elk/board.exp.json | 74 +++--- .../stable/ent2d2_right/elk/sketch.exp.svg | 174 ++++++------- .../dagre/sketch.exp.svg | 2 +- .../elk/sketch.exp.svg | 2 +- .../dagre/sketch.exp.svg | 2 +- .../elk/sketch.exp.svg | 2 +- .../dagre/board.exp.json | 228 +++++++++++++++++- .../dagre/sketch.exp.svg | 156 ++++++------ .../elk/board.exp.json | 228 +++++++++++++++++- .../elk/sketch.exp.svg | 156 ++++++------ .../dagre/sketch.exp.svg | 4 +- .../elk/sketch.exp.svg | 4 +- .../stable/sql_tables/dagre/board.exp.json | 36 +-- .../stable/sql_tables/dagre/sketch.exp.svg | 154 ++++++------ .../stable/sql_tables/elk/board.exp.json | 28 +-- .../stable/sql_tables/elk/sketch.exp.svg | 154 ++++++------ .../unnamed_only_height/dagre/sketch.exp.svg | 2 +- .../unnamed_only_height/elk/sketch.exp.svg | 2 +- .../unnamed_only_width/dagre/sketch.exp.svg | 2 +- .../unnamed_only_width/elk/sketch.exp.svg | 2 +- .../dagre/sketch.exp.svg | 2 +- .../elk/sketch.exp.svg | 2 +- .../themes/terminal/dagre/sketch.exp.svg | 2 +- .../themes/terminal/elk/sketch.exp.svg | 2 +- .../dagre/sketch.exp.svg | 2 +- .../shape_set_width_height/elk/sketch.exp.svg | 2 +- 56 files changed, 2120 insertions(+), 1696 deletions(-) diff --git a/d2graph/d2graph.go b/d2graph/d2graph.go index 5cccdaf07..3b481cc7d 100644 --- a/d2graph/d2graph.go +++ b/d2graph/d2graph.go @@ -1005,7 +1005,7 @@ func (obj *Object) GetDefaultSize(mtexts []*d2target.MText, ruler *textmeasure.R case d2target.ShapeSQLTable: maxNameWidth := 0 maxTypeWidth := 0 - constraintWidth := 0 + maxConstraintWidth := 0 colFontSize := d2fonts.FONT_SIZE_L if obj.Style.FontSize != nil { @@ -1032,23 +1032,24 @@ func (obj *Object) GetDefaultSize(mtexts []*d2target.MText, ruler *textmeasure.R } c.Type.LabelWidth = typeDims.Width c.Type.LabelHeight = typeDims.Height - if maxTypeWidth < typeDims.Width { - maxTypeWidth = typeDims.Width - } maxTypeWidth = go2.Max(maxTypeWidth, typeDims.Width) if l := len(c.Constraint); l > 0 { - // 60 covers UNQ constraint with padding, 40 for further constraints covers UNQ + comma + space - if newWidth := 60 + 40*(l-1); newWidth > constraintWidth { - constraintWidth = newWidth + constraintDims := GetTextDimensions(mtexts, ruler, ctexts[2], fontFamily) + if typeDims == nil { + return nil, fmt.Errorf("dimensions for sql_table constraint %#v not found", ctexts[2].Text) } + maxConstraintWidth = go2.Max(maxConstraintWidth, constraintDims.Width) } } // The rows get padded a little due to header font being larger than row font dims.Height = go2.Max(12, labelDims.Height*(len(obj.SQLTable.Columns)+1)) headerWidth := d2target.HeaderPadding + labelDims.Width + d2target.HeaderPadding - rowsWidth := d2target.NamePadding + maxNameWidth + d2target.TypePadding + maxTypeWidth + d2target.TypePadding + constraintWidth + rowsWidth := d2target.NamePadding + maxNameWidth + d2target.TypePadding + maxTypeWidth + d2target.TypePadding + maxConstraintWidth + if maxConstraintWidth != 0 { + rowsWidth += d2target.ConstraintPadding + } dims.Width = go2.Max(12, go2.Max(headerWidth, rowsWidth)) } diff --git a/d2renderers/d2sketch/testdata/class_and_sqlTable_border_radius/sketch.exp.svg b/d2renderers/d2sketch/testdata/class_and_sqlTable_border_radius/sketch.exp.svg index d7640b75f..19adf8d00 100644 --- a/d2renderers/d2sketch/testdata/class_and_sqlTable_border_radius/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/class_and_sqlTable_border_radius/sketch.exp.svg @@ -1,16 +1,16 @@ - + .d2-2607227077 .fill-N1{fill:#0A0F25;} + .d2-2607227077 .fill-N2{fill:#676C7E;} + .d2-2607227077 .fill-N3{fill:#9499AB;} + .d2-2607227077 .fill-N4{fill:#CFD2DD;} + .d2-2607227077 .fill-N5{fill:#DEE1EB;} + .d2-2607227077 .fill-N6{fill:#EEF1F8;} + .d2-2607227077 .fill-N7{fill:#FFFFFF;} + .d2-2607227077 .fill-B1{fill:#0D32B2;} + .d2-2607227077 .fill-B2{fill:#0D32B2;} + .d2-2607227077 .fill-B3{fill:#E3E9FD;} + .d2-2607227077 .fill-B4{fill:#E3E9FD;} + .d2-2607227077 .fill-B5{fill:#EDF0FD;} + .d2-2607227077 .fill-B6{fill:#F7F8FE;} + .d2-2607227077 .fill-AA2{fill:#4A6FF3;} + .d2-2607227077 .fill-AA4{fill:#EDF0FD;} + .d2-2607227077 .fill-AA5{fill:#F7F8FE;} + .d2-2607227077 .fill-AB4{fill:#EDF0FD;} + .d2-2607227077 .fill-AB5{fill:#F7F8FE;} + .d2-2607227077 .stroke-N1{stroke:#0A0F25;} + .d2-2607227077 .stroke-N2{stroke:#676C7E;} + .d2-2607227077 .stroke-N3{stroke:#9499AB;} + .d2-2607227077 .stroke-N4{stroke:#CFD2DD;} + .d2-2607227077 .stroke-N5{stroke:#DEE1EB;} + .d2-2607227077 .stroke-N6{stroke:#EEF1F8;} + .d2-2607227077 .stroke-N7{stroke:#FFFFFF;} + .d2-2607227077 .stroke-B1{stroke:#0D32B2;} + .d2-2607227077 .stroke-B2{stroke:#0D32B2;} + .d2-2607227077 .stroke-B3{stroke:#E3E9FD;} + .d2-2607227077 .stroke-B4{stroke:#E3E9FD;} + .d2-2607227077 .stroke-B5{stroke:#EDF0FD;} + .d2-2607227077 .stroke-B6{stroke:#F7F8FE;} + .d2-2607227077 .stroke-AA2{stroke:#4A6FF3;} + .d2-2607227077 .stroke-AA4{stroke:#EDF0FD;} + .d2-2607227077 .stroke-AA5{stroke:#F7F8FE;} + .d2-2607227077 .stroke-AB4{stroke:#EDF0FD;} + .d2-2607227077 .stroke-AB5{stroke:#F7F8FE;} + .d2-2607227077 .background-color-N1{background-color:#0A0F25;} + .d2-2607227077 .background-color-N2{background-color:#676C7E;} + .d2-2607227077 .background-color-N3{background-color:#9499AB;} + .d2-2607227077 .background-color-N4{background-color:#CFD2DD;} + .d2-2607227077 .background-color-N5{background-color:#DEE1EB;} + .d2-2607227077 .background-color-N6{background-color:#EEF1F8;} + .d2-2607227077 .background-color-N7{background-color:#FFFFFF;} + .d2-2607227077 .background-color-B1{background-color:#0D32B2;} + .d2-2607227077 .background-color-B2{background-color:#0D32B2;} + .d2-2607227077 .background-color-B3{background-color:#E3E9FD;} + .d2-2607227077 .background-color-B4{background-color:#E3E9FD;} + .d2-2607227077 .background-color-B5{background-color:#EDF0FD;} + .d2-2607227077 .background-color-B6{background-color:#F7F8FE;} + .d2-2607227077 .background-color-AA2{background-color:#4A6FF3;} + .d2-2607227077 .background-color-AA4{background-color:#EDF0FD;} + .d2-2607227077 .background-color-AA5{background-color:#F7F8FE;} + .d2-2607227077 .background-color-AB4{background-color:#EDF0FD;} + .d2-2607227077 .background-color-AB5{background-color:#F7F8FE;} + .d2-2607227077 .color-N1{color:#0A0F25;} + .d2-2607227077 .color-N2{color:#676C7E;} + .d2-2607227077 .color-N3{color:#9499AB;} + .d2-2607227077 .color-N4{color:#CFD2DD;} + .d2-2607227077 .color-N5{color:#DEE1EB;} + .d2-2607227077 .color-N6{color:#EEF1F8;} + .d2-2607227077 .color-N7{color:#FFFFFF;} + .d2-2607227077 .color-B1{color:#0D32B2;} + .d2-2607227077 .color-B2{color:#0D32B2;} + .d2-2607227077 .color-B3{color:#E3E9FD;} + .d2-2607227077 .color-B4{color:#E3E9FD;} + .d2-2607227077 .color-B5{color:#EDF0FD;} + .d2-2607227077 .color-B6{color:#F7F8FE;} + .d2-2607227077 .color-AA2{color:#4A6FF3;} + .d2-2607227077 .color-AA4{color:#EDF0FD;} + .d2-2607227077 .color-AA5{color:#F7F8FE;} + .d2-2607227077 .color-AB4{color:#EDF0FD;} + .d2-2607227077 .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}]]> @@ -112,7 +112,7 @@ -aidintPKdiskintFKjsonjsonbUNQlast_updatedtimestamp with time zoneb+field[]string+method(a uint64)(x, y int)cd - +aidintPKdiskintFKjsonjsonbUNQlast_updatedtimestamp with time zoneb+field[]string+method(a uint64)(x, y int)cd + \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/sql_tables/sketch.exp.svg b/d2renderers/d2sketch/testdata/sql_tables/sketch.exp.svg index 56ec37a37..d6929ac06 100644 --- a/d2renderers/d2sketch/testdata/sql_tables/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/sql_tables/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-4027692135 .fill-N1{fill:#0A0F25;} + .d2-4027692135 .fill-N2{fill:#676C7E;} + .d2-4027692135 .fill-N3{fill:#9499AB;} + .d2-4027692135 .fill-N4{fill:#CFD2DD;} + .d2-4027692135 .fill-N5{fill:#DEE1EB;} + .d2-4027692135 .fill-N6{fill:#EEF1F8;} + .d2-4027692135 .fill-N7{fill:#FFFFFF;} + .d2-4027692135 .fill-B1{fill:#0D32B2;} + .d2-4027692135 .fill-B2{fill:#0D32B2;} + .d2-4027692135 .fill-B3{fill:#E3E9FD;} + .d2-4027692135 .fill-B4{fill:#E3E9FD;} + .d2-4027692135 .fill-B5{fill:#EDF0FD;} + .d2-4027692135 .fill-B6{fill:#F7F8FE;} + .d2-4027692135 .fill-AA2{fill:#4A6FF3;} + .d2-4027692135 .fill-AA4{fill:#EDF0FD;} + .d2-4027692135 .fill-AA5{fill:#F7F8FE;} + .d2-4027692135 .fill-AB4{fill:#EDF0FD;} + .d2-4027692135 .fill-AB5{fill:#F7F8FE;} + .d2-4027692135 .stroke-N1{stroke:#0A0F25;} + .d2-4027692135 .stroke-N2{stroke:#676C7E;} + .d2-4027692135 .stroke-N3{stroke:#9499AB;} + .d2-4027692135 .stroke-N4{stroke:#CFD2DD;} + .d2-4027692135 .stroke-N5{stroke:#DEE1EB;} + .d2-4027692135 .stroke-N6{stroke:#EEF1F8;} + .d2-4027692135 .stroke-N7{stroke:#FFFFFF;} + .d2-4027692135 .stroke-B1{stroke:#0D32B2;} + .d2-4027692135 .stroke-B2{stroke:#0D32B2;} + .d2-4027692135 .stroke-B3{stroke:#E3E9FD;} + .d2-4027692135 .stroke-B4{stroke:#E3E9FD;} + .d2-4027692135 .stroke-B5{stroke:#EDF0FD;} + .d2-4027692135 .stroke-B6{stroke:#F7F8FE;} + .d2-4027692135 .stroke-AA2{stroke:#4A6FF3;} + .d2-4027692135 .stroke-AA4{stroke:#EDF0FD;} + .d2-4027692135 .stroke-AA5{stroke:#F7F8FE;} + .d2-4027692135 .stroke-AB4{stroke:#EDF0FD;} + .d2-4027692135 .stroke-AB5{stroke:#F7F8FE;} + .d2-4027692135 .background-color-N1{background-color:#0A0F25;} + .d2-4027692135 .background-color-N2{background-color:#676C7E;} + .d2-4027692135 .background-color-N3{background-color:#9499AB;} + .d2-4027692135 .background-color-N4{background-color:#CFD2DD;} + .d2-4027692135 .background-color-N5{background-color:#DEE1EB;} + .d2-4027692135 .background-color-N6{background-color:#EEF1F8;} + .d2-4027692135 .background-color-N7{background-color:#FFFFFF;} + .d2-4027692135 .background-color-B1{background-color:#0D32B2;} + .d2-4027692135 .background-color-B2{background-color:#0D32B2;} + .d2-4027692135 .background-color-B3{background-color:#E3E9FD;} + .d2-4027692135 .background-color-B4{background-color:#E3E9FD;} + .d2-4027692135 .background-color-B5{background-color:#EDF0FD;} + .d2-4027692135 .background-color-B6{background-color:#F7F8FE;} + .d2-4027692135 .background-color-AA2{background-color:#4A6FF3;} + .d2-4027692135 .background-color-AA4{background-color:#EDF0FD;} + .d2-4027692135 .background-color-AA5{background-color:#F7F8FE;} + .d2-4027692135 .background-color-AB4{background-color:#EDF0FD;} + .d2-4027692135 .background-color-AB5{background-color:#F7F8FE;} + .d2-4027692135 .color-N1{color:#0A0F25;} + .d2-4027692135 .color-N2{color:#676C7E;} + .d2-4027692135 .color-N3{color:#9499AB;} + .d2-4027692135 .color-N4{color:#CFD2DD;} + .d2-4027692135 .color-N5{color:#DEE1EB;} + .d2-4027692135 .color-N6{color:#EEF1F8;} + .d2-4027692135 .color-N7{color:#FFFFFF;} + .d2-4027692135 .color-B1{color:#0D32B2;} + .d2-4027692135 .color-B2{color:#0D32B2;} + .d2-4027692135 .color-B3{color:#E3E9FD;} + .d2-4027692135 .color-B4{color:#E3E9FD;} + .d2-4027692135 .color-B5{color:#EDF0FD;} + .d2-4027692135 .color-B6{color:#F7F8FE;} + .d2-4027692135 .color-AA2{color:#4A6FF3;} + .d2-4027692135 .color-AA4{color:#EDF0FD;} + .d2-4027692135 .color-AA5{color:#F7F8FE;} + .d2-4027692135 .color-AB4{color:#EDF0FD;} + .d2-4027692135 .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}]]> @@ -97,7 +97,7 @@ -usersidintnamestringemailstringpasswordstringlast_logindatetimeproductsidintpricedecimalskustringnamestringordersidintuser_idintproduct_idintshipmentsidintorder_idinttracking_numberstringPKstatusstring - +usersidintnamestringemailstringpasswordstringlast_logindatetimeproductsidintpricedecimalskustringnamestringordersidintuser_idintproduct_idintshipmentsidintorder_idinttracking_numberstringPKstatusstring + \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/sql_tables_dark/sketch.exp.svg b/d2renderers/d2sketch/testdata/sql_tables_dark/sketch.exp.svg index 5bcf0a0cf..7184cfd6c 100644 --- a/d2renderers/d2sketch/testdata/sql_tables_dark/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/sql_tables_dark/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-4027692135 .fill-N1{fill:#CDD6F4;} + .d2-4027692135 .fill-N2{fill:#BAC2DE;} + .d2-4027692135 .fill-N3{fill:#A6ADC8;} + .d2-4027692135 .fill-N4{fill:#585B70;} + .d2-4027692135 .fill-N5{fill:#45475A;} + .d2-4027692135 .fill-N6{fill:#313244;} + .d2-4027692135 .fill-N7{fill:#1E1E2E;} + .d2-4027692135 .fill-B1{fill:#CBA6f7;} + .d2-4027692135 .fill-B2{fill:#CBA6f7;} + .d2-4027692135 .fill-B3{fill:#6C7086;} + .d2-4027692135 .fill-B4{fill:#585B70;} + .d2-4027692135 .fill-B5{fill:#45475A;} + .d2-4027692135 .fill-B6{fill:#313244;} + .d2-4027692135 .fill-AA2{fill:#f38BA8;} + .d2-4027692135 .fill-AA4{fill:#45475A;} + .d2-4027692135 .fill-AA5{fill:#313244;} + .d2-4027692135 .fill-AB4{fill:#45475A;} + .d2-4027692135 .fill-AB5{fill:#313244;} + .d2-4027692135 .stroke-N1{stroke:#CDD6F4;} + .d2-4027692135 .stroke-N2{stroke:#BAC2DE;} + .d2-4027692135 .stroke-N3{stroke:#A6ADC8;} + .d2-4027692135 .stroke-N4{stroke:#585B70;} + .d2-4027692135 .stroke-N5{stroke:#45475A;} + .d2-4027692135 .stroke-N6{stroke:#313244;} + .d2-4027692135 .stroke-N7{stroke:#1E1E2E;} + .d2-4027692135 .stroke-B1{stroke:#CBA6f7;} + .d2-4027692135 .stroke-B2{stroke:#CBA6f7;} + .d2-4027692135 .stroke-B3{stroke:#6C7086;} + .d2-4027692135 .stroke-B4{stroke:#585B70;} + .d2-4027692135 .stroke-B5{stroke:#45475A;} + .d2-4027692135 .stroke-B6{stroke:#313244;} + .d2-4027692135 .stroke-AA2{stroke:#f38BA8;} + .d2-4027692135 .stroke-AA4{stroke:#45475A;} + .d2-4027692135 .stroke-AA5{stroke:#313244;} + .d2-4027692135 .stroke-AB4{stroke:#45475A;} + .d2-4027692135 .stroke-AB5{stroke:#313244;} + .d2-4027692135 .background-color-N1{background-color:#CDD6F4;} + .d2-4027692135 .background-color-N2{background-color:#BAC2DE;} + .d2-4027692135 .background-color-N3{background-color:#A6ADC8;} + .d2-4027692135 .background-color-N4{background-color:#585B70;} + .d2-4027692135 .background-color-N5{background-color:#45475A;} + .d2-4027692135 .background-color-N6{background-color:#313244;} + .d2-4027692135 .background-color-N7{background-color:#1E1E2E;} + .d2-4027692135 .background-color-B1{background-color:#CBA6f7;} + .d2-4027692135 .background-color-B2{background-color:#CBA6f7;} + .d2-4027692135 .background-color-B3{background-color:#6C7086;} + .d2-4027692135 .background-color-B4{background-color:#585B70;} + .d2-4027692135 .background-color-B5{background-color:#45475A;} + .d2-4027692135 .background-color-B6{background-color:#313244;} + .d2-4027692135 .background-color-AA2{background-color:#f38BA8;} + .d2-4027692135 .background-color-AA4{background-color:#45475A;} + .d2-4027692135 .background-color-AA5{background-color:#313244;} + .d2-4027692135 .background-color-AB4{background-color:#45475A;} + .d2-4027692135 .background-color-AB5{background-color:#313244;} + .d2-4027692135 .color-N1{color:#CDD6F4;} + .d2-4027692135 .color-N2{color:#BAC2DE;} + .d2-4027692135 .color-N3{color:#A6ADC8;} + .d2-4027692135 .color-N4{color:#585B70;} + .d2-4027692135 .color-N5{color:#45475A;} + .d2-4027692135 .color-N6{color:#313244;} + .d2-4027692135 .color-N7{color:#1E1E2E;} + .d2-4027692135 .color-B1{color:#CBA6f7;} + .d2-4027692135 .color-B2{color:#CBA6f7;} + .d2-4027692135 .color-B3{color:#6C7086;} + .d2-4027692135 .color-B4{color:#585B70;} + .d2-4027692135 .color-B5{color:#45475A;} + .d2-4027692135 .color-B6{color:#313244;} + .d2-4027692135 .color-AA2{color:#f38BA8;} + .d2-4027692135 .color-AA4{color:#45475A;} + .d2-4027692135 .color-AA5{color:#313244;} + .d2-4027692135 .color-AB4{color:#45475A;} + .d2-4027692135 .color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker);mix-blend-mode:lighten}.light-code{display: none}.dark-code{display: block}]]> -usersidintnamestringemailstringpasswordstringlast_logindatetimeproductsidintpricedecimalskustringnamestringordersidintuser_idintproduct_idintshipmentsidintorder_idinttracking_numberstringPKstatusstring - +usersidintnamestringemailstringpasswordstringlast_logindatetimeproductsidintpricedecimalskustringnamestringordersidintuser_idintproduct_idintshipmentsidintorder_idinttracking_numberstringPKstatusstring + \ No newline at end of file diff --git a/d2renderers/d2svg/dark_theme/testdata/opacity/dark_theme.exp.svg b/d2renderers/d2svg/dark_theme/testdata/opacity/dark_theme.exp.svg index 1a8b468be..e2c961242 100644 --- a/d2renderers/d2svg/dark_theme/testdata/opacity/dark_theme.exp.svg +++ b/d2renderers/d2svg/dark_theme/testdata/opacity/dark_theme.exp.svg @@ -844,7 +844,7 @@ margin: 0 -1.6em 0.25em 0.2em; } x

linux: because a PC is a terrible thing to waste

-
auserslast_logindatetime You don't have to know how the computer works,just how to work the computer. +
auserslast_logindatetime You don't have to know how the computer works,just how to work the computer. \ No newline at end of file diff --git a/d2renderers/d2svg/dark_theme/testdata/sql_tables/dark_theme.exp.svg b/d2renderers/d2svg/dark_theme/testdata/sql_tables/dark_theme.exp.svg index 8348b75ca..75cc29881 100644 --- a/d2renderers/d2svg/dark_theme/testdata/sql_tables/dark_theme.exp.svg +++ b/d2renderers/d2svg/dark_theme/testdata/sql_tables/dark_theme.exp.svg @@ -1,9 +1,9 @@ -usersidintnamestringemailstringpasswordstringlast_logindatetimeproductsidintpricedecimalskustringnamestringordersidintuser_idintproduct_idintshipmentsidintorder_idinttracking_numberstringPKstatusstring - + .d2-4027692135 .fill-N1{fill:#CDD6F4;} + .d2-4027692135 .fill-N2{fill:#BAC2DE;} + .d2-4027692135 .fill-N3{fill:#A6ADC8;} + .d2-4027692135 .fill-N4{fill:#585B70;} + .d2-4027692135 .fill-N5{fill:#45475A;} + .d2-4027692135 .fill-N6{fill:#313244;} + .d2-4027692135 .fill-N7{fill:#1E1E2E;} + .d2-4027692135 .fill-B1{fill:#CBA6f7;} + .d2-4027692135 .fill-B2{fill:#CBA6f7;} + .d2-4027692135 .fill-B3{fill:#6C7086;} + .d2-4027692135 .fill-B4{fill:#585B70;} + .d2-4027692135 .fill-B5{fill:#45475A;} + .d2-4027692135 .fill-B6{fill:#313244;} + .d2-4027692135 .fill-AA2{fill:#f38BA8;} + .d2-4027692135 .fill-AA4{fill:#45475A;} + .d2-4027692135 .fill-AA5{fill:#313244;} + .d2-4027692135 .fill-AB4{fill:#45475A;} + .d2-4027692135 .fill-AB5{fill:#313244;} + .d2-4027692135 .stroke-N1{stroke:#CDD6F4;} + .d2-4027692135 .stroke-N2{stroke:#BAC2DE;} + .d2-4027692135 .stroke-N3{stroke:#A6ADC8;} + .d2-4027692135 .stroke-N4{stroke:#585B70;} + .d2-4027692135 .stroke-N5{stroke:#45475A;} + .d2-4027692135 .stroke-N6{stroke:#313244;} + .d2-4027692135 .stroke-N7{stroke:#1E1E2E;} + .d2-4027692135 .stroke-B1{stroke:#CBA6f7;} + .d2-4027692135 .stroke-B2{stroke:#CBA6f7;} + .d2-4027692135 .stroke-B3{stroke:#6C7086;} + .d2-4027692135 .stroke-B4{stroke:#585B70;} + .d2-4027692135 .stroke-B5{stroke:#45475A;} + .d2-4027692135 .stroke-B6{stroke:#313244;} + .d2-4027692135 .stroke-AA2{stroke:#f38BA8;} + .d2-4027692135 .stroke-AA4{stroke:#45475A;} + .d2-4027692135 .stroke-AA5{stroke:#313244;} + .d2-4027692135 .stroke-AB4{stroke:#45475A;} + .d2-4027692135 .stroke-AB5{stroke:#313244;} + .d2-4027692135 .background-color-N1{background-color:#CDD6F4;} + .d2-4027692135 .background-color-N2{background-color:#BAC2DE;} + .d2-4027692135 .background-color-N3{background-color:#A6ADC8;} + .d2-4027692135 .background-color-N4{background-color:#585B70;} + .d2-4027692135 .background-color-N5{background-color:#45475A;} + .d2-4027692135 .background-color-N6{background-color:#313244;} + .d2-4027692135 .background-color-N7{background-color:#1E1E2E;} + .d2-4027692135 .background-color-B1{background-color:#CBA6f7;} + .d2-4027692135 .background-color-B2{background-color:#CBA6f7;} + .d2-4027692135 .background-color-B3{background-color:#6C7086;} + .d2-4027692135 .background-color-B4{background-color:#585B70;} + .d2-4027692135 .background-color-B5{background-color:#45475A;} + .d2-4027692135 .background-color-B6{background-color:#313244;} + .d2-4027692135 .background-color-AA2{background-color:#f38BA8;} + .d2-4027692135 .background-color-AA4{background-color:#45475A;} + .d2-4027692135 .background-color-AA5{background-color:#313244;} + .d2-4027692135 .background-color-AB4{background-color:#45475A;} + .d2-4027692135 .background-color-AB5{background-color:#313244;} + .d2-4027692135 .color-N1{color:#CDD6F4;} + .d2-4027692135 .color-N2{color:#BAC2DE;} + .d2-4027692135 .color-N3{color:#A6ADC8;} + .d2-4027692135 .color-N4{color:#585B70;} + .d2-4027692135 .color-N5{color:#45475A;} + .d2-4027692135 .color-N6{color:#313244;} + .d2-4027692135 .color-N7{color:#1E1E2E;} + .d2-4027692135 .color-B1{color:#CBA6f7;} + .d2-4027692135 .color-B2{color:#CBA6f7;} + .d2-4027692135 .color-B3{color:#6C7086;} + .d2-4027692135 .color-B4{color:#585B70;} + .d2-4027692135 .color-B5{color:#45475A;} + .d2-4027692135 .color-B6{color:#313244;} + .d2-4027692135 .color-AA2{color:#f38BA8;} + .d2-4027692135 .color-AA4{color:#45475A;} + .d2-4027692135 .color-AA5{color:#313244;} + .d2-4027692135 .color-AB4{color:#45475A;} + .d2-4027692135 .color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker);mix-blend-mode:lighten}.light-code{display: none}.dark-code{display: block}]]>usersidintnamestringemailstringpasswordstringlast_logindatetimeproductsidintpricedecimalskustringnamestringordersidintuser_idintproduct_idintshipmentsidintorder_idinttracking_numberstringPKstatusstring + \ No newline at end of file diff --git a/d2renderers/d2svg/table.go b/d2renderers/d2svg/table.go index 2707553c4..7192ed70a 100644 --- a/d2renderers/d2svg/table.go +++ b/d2renderers/d2svg/table.go @@ -74,18 +74,12 @@ func tableHeader(diagramHash string, shape d2target.Shape, box *geo.Box, text st return str } -func tableRow(shape d2target.Shape, box *geo.Box, nameText, typeText, constraintText string, fontSize, longestNameWidth float64) string { +func tableRow(shape d2target.Shape, box *geo.Box, nameText, typeText, constraintText string, fontSize, longestNameWidth, longestTypeWidth float64) string { // Row is made up of name, type, and constraint // e.g. | diagram int FK | nameTL := label.InsideMiddleLeft.GetPointOnBox( box, d2target.NamePadding, - box.Width, - fontSize, - ) - constraintTR := label.InsideMiddleRight.GetPointOnBox( - box, - d2target.TypePadding, 0, fontSize, ) @@ -99,15 +93,14 @@ func tableRow(shape d2target.Shape, box *geo.Box, nameText, typeText, constraint textEl.Content = svg.EscapeText(nameText) out := textEl.Render() - textEl.X = nameTL.X + longestNameWidth + 2*d2target.NamePadding + textEl.X += longestNameWidth + d2target.TypePadding textEl.Fill = shape.NeutralAccentColor textEl.Content = svg.EscapeText(typeText) out += textEl.Render() - textEl.X = constraintTR.X - textEl.Y = constraintTR.Y + fontSize*3/4 + textEl.X = box.TopLeft.X + (box.Width - d2target.NamePadding) textEl.Fill = shape.SecondaryAccentColor - textEl.Style = fmt.Sprintf("text-anchor:%s;font-size:%vpx;letter-spacing:2px", "end", fontSize) + textEl.Style = fmt.Sprintf("text-anchor:%s;font-size:%vpx", "end", fontSize) textEl.Content = constraintText out += textEl.Render() @@ -144,15 +137,17 @@ func drawTable(writer io.Writer, diagramHash string, targetShape d2target.Shape) ) var longestNameWidth int + var longestTypeWidth int for _, f := range targetShape.Columns { longestNameWidth = go2.Max(longestNameWidth, f.Name.LabelWidth) + longestTypeWidth = go2.Max(longestTypeWidth, f.Type.LabelWidth) } rowBox := geo.NewBox(box.TopLeft.Copy(), box.Width, rowHeight) rowBox.TopLeft.Y += headerBox.Height for idx, f := range targetShape.Columns { fmt.Fprint(writer, - tableRow(targetShape, rowBox, f.Name.Label, f.Type.Label, f.ConstraintAbbr(), float64(targetShape.FontSize), float64(longestNameWidth)), + tableRow(targetShape, rowBox, f.Name.Label, f.Type.Label, f.ConstraintAbbr(), float64(targetShape.FontSize), float64(longestNameWidth), float64(longestTypeWidth)), ) rowBox.TopLeft.Y += rowHeight diff --git a/d2target/sqltable.go b/d2target/sqltable.go index bfb1e45d9..3b5932351 100644 --- a/d2target/sqltable.go +++ b/d2target/sqltable.go @@ -3,9 +3,10 @@ package d2target import "strings" const ( - NamePadding = 10 - TypePadding = 20 - HeaderPadding = 10 + NamePadding = 10 + TypePadding = 20 + ConstraintPadding = 20 + HeaderPadding = 10 // Setting table font size sets it for columns // The header needs to be a little larger for visual hierarchy @@ -39,26 +40,31 @@ func (c SQLColumn) Texts(fontSize int) []*MText { IsItalic: false, Shape: "sql_table", }, + { + Text: c.ConstraintAbbr(), + FontSize: fontSize, + IsBold: false, + IsItalic: false, + Shape: "sql_table", + }, } } func (c SQLColumn) ConstraintAbbr() string { - var abbrs []string - - for _, constraint := range c.Constraint { - var abbr string + constraints := make([]string, len(c.Constraint)) + for i, constraint := range c.Constraint { switch constraint { case "primary_key": - abbr = "PK" + constraint = "PK" case "foreign_key": - abbr = "FK" + constraint = "FK" case "unique": - abbr = "UNQ" + constraint = "UNQ" } - abbrs = append(abbrs, abbr) + constraints[i] = constraint } - return strings.Join(abbrs, ", ") + return strings.Join(constraints, ", ") } diff --git a/e2etests-cli/testdata/TestCLI_E2E/internal_linked_pdf.exp.pdf b/e2etests-cli/testdata/TestCLI_E2E/internal_linked_pdf.exp.pdf index 30d233b92b320b9a855aa13b9d7c1090bc6e32fb..7e40a29cb25ae2ab7391f4eeb1e1f98cb2c203a0 100644 GIT binary patch delta 68 zcmezQf#v51mWC~it|rsVOc)KOJDV^XPG4ricvacd(9qb($W)U{-#0(SC9xz`LBqw$ T$iT?hz{~(Dw|$-|<83AYD~lBN delta 68 zcmezQf#v51mWC~it|rsVO&Im3JDV^XORefreshAuthorizationPolicyProtocolServerSideTranslatorProtocolBufferRefreshAuthorizationPolicyCacheRefreshAuthorizationPolicyCacheok + .d2-3940939446 .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}]]>RefreshAuthorizationPolicyProtocolServerSideTranslatorProtocolBufferRefreshAuthorizationPolicyCacheRefreshAuthorizationPolicyCacheok \ No newline at end of file diff --git a/e2etests/testdata/regression/only_header_class_table/elk/sketch.exp.svg b/e2etests/testdata/regression/only_header_class_table/elk/sketch.exp.svg index 6fc820c58..47de3bbf9 100644 --- a/e2etests/testdata/regression/only_header_class_table/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/only_header_class_table/elk/sketch.exp.svg @@ -96,7 +96,7 @@ .d2-3935436195 .color-AA4{color:#EDF0FD;} .d2-3935436195 .color-AA5{color:#F7F8FE;} .d2-3935436195 .color-AB4{color:#EDF0FD;} - .d2-3935436195 .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}]]>RefreshAuthorizationPolicyProtocolServerSideTranslatorProtocolBufferRefreshAuthorizationPolicyCacheRefreshAuthorizationPolicyCacheok + .d2-3935436195 .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}]]>RefreshAuthorizationPolicyProtocolServerSideTranslatorProtocolBufferRefreshAuthorizationPolicyCacheRefreshAuthorizationPolicyCacheok \ No newline at end of file diff --git a/e2etests/testdata/regression/sql_table_overflow/dagre/board.exp.json b/e2etests/testdata/regression/sql_table_overflow/dagre/board.exp.json index 937116c15..3aa233bf9 100644 --- a/e2etests/testdata/regression/sql_table_overflow/dagre/board.exp.json +++ b/e2etests/testdata/regression/sql_table_overflow/dagre/board.exp.json @@ -110,7 +110,7 @@ "x": 594, "y": 0 }, - "width": 594, + "width": 592, "height": 108, "opacity": 1, "strokeDash": 0, diff --git a/e2etests/testdata/regression/sql_table_overflow/dagre/sketch.exp.svg b/e2etests/testdata/regression/sql_table_overflow/dagre/sketch.exp.svg index 144f930fe..451a19c9c 100644 --- a/e2etests/testdata/regression/sql_table_overflow/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/sql_table_overflow/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -sql_table_overflowshortloooooooooooooooooooongloooooooooooooooooooongshortsql_table_constrained_overflowshortloooooooooooooooooooongUNQloooooooooooooooooooongshortFK - + .d2-1684363094 .fill-N1{fill:#0A0F25;} + .d2-1684363094 .fill-N2{fill:#676C7E;} + .d2-1684363094 .fill-N3{fill:#9499AB;} + .d2-1684363094 .fill-N4{fill:#CFD2DD;} + .d2-1684363094 .fill-N5{fill:#DEE1EB;} + .d2-1684363094 .fill-N6{fill:#EEF1F8;} + .d2-1684363094 .fill-N7{fill:#FFFFFF;} + .d2-1684363094 .fill-B1{fill:#0D32B2;} + .d2-1684363094 .fill-B2{fill:#0D32B2;} + .d2-1684363094 .fill-B3{fill:#E3E9FD;} + .d2-1684363094 .fill-B4{fill:#E3E9FD;} + .d2-1684363094 .fill-B5{fill:#EDF0FD;} + .d2-1684363094 .fill-B6{fill:#F7F8FE;} + .d2-1684363094 .fill-AA2{fill:#4A6FF3;} + .d2-1684363094 .fill-AA4{fill:#EDF0FD;} + .d2-1684363094 .fill-AA5{fill:#F7F8FE;} + .d2-1684363094 .fill-AB4{fill:#EDF0FD;} + .d2-1684363094 .fill-AB5{fill:#F7F8FE;} + .d2-1684363094 .stroke-N1{stroke:#0A0F25;} + .d2-1684363094 .stroke-N2{stroke:#676C7E;} + .d2-1684363094 .stroke-N3{stroke:#9499AB;} + .d2-1684363094 .stroke-N4{stroke:#CFD2DD;} + .d2-1684363094 .stroke-N5{stroke:#DEE1EB;} + .d2-1684363094 .stroke-N6{stroke:#EEF1F8;} + .d2-1684363094 .stroke-N7{stroke:#FFFFFF;} + .d2-1684363094 .stroke-B1{stroke:#0D32B2;} + .d2-1684363094 .stroke-B2{stroke:#0D32B2;} + .d2-1684363094 .stroke-B3{stroke:#E3E9FD;} + .d2-1684363094 .stroke-B4{stroke:#E3E9FD;} + .d2-1684363094 .stroke-B5{stroke:#EDF0FD;} + .d2-1684363094 .stroke-B6{stroke:#F7F8FE;} + .d2-1684363094 .stroke-AA2{stroke:#4A6FF3;} + .d2-1684363094 .stroke-AA4{stroke:#EDF0FD;} + .d2-1684363094 .stroke-AA5{stroke:#F7F8FE;} + .d2-1684363094 .stroke-AB4{stroke:#EDF0FD;} + .d2-1684363094 .stroke-AB5{stroke:#F7F8FE;} + .d2-1684363094 .background-color-N1{background-color:#0A0F25;} + .d2-1684363094 .background-color-N2{background-color:#676C7E;} + .d2-1684363094 .background-color-N3{background-color:#9499AB;} + .d2-1684363094 .background-color-N4{background-color:#CFD2DD;} + .d2-1684363094 .background-color-N5{background-color:#DEE1EB;} + .d2-1684363094 .background-color-N6{background-color:#EEF1F8;} + .d2-1684363094 .background-color-N7{background-color:#FFFFFF;} + .d2-1684363094 .background-color-B1{background-color:#0D32B2;} + .d2-1684363094 .background-color-B2{background-color:#0D32B2;} + .d2-1684363094 .background-color-B3{background-color:#E3E9FD;} + .d2-1684363094 .background-color-B4{background-color:#E3E9FD;} + .d2-1684363094 .background-color-B5{background-color:#EDF0FD;} + .d2-1684363094 .background-color-B6{background-color:#F7F8FE;} + .d2-1684363094 .background-color-AA2{background-color:#4A6FF3;} + .d2-1684363094 .background-color-AA4{background-color:#EDF0FD;} + .d2-1684363094 .background-color-AA5{background-color:#F7F8FE;} + .d2-1684363094 .background-color-AB4{background-color:#EDF0FD;} + .d2-1684363094 .background-color-AB5{background-color:#F7F8FE;} + .d2-1684363094 .color-N1{color:#0A0F25;} + .d2-1684363094 .color-N2{color:#676C7E;} + .d2-1684363094 .color-N3{color:#9499AB;} + .d2-1684363094 .color-N4{color:#CFD2DD;} + .d2-1684363094 .color-N5{color:#DEE1EB;} + .d2-1684363094 .color-N6{color:#EEF1F8;} + .d2-1684363094 .color-N7{color:#FFFFFF;} + .d2-1684363094 .color-B1{color:#0D32B2;} + .d2-1684363094 .color-B2{color:#0D32B2;} + .d2-1684363094 .color-B3{color:#E3E9FD;} + .d2-1684363094 .color-B4{color:#E3E9FD;} + .d2-1684363094 .color-B5{color:#EDF0FD;} + .d2-1684363094 .color-B6{color:#F7F8FE;} + .d2-1684363094 .color-AA2{color:#4A6FF3;} + .d2-1684363094 .color-AA4{color:#EDF0FD;} + .d2-1684363094 .color-AA5{color:#F7F8FE;} + .d2-1684363094 .color-AB4{color:#EDF0FD;} + .d2-1684363094 .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}]]>sql_table_overflowshortloooooooooooooooooooongloooooooooooooooooooongshortsql_table_constrained_overflowshortloooooooooooooooooooongUNQloooooooooooooooooooongshortFK + \ No newline at end of file diff --git a/e2etests/testdata/regression/sql_table_overflow/elk/board.exp.json b/e2etests/testdata/regression/sql_table_overflow/elk/board.exp.json index c4ddc7c1b..3c6ee9d9e 100644 --- a/e2etests/testdata/regression/sql_table_overflow/elk/board.exp.json +++ b/e2etests/testdata/regression/sql_table_overflow/elk/board.exp.json @@ -110,7 +110,7 @@ "x": 566, "y": 12 }, - "width": 594, + "width": 592, "height": 108, "opacity": 1, "strokeDash": 0, diff --git a/e2etests/testdata/regression/sql_table_overflow/elk/sketch.exp.svg b/e2etests/testdata/regression/sql_table_overflow/elk/sketch.exp.svg index 194ca57cd..6b83845ad 100644 --- a/e2etests/testdata/regression/sql_table_overflow/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/sql_table_overflow/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -sql_table_overflowshortloooooooooooooooooooongloooooooooooooooooooongshortsql_table_constrained_overflowshortloooooooooooooooooooongUNQloooooooooooooooooooongshortFK - + .d2-1261803308 .fill-N1{fill:#0A0F25;} + .d2-1261803308 .fill-N2{fill:#676C7E;} + .d2-1261803308 .fill-N3{fill:#9499AB;} + .d2-1261803308 .fill-N4{fill:#CFD2DD;} + .d2-1261803308 .fill-N5{fill:#DEE1EB;} + .d2-1261803308 .fill-N6{fill:#EEF1F8;} + .d2-1261803308 .fill-N7{fill:#FFFFFF;} + .d2-1261803308 .fill-B1{fill:#0D32B2;} + .d2-1261803308 .fill-B2{fill:#0D32B2;} + .d2-1261803308 .fill-B3{fill:#E3E9FD;} + .d2-1261803308 .fill-B4{fill:#E3E9FD;} + .d2-1261803308 .fill-B5{fill:#EDF0FD;} + .d2-1261803308 .fill-B6{fill:#F7F8FE;} + .d2-1261803308 .fill-AA2{fill:#4A6FF3;} + .d2-1261803308 .fill-AA4{fill:#EDF0FD;} + .d2-1261803308 .fill-AA5{fill:#F7F8FE;} + .d2-1261803308 .fill-AB4{fill:#EDF0FD;} + .d2-1261803308 .fill-AB5{fill:#F7F8FE;} + .d2-1261803308 .stroke-N1{stroke:#0A0F25;} + .d2-1261803308 .stroke-N2{stroke:#676C7E;} + .d2-1261803308 .stroke-N3{stroke:#9499AB;} + .d2-1261803308 .stroke-N4{stroke:#CFD2DD;} + .d2-1261803308 .stroke-N5{stroke:#DEE1EB;} + .d2-1261803308 .stroke-N6{stroke:#EEF1F8;} + .d2-1261803308 .stroke-N7{stroke:#FFFFFF;} + .d2-1261803308 .stroke-B1{stroke:#0D32B2;} + .d2-1261803308 .stroke-B2{stroke:#0D32B2;} + .d2-1261803308 .stroke-B3{stroke:#E3E9FD;} + .d2-1261803308 .stroke-B4{stroke:#E3E9FD;} + .d2-1261803308 .stroke-B5{stroke:#EDF0FD;} + .d2-1261803308 .stroke-B6{stroke:#F7F8FE;} + .d2-1261803308 .stroke-AA2{stroke:#4A6FF3;} + .d2-1261803308 .stroke-AA4{stroke:#EDF0FD;} + .d2-1261803308 .stroke-AA5{stroke:#F7F8FE;} + .d2-1261803308 .stroke-AB4{stroke:#EDF0FD;} + .d2-1261803308 .stroke-AB5{stroke:#F7F8FE;} + .d2-1261803308 .background-color-N1{background-color:#0A0F25;} + .d2-1261803308 .background-color-N2{background-color:#676C7E;} + .d2-1261803308 .background-color-N3{background-color:#9499AB;} + .d2-1261803308 .background-color-N4{background-color:#CFD2DD;} + .d2-1261803308 .background-color-N5{background-color:#DEE1EB;} + .d2-1261803308 .background-color-N6{background-color:#EEF1F8;} + .d2-1261803308 .background-color-N7{background-color:#FFFFFF;} + .d2-1261803308 .background-color-B1{background-color:#0D32B2;} + .d2-1261803308 .background-color-B2{background-color:#0D32B2;} + .d2-1261803308 .background-color-B3{background-color:#E3E9FD;} + .d2-1261803308 .background-color-B4{background-color:#E3E9FD;} + .d2-1261803308 .background-color-B5{background-color:#EDF0FD;} + .d2-1261803308 .background-color-B6{background-color:#F7F8FE;} + .d2-1261803308 .background-color-AA2{background-color:#4A6FF3;} + .d2-1261803308 .background-color-AA4{background-color:#EDF0FD;} + .d2-1261803308 .background-color-AA5{background-color:#F7F8FE;} + .d2-1261803308 .background-color-AB4{background-color:#EDF0FD;} + .d2-1261803308 .background-color-AB5{background-color:#F7F8FE;} + .d2-1261803308 .color-N1{color:#0A0F25;} + .d2-1261803308 .color-N2{color:#676C7E;} + .d2-1261803308 .color-N3{color:#9499AB;} + .d2-1261803308 .color-N4{color:#CFD2DD;} + .d2-1261803308 .color-N5{color:#DEE1EB;} + .d2-1261803308 .color-N6{color:#EEF1F8;} + .d2-1261803308 .color-N7{color:#FFFFFF;} + .d2-1261803308 .color-B1{color:#0D32B2;} + .d2-1261803308 .color-B2{color:#0D32B2;} + .d2-1261803308 .color-B3{color:#E3E9FD;} + .d2-1261803308 .color-B4{color:#E3E9FD;} + .d2-1261803308 .color-B5{color:#EDF0FD;} + .d2-1261803308 .color-B6{color:#F7F8FE;} + .d2-1261803308 .color-AA2{color:#4A6FF3;} + .d2-1261803308 .color-AA4{color:#EDF0FD;} + .d2-1261803308 .color-AA5{color:#F7F8FE;} + .d2-1261803308 .color-AB4{color:#EDF0FD;} + .d2-1261803308 .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}]]>sql_table_overflowshortloooooooooooooooooooongloooooooooooooooooooongshortsql_table_constrained_overflowshortloooooooooooooooooooongUNQloooooooooooooooooooongshortFK + \ No newline at end of file diff --git a/e2etests/testdata/regression/unnamed_class_table_code/dagre/sketch.exp.svg b/e2etests/testdata/regression/unnamed_class_table_code/dagre/sketch.exp.svg index 19e8c557e..4abedf204 100644 --- a/e2etests/testdata/regression/unnamed_class_table_code/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/unnamed_class_table_code/dagre/sketch.exp.svg @@ -103,7 +103,7 @@ .d2-4221205655 .color-AA4{color:#EDF0FD;} .d2-4221205655 .color-AA5{color:#F7F8FE;} .d2-4221205655 .color-AB4{color:#EDF0FD;} - .d2-4221205655 .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}]]>-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetimea := 5 + .d2-4221205655 .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}]]>-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetimea := 5 b := a + 7 fmt.Printf("%d", b)a := 5 b := a + 7 diff --git a/e2etests/testdata/regression/unnamed_class_table_code/elk/sketch.exp.svg b/e2etests/testdata/regression/unnamed_class_table_code/elk/sketch.exp.svg index 9aa261bd2..546c5c559 100644 --- a/e2etests/testdata/regression/unnamed_class_table_code/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/unnamed_class_table_code/elk/sketch.exp.svg @@ -103,7 +103,7 @@ .d2-2359991916 .color-AA4{color:#EDF0FD;} .d2-2359991916 .color-AA5{color:#F7F8FE;} .d2-2359991916 .color-AB4{color:#EDF0FD;} - .d2-2359991916 .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}]]>-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetimea := 5 + .d2-2359991916 .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}]]>-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetimea := 5 b := a + 7 fmt.Printf("%d", b)a := 5 b := a + 7 diff --git a/e2etests/testdata/stable/class_and_sqlTable_border_radius/dagre/board.exp.json b/e2etests/testdata/stable/class_and_sqlTable_border_radius/dagre/board.exp.json index 3d9ed2ba9..57c24f1bb 100644 --- a/e2etests/testdata/stable/class_and_sqlTable_border_radius/dagre/board.exp.json +++ b/e2etests/testdata/stable/class_and_sqlTable_border_radius/dagre/board.exp.json @@ -10,7 +10,7 @@ "x": 0, "y": 2 }, - "width": 439, + "width": 437, "height": 180, "opacity": 1, "strokeDash": 0, @@ -169,7 +169,7 @@ "id": "b", "type": "class", "pos": { - "x": 499, + "x": 497, "y": 0 }, "width": 407, @@ -224,7 +224,7 @@ "id": "c", "type": "class", "pos": { - "x": 966, + "x": 964, "y": 46 }, "width": 117, @@ -267,7 +267,7 @@ "id": "d", "type": "sql_table", "pos": { - "x": 1143, + "x": 1141, "y": 74 }, "width": 50, diff --git a/e2etests/testdata/stable/class_and_sqlTable_border_radius/dagre/sketch.exp.svg b/e2etests/testdata/stable/class_and_sqlTable_border_radius/dagre/sketch.exp.svg index 730a87272..9d324c431 100644 --- a/e2etests/testdata/stable/class_and_sqlTable_border_radius/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/class_and_sqlTable_border_radius/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ - aidintPKdiskintFKjsonjsonbUNQlast_updatedtimestamp with time zone b+field[]string+method(a uint64)(x, y int) c d - + .d2-2645559164 .fill-N1{fill:#0A0F25;} + .d2-2645559164 .fill-N2{fill:#676C7E;} + .d2-2645559164 .fill-N3{fill:#9499AB;} + .d2-2645559164 .fill-N4{fill:#CFD2DD;} + .d2-2645559164 .fill-N5{fill:#DEE1EB;} + .d2-2645559164 .fill-N6{fill:#EEF1F8;} + .d2-2645559164 .fill-N7{fill:#FFFFFF;} + .d2-2645559164 .fill-B1{fill:#0D32B2;} + .d2-2645559164 .fill-B2{fill:#0D32B2;} + .d2-2645559164 .fill-B3{fill:#E3E9FD;} + .d2-2645559164 .fill-B4{fill:#E3E9FD;} + .d2-2645559164 .fill-B5{fill:#EDF0FD;} + .d2-2645559164 .fill-B6{fill:#F7F8FE;} + .d2-2645559164 .fill-AA2{fill:#4A6FF3;} + .d2-2645559164 .fill-AA4{fill:#EDF0FD;} + .d2-2645559164 .fill-AA5{fill:#F7F8FE;} + .d2-2645559164 .fill-AB4{fill:#EDF0FD;} + .d2-2645559164 .fill-AB5{fill:#F7F8FE;} + .d2-2645559164 .stroke-N1{stroke:#0A0F25;} + .d2-2645559164 .stroke-N2{stroke:#676C7E;} + .d2-2645559164 .stroke-N3{stroke:#9499AB;} + .d2-2645559164 .stroke-N4{stroke:#CFD2DD;} + .d2-2645559164 .stroke-N5{stroke:#DEE1EB;} + .d2-2645559164 .stroke-N6{stroke:#EEF1F8;} + .d2-2645559164 .stroke-N7{stroke:#FFFFFF;} + .d2-2645559164 .stroke-B1{stroke:#0D32B2;} + .d2-2645559164 .stroke-B2{stroke:#0D32B2;} + .d2-2645559164 .stroke-B3{stroke:#E3E9FD;} + .d2-2645559164 .stroke-B4{stroke:#E3E9FD;} + .d2-2645559164 .stroke-B5{stroke:#EDF0FD;} + .d2-2645559164 .stroke-B6{stroke:#F7F8FE;} + .d2-2645559164 .stroke-AA2{stroke:#4A6FF3;} + .d2-2645559164 .stroke-AA4{stroke:#EDF0FD;} + .d2-2645559164 .stroke-AA5{stroke:#F7F8FE;} + .d2-2645559164 .stroke-AB4{stroke:#EDF0FD;} + .d2-2645559164 .stroke-AB5{stroke:#F7F8FE;} + .d2-2645559164 .background-color-N1{background-color:#0A0F25;} + .d2-2645559164 .background-color-N2{background-color:#676C7E;} + .d2-2645559164 .background-color-N3{background-color:#9499AB;} + .d2-2645559164 .background-color-N4{background-color:#CFD2DD;} + .d2-2645559164 .background-color-N5{background-color:#DEE1EB;} + .d2-2645559164 .background-color-N6{background-color:#EEF1F8;} + .d2-2645559164 .background-color-N7{background-color:#FFFFFF;} + .d2-2645559164 .background-color-B1{background-color:#0D32B2;} + .d2-2645559164 .background-color-B2{background-color:#0D32B2;} + .d2-2645559164 .background-color-B3{background-color:#E3E9FD;} + .d2-2645559164 .background-color-B4{background-color:#E3E9FD;} + .d2-2645559164 .background-color-B5{background-color:#EDF0FD;} + .d2-2645559164 .background-color-B6{background-color:#F7F8FE;} + .d2-2645559164 .background-color-AA2{background-color:#4A6FF3;} + .d2-2645559164 .background-color-AA4{background-color:#EDF0FD;} + .d2-2645559164 .background-color-AA5{background-color:#F7F8FE;} + .d2-2645559164 .background-color-AB4{background-color:#EDF0FD;} + .d2-2645559164 .background-color-AB5{background-color:#F7F8FE;} + .d2-2645559164 .color-N1{color:#0A0F25;} + .d2-2645559164 .color-N2{color:#676C7E;} + .d2-2645559164 .color-N3{color:#9499AB;} + .d2-2645559164 .color-N4{color:#CFD2DD;} + .d2-2645559164 .color-N5{color:#DEE1EB;} + .d2-2645559164 .color-N6{color:#EEF1F8;} + .d2-2645559164 .color-N7{color:#FFFFFF;} + .d2-2645559164 .color-B1{color:#0D32B2;} + .d2-2645559164 .color-B2{color:#0D32B2;} + .d2-2645559164 .color-B3{color:#E3E9FD;} + .d2-2645559164 .color-B4{color:#E3E9FD;} + .d2-2645559164 .color-B5{color:#EDF0FD;} + .d2-2645559164 .color-B6{color:#F7F8FE;} + .d2-2645559164 .color-AA2{color:#4A6FF3;} + .d2-2645559164 .color-AA4{color:#EDF0FD;} + .d2-2645559164 .color-AA5{color:#F7F8FE;} + .d2-2645559164 .color-AB4{color:#EDF0FD;} + .d2-2645559164 .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}]]> aidintPKdiskintFKjsonjsonbUNQlast_updatedtimestamp with time zone b+field[]string+method(a uint64)(x, y int) c d + \ No newline at end of file diff --git a/e2etests/testdata/stable/class_and_sqlTable_border_radius/elk/board.exp.json b/e2etests/testdata/stable/class_and_sqlTable_border_radius/elk/board.exp.json index 1b5822a06..9e58c1d09 100644 --- a/e2etests/testdata/stable/class_and_sqlTable_border_radius/elk/board.exp.json +++ b/e2etests/testdata/stable/class_and_sqlTable_border_radius/elk/board.exp.json @@ -10,7 +10,7 @@ "x": 12, "y": 14 }, - "width": 439, + "width": 437, "height": 180, "opacity": 1, "strokeDash": 0, @@ -169,7 +169,7 @@ "id": "b", "type": "class", "pos": { - "x": 471, + "x": 469, "y": 12 }, "width": 407, @@ -224,7 +224,7 @@ "id": "c", "type": "class", "pos": { - "x": 898, + "x": 896, "y": 58 }, "width": 117, @@ -267,7 +267,7 @@ "id": "d", "type": "sql_table", "pos": { - "x": 1035, + "x": 1033, "y": 86 }, "width": 50, diff --git a/e2etests/testdata/stable/class_and_sqlTable_border_radius/elk/sketch.exp.svg b/e2etests/testdata/stable/class_and_sqlTable_border_radius/elk/sketch.exp.svg index 8a41dd530..3e01e587b 100644 --- a/e2etests/testdata/stable/class_and_sqlTable_border_radius/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/class_and_sqlTable_border_radius/elk/sketch.exp.svg @@ -1,16 +1,16 @@ - aidintPKdiskintFKjsonjsonbUNQlast_updatedtimestamp with time zone b+field[]string+method(a uint64)(x, y int) c d - + .d2-466630064 .fill-N1{fill:#0A0F25;} + .d2-466630064 .fill-N2{fill:#676C7E;} + .d2-466630064 .fill-N3{fill:#9499AB;} + .d2-466630064 .fill-N4{fill:#CFD2DD;} + .d2-466630064 .fill-N5{fill:#DEE1EB;} + .d2-466630064 .fill-N6{fill:#EEF1F8;} + .d2-466630064 .fill-N7{fill:#FFFFFF;} + .d2-466630064 .fill-B1{fill:#0D32B2;} + .d2-466630064 .fill-B2{fill:#0D32B2;} + .d2-466630064 .fill-B3{fill:#E3E9FD;} + .d2-466630064 .fill-B4{fill:#E3E9FD;} + .d2-466630064 .fill-B5{fill:#EDF0FD;} + .d2-466630064 .fill-B6{fill:#F7F8FE;} + .d2-466630064 .fill-AA2{fill:#4A6FF3;} + .d2-466630064 .fill-AA4{fill:#EDF0FD;} + .d2-466630064 .fill-AA5{fill:#F7F8FE;} + .d2-466630064 .fill-AB4{fill:#EDF0FD;} + .d2-466630064 .fill-AB5{fill:#F7F8FE;} + .d2-466630064 .stroke-N1{stroke:#0A0F25;} + .d2-466630064 .stroke-N2{stroke:#676C7E;} + .d2-466630064 .stroke-N3{stroke:#9499AB;} + .d2-466630064 .stroke-N4{stroke:#CFD2DD;} + .d2-466630064 .stroke-N5{stroke:#DEE1EB;} + .d2-466630064 .stroke-N6{stroke:#EEF1F8;} + .d2-466630064 .stroke-N7{stroke:#FFFFFF;} + .d2-466630064 .stroke-B1{stroke:#0D32B2;} + .d2-466630064 .stroke-B2{stroke:#0D32B2;} + .d2-466630064 .stroke-B3{stroke:#E3E9FD;} + .d2-466630064 .stroke-B4{stroke:#E3E9FD;} + .d2-466630064 .stroke-B5{stroke:#EDF0FD;} + .d2-466630064 .stroke-B6{stroke:#F7F8FE;} + .d2-466630064 .stroke-AA2{stroke:#4A6FF3;} + .d2-466630064 .stroke-AA4{stroke:#EDF0FD;} + .d2-466630064 .stroke-AA5{stroke:#F7F8FE;} + .d2-466630064 .stroke-AB4{stroke:#EDF0FD;} + .d2-466630064 .stroke-AB5{stroke:#F7F8FE;} + .d2-466630064 .background-color-N1{background-color:#0A0F25;} + .d2-466630064 .background-color-N2{background-color:#676C7E;} + .d2-466630064 .background-color-N3{background-color:#9499AB;} + .d2-466630064 .background-color-N4{background-color:#CFD2DD;} + .d2-466630064 .background-color-N5{background-color:#DEE1EB;} + .d2-466630064 .background-color-N6{background-color:#EEF1F8;} + .d2-466630064 .background-color-N7{background-color:#FFFFFF;} + .d2-466630064 .background-color-B1{background-color:#0D32B2;} + .d2-466630064 .background-color-B2{background-color:#0D32B2;} + .d2-466630064 .background-color-B3{background-color:#E3E9FD;} + .d2-466630064 .background-color-B4{background-color:#E3E9FD;} + .d2-466630064 .background-color-B5{background-color:#EDF0FD;} + .d2-466630064 .background-color-B6{background-color:#F7F8FE;} + .d2-466630064 .background-color-AA2{background-color:#4A6FF3;} + .d2-466630064 .background-color-AA4{background-color:#EDF0FD;} + .d2-466630064 .background-color-AA5{background-color:#F7F8FE;} + .d2-466630064 .background-color-AB4{background-color:#EDF0FD;} + .d2-466630064 .background-color-AB5{background-color:#F7F8FE;} + .d2-466630064 .color-N1{color:#0A0F25;} + .d2-466630064 .color-N2{color:#676C7E;} + .d2-466630064 .color-N3{color:#9499AB;} + .d2-466630064 .color-N4{color:#CFD2DD;} + .d2-466630064 .color-N5{color:#DEE1EB;} + .d2-466630064 .color-N6{color:#EEF1F8;} + .d2-466630064 .color-N7{color:#FFFFFF;} + .d2-466630064 .color-B1{color:#0D32B2;} + .d2-466630064 .color-B2{color:#0D32B2;} + .d2-466630064 .color-B3{color:#E3E9FD;} + .d2-466630064 .color-B4{color:#E3E9FD;} + .d2-466630064 .color-B5{color:#EDF0FD;} + .d2-466630064 .color-B6{color:#F7F8FE;} + .d2-466630064 .color-AA2{color:#4A6FF3;} + .d2-466630064 .color-AA4{color:#EDF0FD;} + .d2-466630064 .color-AA5{color:#F7F8FE;} + .d2-466630064 .color-AB4{color:#EDF0FD;} + .d2-466630064 .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}]]> aidintPKdiskintFKjsonjsonbUNQlast_updatedtimestamp with time zone b+field[]string+method(a uint64)(x, y int) c d + \ No newline at end of file diff --git a/e2etests/testdata/stable/ent2d2_basic/dagre/board.exp.json b/e2etests/testdata/stable/ent2d2_basic/dagre/board.exp.json index d0f85ab2f..24467c27a 100644 --- a/e2etests/testdata/stable/ent2d2_basic/dagre/board.exp.json +++ b/e2etests/testdata/stable/ent2d2_basic/dagre/board.exp.json @@ -7,10 +7,10 @@ "id": "User", "type": "sql_table", "pos": { - "x": 553, + "x": 519, "y": 0 }, - "width": 218, + "width": 201, "height": 144, "opacity": 1, "strokeDash": 0, @@ -144,7 +144,7 @@ "x": 0, "y": 283 }, - "width": 211, + "width": 194, "height": 108, "opacity": 1, "strokeDash": 0, @@ -245,10 +245,10 @@ "id": "Card", "type": "sql_table", "pos": { - "x": 271, + "x": 254, "y": 283 }, - "width": 211, + "width": 194, "height": 108, "opacity": 1, "strokeDash": 0, @@ -349,10 +349,10 @@ "id": "Post", "type": "sql_table", "pos": { - "x": 542, + "x": 508, "y": 265 }, - "width": 239, + "width": 222, "height": 144, "opacity": 1, "strokeDash": 0, @@ -481,10 +481,10 @@ "id": "Metadata", "type": "sql_table", "pos": { - "x": 841, + "x": 790, "y": 283 }, - "width": 163, + "width": 146, "height": 108, "opacity": 1, "strokeDash": 0, @@ -583,10 +583,10 @@ "id": "Info", "type": "sql_table", "pos": { - "x": 1064, + "x": 996, "y": 283 }, - "width": 325, + "width": 308, "height": 108, "opacity": 1, "strokeDash": 0, @@ -708,56 +708,56 @@ "labelPercentage": 0, "route": [ { - "x": 770.5, - "y": 22.433000564575195 + "x": 719.5, + "y": 23.70599937438965 }, { - "x": 809.9660034179688, - "y": 4.486000061035156 + "x": 758.9660034179688, + "y": 4.741000175476074 }, { - "x": 822.2999877929688, + "x": 771.2999877929688, "y": 0 }, { - "x": 826, + "x": 775, "y": 0 }, { - "x": 829.698974609375, + "x": 778.698974609375, "y": 0 }, { - "x": 834.6329956054688, + "x": 783.6329956054688, "y": 14.399999618530273 }, { - "x": 838.3330078125, + "x": 787.3330078125, "y": 36 }, { - "x": 842.0330200195312, + "x": 791.0330200195312, "y": 57.599998474121094 }, { - "x": 842.0330200195312, + "x": 791.0330200195312, "y": 86.4000015258789 }, { - "x": 838.3330078125, + "x": 787.3330078125, "y": 108 }, { - "x": 834.6329956054688, + "x": 783.6329956054688, "y": 129.60000610351562 }, { - "x": 809.9660034179688, - "y": 139.51300048828125 + "x": 758.9660034179688, + "y": 139.25799560546875 }, { - "x": 770.5, - "y": 121.56600189208984 + "x": 719.5, + "y": 120.29299926757812 } ], "isCurve": true, @@ -791,56 +791,56 @@ "labelPercentage": 0, "route": [ { - "x": 770.5, - "y": 41.42300033569336 + "x": 719.5, + "y": 42.84199905395508 }, { - "x": 888.6329956054688, - "y": 8.284000396728516 + "x": 837.6329956054688, + "y": 8.567999839782715 }, { - "x": 925.5499877929688, + "x": 874.5499877929688, "y": 0 }, { - "x": 936.625, + "x": 885.625, "y": 0 }, { - "x": 947.7000122070312, + "x": 896.7000122070312, "y": 0 }, { - "x": 962.4660034179688, + "x": 911.4660034179688, "y": 14.399999618530273 }, { - "x": 973.541015625, + "x": 922.541015625, "y": 36 }, { - "x": 984.6160278320312, + "x": 933.6160278320312, "y": 57.599998474121094 }, { - "x": 984.6160278320312, + "x": 933.6160278320312, "y": 86.4000015258789 }, { - "x": 973.541015625, + "x": 922.541015625, "y": 108 }, { - "x": 962.4660034179688, + "x": 911.4660034179688, "y": 129.60000610351562 }, { - "x": 888.6329956054688, - "y": 135.71499633789062 + "x": 837.6329956054688, + "y": 135.43099975585938 }, { - "x": 770.5, - "y": 102.57599639892578 + "x": 719.5, + "y": 101.15699768066406 } ], "isCurve": true, @@ -874,19 +874,19 @@ "labelPercentage": 0, "route": [ { - "x": 552.5, - "y": 97.9749984741211 + "x": 518.5, + "y": 97.51000213623047 }, { - "x": 194.8990020751953, - "y": 183.19500732421875 + "x": 181.2989959716797, + "y": 183.1020050048828 }, { - "x": 105.5, + "x": 97, "y": 220.3000030517578 }, { - "x": 105.5, + "x": 97, "y": 283.5 } ], @@ -921,19 +921,19 @@ "labelPercentage": 0, "route": [ { - "x": 552.5, - "y": 122.67500305175781 + "x": 518.5, + "y": 121.68699645996094 }, { - "x": 411.70001220703125, - "y": 188.13499450683594 + "x": 384.5, + "y": 187.93699645996094 }, { - "x": 376.5, + "x": 351, "y": 220.3000030517578 }, { - "x": 376.5, + "x": 351, "y": 283.5 } ], @@ -968,19 +968,19 @@ "labelPercentage": 0, "route": [ { - "x": 661.5, + "x": 619, "y": 144 }, { - "x": 661.5, + "x": 619, "y": 192.39999389648438 }, { - "x": 661.5, + "x": 619, "y": 216.6999969482422 }, { - "x": 661.5, + "x": 619, "y": 265.5 } ], @@ -1015,19 +1015,19 @@ "labelPercentage": 0, "route": [ { - "x": 771.5, - "y": 127.33499908447266 + "x": 720.5, + "y": 126.5739974975586 }, { - "x": 892.2999877929688, - "y": 189.06700134277344 + "x": 834.5, + "y": 188.91400146484375 }, { - "x": 922.5, + "x": 863, "y": 220.3000030517578 }, { - "x": 922.5, + "x": 863, "y": 283.5 } ], @@ -1062,19 +1062,19 @@ "labelPercentage": 0, "route": [ { - "x": 771.5, - "y": 97.56099700927734 + "x": 720.5, + "y": 97.0770034790039 }, { - "x": 1135.5, - "y": 183.11199951171875 + "x": 1064.0999755859375, + "y": 183.01499938964844 }, { - "x": 1226.5, + "x": 1150, "y": 220.3000030517578 }, { - "x": 1226.5, + "x": 1150, "y": 283.5 } ], diff --git a/e2etests/testdata/stable/ent2d2_basic/dagre/sketch.exp.svg b/e2etests/testdata/stable/ent2d2_basic/dagre/sketch.exp.svg index 1a1803f42..71b820c2b 100644 --- a/e2etests/testdata/stable/ent2d2_basic/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/ent2d2_basic/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -UseridintPKparent_idintFKspouse_idintFKPetidintPKowner_idintFKCardidintPKowner_idintFKPostidintPKtextstringauthor_idintFKMetadataidintPKageintInfoidintPKcontentjson.RawMessage spouse children/parent/ancestorpets/ownercard/ownerposts/authormetadata/userinfo/user - - - - - - - - + .d2-2324764429 .fill-N1{fill:#0A0F25;} + .d2-2324764429 .fill-N2{fill:#676C7E;} + .d2-2324764429 .fill-N3{fill:#9499AB;} + .d2-2324764429 .fill-N4{fill:#CFD2DD;} + .d2-2324764429 .fill-N5{fill:#DEE1EB;} + .d2-2324764429 .fill-N6{fill:#EEF1F8;} + .d2-2324764429 .fill-N7{fill:#FFFFFF;} + .d2-2324764429 .fill-B1{fill:#0D32B2;} + .d2-2324764429 .fill-B2{fill:#0D32B2;} + .d2-2324764429 .fill-B3{fill:#E3E9FD;} + .d2-2324764429 .fill-B4{fill:#E3E9FD;} + .d2-2324764429 .fill-B5{fill:#EDF0FD;} + .d2-2324764429 .fill-B6{fill:#F7F8FE;} + .d2-2324764429 .fill-AA2{fill:#4A6FF3;} + .d2-2324764429 .fill-AA4{fill:#EDF0FD;} + .d2-2324764429 .fill-AA5{fill:#F7F8FE;} + .d2-2324764429 .fill-AB4{fill:#EDF0FD;} + .d2-2324764429 .fill-AB5{fill:#F7F8FE;} + .d2-2324764429 .stroke-N1{stroke:#0A0F25;} + .d2-2324764429 .stroke-N2{stroke:#676C7E;} + .d2-2324764429 .stroke-N3{stroke:#9499AB;} + .d2-2324764429 .stroke-N4{stroke:#CFD2DD;} + .d2-2324764429 .stroke-N5{stroke:#DEE1EB;} + .d2-2324764429 .stroke-N6{stroke:#EEF1F8;} + .d2-2324764429 .stroke-N7{stroke:#FFFFFF;} + .d2-2324764429 .stroke-B1{stroke:#0D32B2;} + .d2-2324764429 .stroke-B2{stroke:#0D32B2;} + .d2-2324764429 .stroke-B3{stroke:#E3E9FD;} + .d2-2324764429 .stroke-B4{stroke:#E3E9FD;} + .d2-2324764429 .stroke-B5{stroke:#EDF0FD;} + .d2-2324764429 .stroke-B6{stroke:#F7F8FE;} + .d2-2324764429 .stroke-AA2{stroke:#4A6FF3;} + .d2-2324764429 .stroke-AA4{stroke:#EDF0FD;} + .d2-2324764429 .stroke-AA5{stroke:#F7F8FE;} + .d2-2324764429 .stroke-AB4{stroke:#EDF0FD;} + .d2-2324764429 .stroke-AB5{stroke:#F7F8FE;} + .d2-2324764429 .background-color-N1{background-color:#0A0F25;} + .d2-2324764429 .background-color-N2{background-color:#676C7E;} + .d2-2324764429 .background-color-N3{background-color:#9499AB;} + .d2-2324764429 .background-color-N4{background-color:#CFD2DD;} + .d2-2324764429 .background-color-N5{background-color:#DEE1EB;} + .d2-2324764429 .background-color-N6{background-color:#EEF1F8;} + .d2-2324764429 .background-color-N7{background-color:#FFFFFF;} + .d2-2324764429 .background-color-B1{background-color:#0D32B2;} + .d2-2324764429 .background-color-B2{background-color:#0D32B2;} + .d2-2324764429 .background-color-B3{background-color:#E3E9FD;} + .d2-2324764429 .background-color-B4{background-color:#E3E9FD;} + .d2-2324764429 .background-color-B5{background-color:#EDF0FD;} + .d2-2324764429 .background-color-B6{background-color:#F7F8FE;} + .d2-2324764429 .background-color-AA2{background-color:#4A6FF3;} + .d2-2324764429 .background-color-AA4{background-color:#EDF0FD;} + .d2-2324764429 .background-color-AA5{background-color:#F7F8FE;} + .d2-2324764429 .background-color-AB4{background-color:#EDF0FD;} + .d2-2324764429 .background-color-AB5{background-color:#F7F8FE;} + .d2-2324764429 .color-N1{color:#0A0F25;} + .d2-2324764429 .color-N2{color:#676C7E;} + .d2-2324764429 .color-N3{color:#9499AB;} + .d2-2324764429 .color-N4{color:#CFD2DD;} + .d2-2324764429 .color-N5{color:#DEE1EB;} + .d2-2324764429 .color-N6{color:#EEF1F8;} + .d2-2324764429 .color-N7{color:#FFFFFF;} + .d2-2324764429 .color-B1{color:#0D32B2;} + .d2-2324764429 .color-B2{color:#0D32B2;} + .d2-2324764429 .color-B3{color:#E3E9FD;} + .d2-2324764429 .color-B4{color:#E3E9FD;} + .d2-2324764429 .color-B5{color:#EDF0FD;} + .d2-2324764429 .color-B6{color:#F7F8FE;} + .d2-2324764429 .color-AA2{color:#4A6FF3;} + .d2-2324764429 .color-AA4{color:#EDF0FD;} + .d2-2324764429 .color-AA5{color:#F7F8FE;} + .d2-2324764429 .color-AB4{color:#EDF0FD;} + .d2-2324764429 .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}]]>UseridintPKparent_idintFKspouse_idintFKPetidintPKowner_idintFKCardidintPKowner_idintFKPostidintPKtextstringauthor_idintFKMetadataidintPKageintInfoidintPKcontentjson.RawMessage spouse children/parent/ancestorpets/ownercard/ownerposts/authormetadata/userinfo/user + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/ent2d2_basic/elk/board.exp.json b/e2etests/testdata/stable/ent2d2_basic/elk/board.exp.json index 71a37ae1e..9fd0bdcae 100644 --- a/e2etests/testdata/stable/ent2d2_basic/elk/board.exp.json +++ b/e2etests/testdata/stable/ent2d2_basic/elk/board.exp.json @@ -7,7 +7,7 @@ "id": "User", "type": "sql_table", "pos": { - "x": 453, + "x": 411, "y": 12 }, "width": 280, @@ -144,7 +144,7 @@ "x": 12, "y": 377 }, - "width": 211, + "width": 194, "height": 108, "opacity": 1, "strokeDash": 0, @@ -245,10 +245,10 @@ "id": "Card", "type": "sql_table", "pos": { - "x": 243, + "x": 226, "y": 377 }, - "width": 211, + "width": 194, "height": 108, "opacity": 1, "strokeDash": 0, @@ -349,10 +349,10 @@ "id": "Post", "type": "sql_table", "pos": { - "x": 474, + "x": 440, "y": 377 }, - "width": 239, + "width": 222, "height": 144, "opacity": 1, "strokeDash": 0, @@ -481,10 +481,10 @@ "id": "Metadata", "type": "sql_table", "pos": { - "x": 733, + "x": 682, "y": 377 }, - "width": 163, + "width": 146, "height": 108, "opacity": 1, "strokeDash": 0, @@ -583,10 +583,10 @@ "id": "Info", "type": "sql_table", "pos": { - "x": 916, + "x": 848, "y": 377 }, - "width": 325, + "width": 308, "height": 108, "opacity": 1, "strokeDash": 0, @@ -708,19 +708,19 @@ "labelPercentage": 0, "route": [ { - "x": 453.5, + "x": 411, "y": 60 }, { - "x": 365.5, + "x": 323, "y": 60 }, { - "x": 365.5, + "x": 323, "y": 108 }, { - "x": 453.5, + "x": 411, "y": 108 } ], @@ -754,19 +754,19 @@ "labelPercentage": 0, "route": [ { - "x": 733.5, + "x": 691, "y": 108 }, { - "x": 821.5, + "x": 779, "y": 108 }, { - "x": 821.5, + "x": 779, "y": 60 }, { - "x": 733.5, + "x": 691, "y": 60 } ], @@ -800,19 +800,19 @@ "labelPercentage": 0, "route": [ { - "x": 500.1659851074219, + "x": 457.6659851074219, "y": 156 }, { - "x": 500.1659851074219, + "x": 457.6659851074219, "y": 196 }, { - "x": 117.5, + "x": 109, "y": 196 }, { - "x": 117.5, + "x": 109, "y": 377 } ], @@ -846,19 +846,19 @@ "labelPercentage": 0, "route": [ { - "x": 546.8330078125, + "x": 504.3330078125, "y": 156 }, { - "x": 546.8330078125, + "x": 504.3330078125, "y": 246 }, { - "x": 348.5, + "x": 323, "y": 246 }, { - "x": 348.5, + "x": 323, "y": 377 } ], @@ -892,11 +892,11 @@ "labelPercentage": 0, "route": [ { - "x": 593.5, + "x": 551, "y": 156 }, { - "x": 593.5, + "x": 551, "y": 377 } ], @@ -930,19 +930,19 @@ "labelPercentage": 0, "route": [ { - "x": 640.166015625, + "x": 597.666015625, "y": 156 }, { - "x": 640.166015625, + "x": 597.666015625, "y": 246 }, { - "x": 814.5, + "x": 755, "y": 246 }, { - "x": 814.5, + "x": 755, "y": 377 } ], @@ -976,19 +976,19 @@ "labelPercentage": 0, "route": [ { - "x": 686.8330078125, + "x": 644.3330078125, "y": 156 }, { - "x": 686.8330078125, + "x": 644.3330078125, "y": 196 }, { - "x": 1078.5, + "x": 1002, "y": 196 }, { - "x": 1078.5, + "x": 1002, "y": 377 } ], diff --git a/e2etests/testdata/stable/ent2d2_basic/elk/sketch.exp.svg b/e2etests/testdata/stable/ent2d2_basic/elk/sketch.exp.svg index 0abb785da..78521542a 100644 --- a/e2etests/testdata/stable/ent2d2_basic/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/ent2d2_basic/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -UseridintPKparent_idintFKspouse_idintFKPetidintPKowner_idintFKCardidintPKowner_idintFKPostidintPKtextstringauthor_idintFKMetadataidintPKageintInfoidintPKcontentjson.RawMessage spouse children/parent/ancestorpets/ownercard/ownerposts/authormetadata/userinfo/user - - - - - - - - + .d2-251747913 .fill-N1{fill:#0A0F25;} + .d2-251747913 .fill-N2{fill:#676C7E;} + .d2-251747913 .fill-N3{fill:#9499AB;} + .d2-251747913 .fill-N4{fill:#CFD2DD;} + .d2-251747913 .fill-N5{fill:#DEE1EB;} + .d2-251747913 .fill-N6{fill:#EEF1F8;} + .d2-251747913 .fill-N7{fill:#FFFFFF;} + .d2-251747913 .fill-B1{fill:#0D32B2;} + .d2-251747913 .fill-B2{fill:#0D32B2;} + .d2-251747913 .fill-B3{fill:#E3E9FD;} + .d2-251747913 .fill-B4{fill:#E3E9FD;} + .d2-251747913 .fill-B5{fill:#EDF0FD;} + .d2-251747913 .fill-B6{fill:#F7F8FE;} + .d2-251747913 .fill-AA2{fill:#4A6FF3;} + .d2-251747913 .fill-AA4{fill:#EDF0FD;} + .d2-251747913 .fill-AA5{fill:#F7F8FE;} + .d2-251747913 .fill-AB4{fill:#EDF0FD;} + .d2-251747913 .fill-AB5{fill:#F7F8FE;} + .d2-251747913 .stroke-N1{stroke:#0A0F25;} + .d2-251747913 .stroke-N2{stroke:#676C7E;} + .d2-251747913 .stroke-N3{stroke:#9499AB;} + .d2-251747913 .stroke-N4{stroke:#CFD2DD;} + .d2-251747913 .stroke-N5{stroke:#DEE1EB;} + .d2-251747913 .stroke-N6{stroke:#EEF1F8;} + .d2-251747913 .stroke-N7{stroke:#FFFFFF;} + .d2-251747913 .stroke-B1{stroke:#0D32B2;} + .d2-251747913 .stroke-B2{stroke:#0D32B2;} + .d2-251747913 .stroke-B3{stroke:#E3E9FD;} + .d2-251747913 .stroke-B4{stroke:#E3E9FD;} + .d2-251747913 .stroke-B5{stroke:#EDF0FD;} + .d2-251747913 .stroke-B6{stroke:#F7F8FE;} + .d2-251747913 .stroke-AA2{stroke:#4A6FF3;} + .d2-251747913 .stroke-AA4{stroke:#EDF0FD;} + .d2-251747913 .stroke-AA5{stroke:#F7F8FE;} + .d2-251747913 .stroke-AB4{stroke:#EDF0FD;} + .d2-251747913 .stroke-AB5{stroke:#F7F8FE;} + .d2-251747913 .background-color-N1{background-color:#0A0F25;} + .d2-251747913 .background-color-N2{background-color:#676C7E;} + .d2-251747913 .background-color-N3{background-color:#9499AB;} + .d2-251747913 .background-color-N4{background-color:#CFD2DD;} + .d2-251747913 .background-color-N5{background-color:#DEE1EB;} + .d2-251747913 .background-color-N6{background-color:#EEF1F8;} + .d2-251747913 .background-color-N7{background-color:#FFFFFF;} + .d2-251747913 .background-color-B1{background-color:#0D32B2;} + .d2-251747913 .background-color-B2{background-color:#0D32B2;} + .d2-251747913 .background-color-B3{background-color:#E3E9FD;} + .d2-251747913 .background-color-B4{background-color:#E3E9FD;} + .d2-251747913 .background-color-B5{background-color:#EDF0FD;} + .d2-251747913 .background-color-B6{background-color:#F7F8FE;} + .d2-251747913 .background-color-AA2{background-color:#4A6FF3;} + .d2-251747913 .background-color-AA4{background-color:#EDF0FD;} + .d2-251747913 .background-color-AA5{background-color:#F7F8FE;} + .d2-251747913 .background-color-AB4{background-color:#EDF0FD;} + .d2-251747913 .background-color-AB5{background-color:#F7F8FE;} + .d2-251747913 .color-N1{color:#0A0F25;} + .d2-251747913 .color-N2{color:#676C7E;} + .d2-251747913 .color-N3{color:#9499AB;} + .d2-251747913 .color-N4{color:#CFD2DD;} + .d2-251747913 .color-N5{color:#DEE1EB;} + .d2-251747913 .color-N6{color:#EEF1F8;} + .d2-251747913 .color-N7{color:#FFFFFF;} + .d2-251747913 .color-B1{color:#0D32B2;} + .d2-251747913 .color-B2{color:#0D32B2;} + .d2-251747913 .color-B3{color:#E3E9FD;} + .d2-251747913 .color-B4{color:#E3E9FD;} + .d2-251747913 .color-B5{color:#EDF0FD;} + .d2-251747913 .color-B6{color:#F7F8FE;} + .d2-251747913 .color-AA2{color:#4A6FF3;} + .d2-251747913 .color-AA4{color:#EDF0FD;} + .d2-251747913 .color-AA5{color:#F7F8FE;} + .d2-251747913 .color-AB4{color:#EDF0FD;} + .d2-251747913 .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}]]>UseridintPKparent_idintFKspouse_idintFKPetidintPKowner_idintFKCardidintPKowner_idintFKPostidintPKtextstringauthor_idintFKMetadataidintPKageintInfoidintPKcontentjson.RawMessage spouse children/parent/ancestorpets/ownercard/ownerposts/authormetadata/userinfo/user + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/ent2d2_right/dagre/board.exp.json b/e2etests/testdata/stable/ent2d2_right/dagre/board.exp.json index 120d47a63..298ceb0cf 100644 --- a/e2etests/testdata/stable/ent2d2_right/dagre/board.exp.json +++ b/e2etests/testdata/stable/ent2d2_right/dagre/board.exp.json @@ -10,7 +10,7 @@ "x": 0, "y": 231 }, - "width": 218, + "width": 201, "height": 144, "opacity": 1, "strokeDash": 0, @@ -141,10 +141,10 @@ "id": "Pet", "type": "sql_table", "pos": { - "x": 517, + "x": 500, "y": 0 }, - "width": 211, + "width": 194, "height": 108, "opacity": 1, "strokeDash": 0, @@ -245,10 +245,10 @@ "id": "Card", "type": "sql_table", "pos": { - "x": 517, + "x": 500, "y": 146 }, - "width": 211, + "width": 194, "height": 108, "opacity": 1, "strokeDash": 0, @@ -349,10 +349,10 @@ "id": "Post", "type": "sql_table", "pos": { - "x": 503, + "x": 486, "y": 274 }, - "width": 239, + "width": 222, "height": 144, "opacity": 1, "strokeDash": 0, @@ -481,10 +481,10 @@ "id": "Metadata", "type": "sql_table", "pos": { - "x": 541, + "x": 524, "y": 438 }, - "width": 163, + "width": 146, "height": 108, "opacity": 1, "strokeDash": 0, @@ -583,10 +583,10 @@ "id": "Info", "type": "sql_table", "pos": { - "x": 460, + "x": 443, "y": 584 }, - "width": 325, + "width": 308, "height": 108, "opacity": 1, "strokeDash": 0, @@ -708,11 +708,11 @@ "labelPercentage": 0, "route": [ { - "x": 52.67399978637695, + "x": 48.566001892089844, "y": 374.5 }, { - "x": 10.534000396728516, + "x": 9.713000297546387, "y": 428.3659973144531 }, { @@ -728,35 +728,35 @@ "y": 455.29998779296875 }, { - "x": 21.799999237060547, + "x": 20.100000381469727, "y": 462.0329895019531 }, { - "x": 54.5, + "x": 50.25, "y": 467.0830078125 }, { - "x": 87.19999694824219, + "x": 80.4000015258789, "y": 472.13299560546875 }, { - "x": 130.8000030517578, + "x": 120.5999984741211, "y": 472.13299560546875 }, { - "x": 163.5, + "x": 150.75, "y": 467.0830078125 }, { - "x": 196.1999969482422, + "x": 180.89999389648438, "y": 462.0329895019531 }, { - "x": 207.46499633789062, + "x": 191.28599548339844, "y": 428.3659973144531 }, { - "x": 165.3249969482422, + "x": 152.43299865722656, "y": 374.5 } ], @@ -791,11 +791,11 @@ "labelPercentage": 0, "route": [ { - "x": 80.63300323486328, + "x": 74.34500122070312, "y": 374.5 }, { - "x": 16.125999450683594, + "x": 14.869000434875488, "y": 538.2329711914062 }, { @@ -811,35 +811,35 @@ "y": 620.0999755859375 }, { - "x": 21.799999237060547, + "x": 20.100000381469727, "y": 640.5659790039062 }, { - "x": 54.5, + "x": 50.25, "y": 655.916015625 }, { - "x": 87.19999694824219, + "x": 80.4000015258789, "y": 671.2659912109375 }, { - "x": 130.8000030517578, + "x": 120.5999984741211, "y": 671.2659912109375 }, { - "x": 163.5, + "x": 150.75, "y": 655.916015625 }, { - "x": 196.1999969482422, + "x": 180.89999389648438, "y": 640.5659790039062 }, { - "x": 201.8730010986328, + "x": 186.1300048828125, "y": 538.2329711914062 }, { - "x": 137.36599731445312, + "x": 126.65399932861328, "y": 374.5 } ], @@ -874,19 +874,19 @@ "labelPercentage": 0, "route": [ { - "x": 175.63900756835938, + "x": 164.677001953125, "y": 230.5 }, { - "x": 306.3269958496094, + "x": 290.5350036621094, "y": 89.29900360107422 }, { - "x": 374.6000061035156, + "x": 357.6000061035156, "y": 54 }, { - "x": 517, + "x": 500, "y": 54 } ], @@ -921,19 +921,19 @@ "labelPercentage": 0, "route": [ { - "x": 218, - "y": 253.92300415039062 + "x": 201, + "y": 255.9929962158203 }, { - "x": 314.79998779296875, - "y": 210.78399658203125 + "x": 297.79998779296875, + "y": 211.197998046875 }, { - "x": 374.6000061035156, + "x": 357.6000061035156, "y": 200 }, { - "x": 517, + "x": 500, "y": 200 } ], @@ -968,19 +968,19 @@ "labelPercentage": 0, "route": [ { - "x": 218, - "y": 323.114990234375 + "x": 201, + "y": 322.23699951171875 }, { - "x": 314.79998779296875, - "y": 341.4230041503906 + "x": 297.79998779296875, + "y": 341.24700927734375 }, { - "x": 371.79998779296875, + "x": 354.79998779296875, "y": 346 }, { - "x": 503, + "x": 486, "y": 346 } ], @@ -1015,19 +1015,19 @@ "labelPercentage": 0, "route": [ { - "x": 197.38699340820312, + "x": 185.6580047607422, "y": 375.5 }, { - "x": 310.677001953125, + "x": 294.7309875488281, "y": 468.70001220703125 }, { - "x": 379.3999938964844, + "x": 362.3999938964844, "y": 492 }, { - "x": 541, + "x": 524, "y": 492 } ], @@ -1062,19 +1062,19 @@ "labelPercentage": 0, "route": [ { - "x": 158.35899353027344, + "x": 148.03500366210938, "y": 375.5 }, { - "x": 302.8710021972656, + "x": 287.2070007324219, "y": 585.5 }, { - "x": 363.20001220703125, + "x": 346.20001220703125, "y": 638 }, { - "x": 460, + "x": 443, "y": 638 } ], diff --git a/e2etests/testdata/stable/ent2d2_right/dagre/sketch.exp.svg b/e2etests/testdata/stable/ent2d2_right/dagre/sketch.exp.svg index 584add315..d182ca98a 100644 --- a/e2etests/testdata/stable/ent2d2_right/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/ent2d2_right/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -UseridintPKparent_idintFKspouse_idintFKPetidintPKowner_idintFKCardidintPKowner_idintFKPostidintPKtextstringauthor_idintFKMetadataidintPKageintInfoidintPKcontentjson.RawMessage spousespouse childrenparentyowhoaheypets/ownercard/ownerposts/authormetadata/userinfo/user - - - - - - - - + .d2-1563072179 .fill-N1{fill:#0A0F25;} + .d2-1563072179 .fill-N2{fill:#676C7E;} + .d2-1563072179 .fill-N3{fill:#9499AB;} + .d2-1563072179 .fill-N4{fill:#CFD2DD;} + .d2-1563072179 .fill-N5{fill:#DEE1EB;} + .d2-1563072179 .fill-N6{fill:#EEF1F8;} + .d2-1563072179 .fill-N7{fill:#FFFFFF;} + .d2-1563072179 .fill-B1{fill:#0D32B2;} + .d2-1563072179 .fill-B2{fill:#0D32B2;} + .d2-1563072179 .fill-B3{fill:#E3E9FD;} + .d2-1563072179 .fill-B4{fill:#E3E9FD;} + .d2-1563072179 .fill-B5{fill:#EDF0FD;} + .d2-1563072179 .fill-B6{fill:#F7F8FE;} + .d2-1563072179 .fill-AA2{fill:#4A6FF3;} + .d2-1563072179 .fill-AA4{fill:#EDF0FD;} + .d2-1563072179 .fill-AA5{fill:#F7F8FE;} + .d2-1563072179 .fill-AB4{fill:#EDF0FD;} + .d2-1563072179 .fill-AB5{fill:#F7F8FE;} + .d2-1563072179 .stroke-N1{stroke:#0A0F25;} + .d2-1563072179 .stroke-N2{stroke:#676C7E;} + .d2-1563072179 .stroke-N3{stroke:#9499AB;} + .d2-1563072179 .stroke-N4{stroke:#CFD2DD;} + .d2-1563072179 .stroke-N5{stroke:#DEE1EB;} + .d2-1563072179 .stroke-N6{stroke:#EEF1F8;} + .d2-1563072179 .stroke-N7{stroke:#FFFFFF;} + .d2-1563072179 .stroke-B1{stroke:#0D32B2;} + .d2-1563072179 .stroke-B2{stroke:#0D32B2;} + .d2-1563072179 .stroke-B3{stroke:#E3E9FD;} + .d2-1563072179 .stroke-B4{stroke:#E3E9FD;} + .d2-1563072179 .stroke-B5{stroke:#EDF0FD;} + .d2-1563072179 .stroke-B6{stroke:#F7F8FE;} + .d2-1563072179 .stroke-AA2{stroke:#4A6FF3;} + .d2-1563072179 .stroke-AA4{stroke:#EDF0FD;} + .d2-1563072179 .stroke-AA5{stroke:#F7F8FE;} + .d2-1563072179 .stroke-AB4{stroke:#EDF0FD;} + .d2-1563072179 .stroke-AB5{stroke:#F7F8FE;} + .d2-1563072179 .background-color-N1{background-color:#0A0F25;} + .d2-1563072179 .background-color-N2{background-color:#676C7E;} + .d2-1563072179 .background-color-N3{background-color:#9499AB;} + .d2-1563072179 .background-color-N4{background-color:#CFD2DD;} + .d2-1563072179 .background-color-N5{background-color:#DEE1EB;} + .d2-1563072179 .background-color-N6{background-color:#EEF1F8;} + .d2-1563072179 .background-color-N7{background-color:#FFFFFF;} + .d2-1563072179 .background-color-B1{background-color:#0D32B2;} + .d2-1563072179 .background-color-B2{background-color:#0D32B2;} + .d2-1563072179 .background-color-B3{background-color:#E3E9FD;} + .d2-1563072179 .background-color-B4{background-color:#E3E9FD;} + .d2-1563072179 .background-color-B5{background-color:#EDF0FD;} + .d2-1563072179 .background-color-B6{background-color:#F7F8FE;} + .d2-1563072179 .background-color-AA2{background-color:#4A6FF3;} + .d2-1563072179 .background-color-AA4{background-color:#EDF0FD;} + .d2-1563072179 .background-color-AA5{background-color:#F7F8FE;} + .d2-1563072179 .background-color-AB4{background-color:#EDF0FD;} + .d2-1563072179 .background-color-AB5{background-color:#F7F8FE;} + .d2-1563072179 .color-N1{color:#0A0F25;} + .d2-1563072179 .color-N2{color:#676C7E;} + .d2-1563072179 .color-N3{color:#9499AB;} + .d2-1563072179 .color-N4{color:#CFD2DD;} + .d2-1563072179 .color-N5{color:#DEE1EB;} + .d2-1563072179 .color-N6{color:#EEF1F8;} + .d2-1563072179 .color-N7{color:#FFFFFF;} + .d2-1563072179 .color-B1{color:#0D32B2;} + .d2-1563072179 .color-B2{color:#0D32B2;} + .d2-1563072179 .color-B3{color:#E3E9FD;} + .d2-1563072179 .color-B4{color:#E3E9FD;} + .d2-1563072179 .color-B5{color:#EDF0FD;} + .d2-1563072179 .color-B6{color:#F7F8FE;} + .d2-1563072179 .color-AA2{color:#4A6FF3;} + .d2-1563072179 .color-AA4{color:#EDF0FD;} + .d2-1563072179 .color-AA5{color:#F7F8FE;} + .d2-1563072179 .color-AB4{color:#EDF0FD;} + .d2-1563072179 .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}]]>UseridintPKparent_idintFKspouse_idintFKPetidintPKowner_idintFKCardidintPKowner_idintFKPostidintPKtextstringauthor_idintFKMetadataidintPKageintInfoidintPKcontentjson.RawMessage spousespouse childrenparentyowhoaheypets/ownercard/ownerposts/authormetadata/userinfo/user + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/ent2d2_right/elk/board.exp.json b/e2etests/testdata/stable/ent2d2_right/elk/board.exp.json index aea57d64d..31085175a 100644 --- a/e2etests/testdata/stable/ent2d2_right/elk/board.exp.json +++ b/e2etests/testdata/stable/ent2d2_right/elk/board.exp.json @@ -10,7 +10,7 @@ "x": 12, "y": 200 }, - "width": 218, + "width": 201, "height": 280, "opacity": 1, "strokeDash": 0, @@ -141,10 +141,10 @@ "id": "Pet", "type": "sql_table", "pos": { - "x": 531, + "x": 514, "y": 12 }, - "width": 211, + "width": 194, "height": 108, "opacity": 1, "strokeDash": 0, @@ -245,10 +245,10 @@ "id": "Card", "type": "sql_table", "pos": { - "x": 531, + "x": 514, "y": 140 }, - "width": 211, + "width": 194, "height": 108, "opacity": 1, "strokeDash": 0, @@ -349,10 +349,10 @@ "id": "Post", "type": "sql_table", "pos": { - "x": 531, + "x": 514, "y": 268 }, - "width": 239, + "width": 222, "height": 144, "opacity": 1, "strokeDash": 0, @@ -481,10 +481,10 @@ "id": "Metadata", "type": "sql_table", "pos": { - "x": 531, + "x": 514, "y": 432 }, - "width": 163, + "width": 146, "height": 108, "opacity": 1, "strokeDash": 0, @@ -583,10 +583,10 @@ "id": "Info", "type": "sql_table", "pos": { - "x": 531, + "x": 514, "y": 560 }, - "width": 325, + "width": 308, "height": 108, "opacity": 1, "strokeDash": 0, @@ -708,19 +708,19 @@ "labelPercentage": 0, "route": [ { - "x": 84.66600036621094, + "x": 79, "y": 200 }, { - "x": 84.66600036621094, + "x": 79, "y": 150 }, { - "x": 157.33299255371094, + "x": 146, "y": 150 }, { - "x": 157.33299255371094, + "x": 146, "y": 200 } ], @@ -754,19 +754,19 @@ "labelPercentage": 0, "route": [ { - "x": 157.33299255371094, + "x": 146, "y": 480 }, { - "x": 157.33299255371094, + "x": 146, "y": 530 }, { - "x": 84.66600036621094, + "x": 79, "y": 530 }, { - "x": 84.66600036621094, + "x": 79, "y": 480 } ], @@ -800,19 +800,19 @@ "labelPercentage": 0, "route": [ { - "x": 230, + "x": 213, "y": 246.66600036621094 }, { - "x": 270, + "x": 253, "y": 246.66600036621094 }, { - "x": 270, + "x": 253, "y": 66 }, { - "x": 531, + "x": 514, "y": 66 } ], @@ -846,19 +846,19 @@ "labelPercentage": 0, "route": [ { - "x": 230, + "x": 213, "y": 293.3330078125 }, { - "x": 320, + "x": 303, "y": 293.3330078125 }, { - "x": 320, + "x": 303, "y": 194 }, { - "x": 531, + "x": 514, "y": 194 } ], @@ -892,11 +892,11 @@ "labelPercentage": 0, "route": [ { - "x": 230, + "x": 213, "y": 340 }, { - "x": 531, + "x": 514, "y": 340 } ], @@ -930,19 +930,19 @@ "labelPercentage": 0, "route": [ { - "x": 230, + "x": 213, "y": 386.6659851074219 }, { - "x": 320, + "x": 303, "y": 386.6659851074219 }, { - "x": 320, + "x": 303, "y": 486 }, { - "x": 531, + "x": 514, "y": 486 } ], @@ -976,19 +976,19 @@ "labelPercentage": 0, "route": [ { - "x": 230, + "x": 213, "y": 433.3330078125 }, { - "x": 270, + "x": 253, "y": 433.3330078125 }, { - "x": 270, + "x": 253, "y": 614 }, { - "x": 531, + "x": 514, "y": 614 } ], diff --git a/e2etests/testdata/stable/ent2d2_right/elk/sketch.exp.svg b/e2etests/testdata/stable/ent2d2_right/elk/sketch.exp.svg index c4891ae55..81af2dbf5 100644 --- a/e2etests/testdata/stable/ent2d2_right/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/ent2d2_right/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -UseridintPKparent_idintFKspouse_idintFKPetidintPKowner_idintFKCardidintPKowner_idintFKPostidintPKtextstringauthor_idintFKMetadataidintPKageintInfoidintPKcontentjson.RawMessage spousespouse childrenparentyowhoaheypets/ownercard/ownerposts/authormetadata/userinfo/user - - - - - - - - + .d2-3400051897 .fill-N1{fill:#0A0F25;} + .d2-3400051897 .fill-N2{fill:#676C7E;} + .d2-3400051897 .fill-N3{fill:#9499AB;} + .d2-3400051897 .fill-N4{fill:#CFD2DD;} + .d2-3400051897 .fill-N5{fill:#DEE1EB;} + .d2-3400051897 .fill-N6{fill:#EEF1F8;} + .d2-3400051897 .fill-N7{fill:#FFFFFF;} + .d2-3400051897 .fill-B1{fill:#0D32B2;} + .d2-3400051897 .fill-B2{fill:#0D32B2;} + .d2-3400051897 .fill-B3{fill:#E3E9FD;} + .d2-3400051897 .fill-B4{fill:#E3E9FD;} + .d2-3400051897 .fill-B5{fill:#EDF0FD;} + .d2-3400051897 .fill-B6{fill:#F7F8FE;} + .d2-3400051897 .fill-AA2{fill:#4A6FF3;} + .d2-3400051897 .fill-AA4{fill:#EDF0FD;} + .d2-3400051897 .fill-AA5{fill:#F7F8FE;} + .d2-3400051897 .fill-AB4{fill:#EDF0FD;} + .d2-3400051897 .fill-AB5{fill:#F7F8FE;} + .d2-3400051897 .stroke-N1{stroke:#0A0F25;} + .d2-3400051897 .stroke-N2{stroke:#676C7E;} + .d2-3400051897 .stroke-N3{stroke:#9499AB;} + .d2-3400051897 .stroke-N4{stroke:#CFD2DD;} + .d2-3400051897 .stroke-N5{stroke:#DEE1EB;} + .d2-3400051897 .stroke-N6{stroke:#EEF1F8;} + .d2-3400051897 .stroke-N7{stroke:#FFFFFF;} + .d2-3400051897 .stroke-B1{stroke:#0D32B2;} + .d2-3400051897 .stroke-B2{stroke:#0D32B2;} + .d2-3400051897 .stroke-B3{stroke:#E3E9FD;} + .d2-3400051897 .stroke-B4{stroke:#E3E9FD;} + .d2-3400051897 .stroke-B5{stroke:#EDF0FD;} + .d2-3400051897 .stroke-B6{stroke:#F7F8FE;} + .d2-3400051897 .stroke-AA2{stroke:#4A6FF3;} + .d2-3400051897 .stroke-AA4{stroke:#EDF0FD;} + .d2-3400051897 .stroke-AA5{stroke:#F7F8FE;} + .d2-3400051897 .stroke-AB4{stroke:#EDF0FD;} + .d2-3400051897 .stroke-AB5{stroke:#F7F8FE;} + .d2-3400051897 .background-color-N1{background-color:#0A0F25;} + .d2-3400051897 .background-color-N2{background-color:#676C7E;} + .d2-3400051897 .background-color-N3{background-color:#9499AB;} + .d2-3400051897 .background-color-N4{background-color:#CFD2DD;} + .d2-3400051897 .background-color-N5{background-color:#DEE1EB;} + .d2-3400051897 .background-color-N6{background-color:#EEF1F8;} + .d2-3400051897 .background-color-N7{background-color:#FFFFFF;} + .d2-3400051897 .background-color-B1{background-color:#0D32B2;} + .d2-3400051897 .background-color-B2{background-color:#0D32B2;} + .d2-3400051897 .background-color-B3{background-color:#E3E9FD;} + .d2-3400051897 .background-color-B4{background-color:#E3E9FD;} + .d2-3400051897 .background-color-B5{background-color:#EDF0FD;} + .d2-3400051897 .background-color-B6{background-color:#F7F8FE;} + .d2-3400051897 .background-color-AA2{background-color:#4A6FF3;} + .d2-3400051897 .background-color-AA4{background-color:#EDF0FD;} + .d2-3400051897 .background-color-AA5{background-color:#F7F8FE;} + .d2-3400051897 .background-color-AB4{background-color:#EDF0FD;} + .d2-3400051897 .background-color-AB5{background-color:#F7F8FE;} + .d2-3400051897 .color-N1{color:#0A0F25;} + .d2-3400051897 .color-N2{color:#676C7E;} + .d2-3400051897 .color-N3{color:#9499AB;} + .d2-3400051897 .color-N4{color:#CFD2DD;} + .d2-3400051897 .color-N5{color:#DEE1EB;} + .d2-3400051897 .color-N6{color:#EEF1F8;} + .d2-3400051897 .color-N7{color:#FFFFFF;} + .d2-3400051897 .color-B1{color:#0D32B2;} + .d2-3400051897 .color-B2{color:#0D32B2;} + .d2-3400051897 .color-B3{color:#E3E9FD;} + .d2-3400051897 .color-B4{color:#E3E9FD;} + .d2-3400051897 .color-B5{color:#EDF0FD;} + .d2-3400051897 .color-B6{color:#F7F8FE;} + .d2-3400051897 .color-AA2{color:#4A6FF3;} + .d2-3400051897 .color-AA4{color:#EDF0FD;} + .d2-3400051897 .color-AA5{color:#F7F8FE;} + .d2-3400051897 .color-AB4{color:#EDF0FD;} + .d2-3400051897 .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}]]>UseridintPKparent_idintFKspouse_idintFKPetidintPKowner_idintFKCardidintPKowner_idintFKPostidintPKtextstringauthor_idintFKMetadataidintPKageintInfoidintPKcontentjson.RawMessage spousespouse childrenparentyowhoaheypets/ownercard/ownerposts/authormetadata/userinfo/user + + + + + + + + \ No newline at end of file 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 a3edaee99..cbe4669c2 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 @@ -114,7 +114,7 @@ b := a + 7 fmt.Printf("%d", b)a := 5 b := a + 7 -fmt.Printf("%d", b)cyldiadocssix cornersa random iconoverpackdocs pagetoohard o saysinglepersona queuea squarea step at a timedatausersidintnamevarchar result := callThisFunction(obj, 5) midthis sideother side +fmt.Printf("%d", b)cyldiadocssix cornersa random iconoverpackdocs pagetoohard o saysinglepersona queuea squarea step at a timedatausersidintnamevarchar result := callThisFunction(obj, 5) midthis sideother side diff --git a/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/sketch.exp.svg index a3edaee99..cbe4669c2 100644 --- a/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/sketch.exp.svg @@ -114,7 +114,7 @@ b := a + 7 fmt.Printf("%d", b)a := 5 b := a + 7 -fmt.Printf("%d", b)cyldiadocssix cornersa random iconoverpackdocs pagetoohard o saysinglepersona queuea squarea step at a timedatausersidintnamevarchar result := callThisFunction(obj, 5) midthis sideother side +fmt.Printf("%d", b)cyldiadocssix cornersa random iconoverpackdocs pagetoohard o saysinglepersona queuea squarea step at a timedatausersidintnamevarchar result := callThisFunction(obj, 5) midthis sideother side diff --git a/e2etests/testdata/stable/sql_table_column_styles/dagre/sketch.exp.svg b/e2etests/testdata/stable/sql_table_column_styles/dagre/sketch.exp.svg index 99efadac6..567e6c4ff 100644 --- a/e2etests/testdata/stable/sql_table_column_styles/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sql_table_column_styles/dagre/sketch.exp.svg @@ -96,7 +96,7 @@ .d2-4052321575 .color-AA4{color:#EDF0FD;} .d2-4052321575 .color-AA5{color:#F7F8FE;} .d2-4052321575 .color-AB4{color:#EDF0FD;} - .d2-4052321575 .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}]]>Humor in the CourtCould you see him from where you were standing?I could see his head.And where was his head?Just above his shoulders.Humor in the Court2Could you see him from where you were standing?I could see his head.And where was his head?Just above his shoulders.BatchManager-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voidBatchManager-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)void + .d2-4052321575 .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}]]>Humor in the CourtCould you see him from where you were standing?I could see his head.And where was his head?Just above his shoulders.Humor in the Court2Could you see him from where you were standing?I could see his head.And where was his head?Just above his shoulders.BatchManager-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voidBatchManager-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)void \ No newline at end of file diff --git a/e2etests/testdata/stable/sql_table_column_styles/elk/sketch.exp.svg b/e2etests/testdata/stable/sql_table_column_styles/elk/sketch.exp.svg index bfc92d078..40ba626b5 100644 --- a/e2etests/testdata/stable/sql_table_column_styles/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sql_table_column_styles/elk/sketch.exp.svg @@ -96,7 +96,7 @@ .d2-2628520825 .color-AA4{color:#EDF0FD;} .d2-2628520825 .color-AA5{color:#F7F8FE;} .d2-2628520825 .color-AB4{color:#EDF0FD;} - .d2-2628520825 .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}]]>Humor in the CourtCould you see him from where you were standing?I could see his head.And where was his head?Just above his shoulders.Humor in the Court2Could you see him from where you were standing?I could see his head.And where was his head?Just above his shoulders.BatchManager-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voidBatchManager-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)void + .d2-2628520825 .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}]]>Humor in the CourtCould you see him from where you were standing?I could see his head.And where was his head?Just above his shoulders.Humor in the Court2Could you see him from where you were standing?I could see his head.And where was his head?Just above his shoulders.BatchManager-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voidBatchManager-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)void \ No newline at end of file diff --git a/e2etests/testdata/stable/sql_table_constraints_width/dagre/board.exp.json b/e2etests/testdata/stable/sql_table_constraints_width/dagre/board.exp.json index 07f1bd9f4..b407c93a4 100644 --- a/e2etests/testdata/stable/sql_table_constraints_width/dagre/board.exp.json +++ b/e2etests/testdata/stable/sql_table_constraints_width/dagre/board.exp.json @@ -8,9 +8,9 @@ "type": "sql_table", "pos": { "x": 0, - "y": 0 + "y": 36 }, - "width": 148, + "width": 146, "height": 72, "opacity": 1, "strokeDash": 0, @@ -81,10 +81,10 @@ "id": "b", "type": "sql_table", "pos": { - "x": 208, - "y": 0 + "x": 206, + "y": 36 }, - "width": 188, + "width": 161, "height": 72, "opacity": 1, "strokeDash": 0, @@ -156,10 +156,10 @@ "id": "c", "type": "sql_table", "pos": { - "x": 456, - "y": 0 + "x": 427, + "y": 36 }, - "width": 188, + "width": 177, "height": 72, "opacity": 1, "strokeDash": 0, @@ -231,10 +231,10 @@ "id": "d", "type": "sql_table", "pos": { - "x": 704, - "y": 0 + "x": 664, + "y": 36 }, - "width": 228, + "width": 209, "height": 72, "opacity": 1, "strokeDash": 0, @@ -302,6 +302,212 @@ "primaryAccentColor": "B2", "secondaryAccentColor": "AA2", "neutralAccentColor": "N2" + }, + { + "id": "e", + "type": "sql_table", + "pos": { + "x": 933, + "y": 0 + }, + "width": 312, + "height": 144, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N1", + "stroke": "N7", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": [ + { + "name": { + "label": "x", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 9, + "labelHeight": 26 + }, + "type": { + "label": "INT", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 29, + "labelHeight": 26 + }, + "constraint": [ + "no_abbrev", + "foreign_key", + "hello" + ], + "reference": "" + }, + { + "name": { + "label": "y", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 10, + "labelHeight": 26 + }, + "type": { + "label": "string", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 48, + "labelHeight": 26 + }, + "constraint": null, + "reference": "" + }, + { + "name": { + "label": "z", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 8, + "labelHeight": 26 + }, + "type": { + "label": "STRING", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 62, + "labelHeight": 26 + }, + "constraint": [ + "yo" + ], + "reference": "" + } + ], + "label": "e", + "fontSize": 20, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 12, + "labelHeight": 31, + "zIndex": 0, + "level": 1, + "primaryAccentColor": "B2", + "secondaryAccentColor": "AA2", + "neutralAccentColor": "N2" + }, + { + "id": "f", + "type": "sql_table", + "pos": { + "x": 1305, + "y": 36 + }, + "width": 88, + "height": 72, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N1", + "stroke": "N7", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": [ + { + "name": { + "label": "x", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 9, + "labelHeight": 26 + }, + "type": { + "label": "INT", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 29, + "labelHeight": 26 + }, + "constraint": null, + "reference": "" + } + ], + "label": "f", + "fontSize": 20, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 9, + "labelHeight": 31, + "zIndex": 0, + "level": 1, + "primaryAccentColor": "B2", + "secondaryAccentColor": "AA2", + "neutralAccentColor": "N2" } ], "connections": [], diff --git a/e2etests/testdata/stable/sql_table_constraints_width/dagre/sketch.exp.svg b/e2etests/testdata/stable/sql_table_constraints_width/dagre/sketch.exp.svg index 8c24e4b53..b7f668c83 100644 --- a/e2etests/testdata/stable/sql_table_constraints_width/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sql_table_constraints_width/dagre/sketch.exp.svg @@ -1,10 +1,10 @@ -axINTUNQbxINTPK, FKcxINTFK, UNQdxINTPK, FK, UNQ - + .d2-920723958 .fill-N1{fill:#0A0F25;} + .d2-920723958 .fill-N2{fill:#676C7E;} + .d2-920723958 .fill-N3{fill:#9499AB;} + .d2-920723958 .fill-N4{fill:#CFD2DD;} + .d2-920723958 .fill-N5{fill:#DEE1EB;} + .d2-920723958 .fill-N6{fill:#EEF1F8;} + .d2-920723958 .fill-N7{fill:#FFFFFF;} + .d2-920723958 .fill-B1{fill:#0D32B2;} + .d2-920723958 .fill-B2{fill:#0D32B2;} + .d2-920723958 .fill-B3{fill:#E3E9FD;} + .d2-920723958 .fill-B4{fill:#E3E9FD;} + .d2-920723958 .fill-B5{fill:#EDF0FD;} + .d2-920723958 .fill-B6{fill:#F7F8FE;} + .d2-920723958 .fill-AA2{fill:#4A6FF3;} + .d2-920723958 .fill-AA4{fill:#EDF0FD;} + .d2-920723958 .fill-AA5{fill:#F7F8FE;} + .d2-920723958 .fill-AB4{fill:#EDF0FD;} + .d2-920723958 .fill-AB5{fill:#F7F8FE;} + .d2-920723958 .stroke-N1{stroke:#0A0F25;} + .d2-920723958 .stroke-N2{stroke:#676C7E;} + .d2-920723958 .stroke-N3{stroke:#9499AB;} + .d2-920723958 .stroke-N4{stroke:#CFD2DD;} + .d2-920723958 .stroke-N5{stroke:#DEE1EB;} + .d2-920723958 .stroke-N6{stroke:#EEF1F8;} + .d2-920723958 .stroke-N7{stroke:#FFFFFF;} + .d2-920723958 .stroke-B1{stroke:#0D32B2;} + .d2-920723958 .stroke-B2{stroke:#0D32B2;} + .d2-920723958 .stroke-B3{stroke:#E3E9FD;} + .d2-920723958 .stroke-B4{stroke:#E3E9FD;} + .d2-920723958 .stroke-B5{stroke:#EDF0FD;} + .d2-920723958 .stroke-B6{stroke:#F7F8FE;} + .d2-920723958 .stroke-AA2{stroke:#4A6FF3;} + .d2-920723958 .stroke-AA4{stroke:#EDF0FD;} + .d2-920723958 .stroke-AA5{stroke:#F7F8FE;} + .d2-920723958 .stroke-AB4{stroke:#EDF0FD;} + .d2-920723958 .stroke-AB5{stroke:#F7F8FE;} + .d2-920723958 .background-color-N1{background-color:#0A0F25;} + .d2-920723958 .background-color-N2{background-color:#676C7E;} + .d2-920723958 .background-color-N3{background-color:#9499AB;} + .d2-920723958 .background-color-N4{background-color:#CFD2DD;} + .d2-920723958 .background-color-N5{background-color:#DEE1EB;} + .d2-920723958 .background-color-N6{background-color:#EEF1F8;} + .d2-920723958 .background-color-N7{background-color:#FFFFFF;} + .d2-920723958 .background-color-B1{background-color:#0D32B2;} + .d2-920723958 .background-color-B2{background-color:#0D32B2;} + .d2-920723958 .background-color-B3{background-color:#E3E9FD;} + .d2-920723958 .background-color-B4{background-color:#E3E9FD;} + .d2-920723958 .background-color-B5{background-color:#EDF0FD;} + .d2-920723958 .background-color-B6{background-color:#F7F8FE;} + .d2-920723958 .background-color-AA2{background-color:#4A6FF3;} + .d2-920723958 .background-color-AA4{background-color:#EDF0FD;} + .d2-920723958 .background-color-AA5{background-color:#F7F8FE;} + .d2-920723958 .background-color-AB4{background-color:#EDF0FD;} + .d2-920723958 .background-color-AB5{background-color:#F7F8FE;} + .d2-920723958 .color-N1{color:#0A0F25;} + .d2-920723958 .color-N2{color:#676C7E;} + .d2-920723958 .color-N3{color:#9499AB;} + .d2-920723958 .color-N4{color:#CFD2DD;} + .d2-920723958 .color-N5{color:#DEE1EB;} + .d2-920723958 .color-N6{color:#EEF1F8;} + .d2-920723958 .color-N7{color:#FFFFFF;} + .d2-920723958 .color-B1{color:#0D32B2;} + .d2-920723958 .color-B2{color:#0D32B2;} + .d2-920723958 .color-B3{color:#E3E9FD;} + .d2-920723958 .color-B4{color:#E3E9FD;} + .d2-920723958 .color-B5{color:#EDF0FD;} + .d2-920723958 .color-B6{color:#F7F8FE;} + .d2-920723958 .color-AA2{color:#4A6FF3;} + .d2-920723958 .color-AA4{color:#EDF0FD;} + .d2-920723958 .color-AA5{color:#F7F8FE;} + .d2-920723958 .color-AB4{color:#EDF0FD;} + .d2-920723958 .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}]]>axINTUNQbxINTPK, FKcxINTFK, UNQdxINTPK, FK, UNQexINTno_abbrev, FK, helloystringzSTRINGyofxINT + \ No newline at end of file diff --git a/e2etests/testdata/stable/sql_table_constraints_width/elk/board.exp.json b/e2etests/testdata/stable/sql_table_constraints_width/elk/board.exp.json index e30fede94..5717ef2fb 100644 --- a/e2etests/testdata/stable/sql_table_constraints_width/elk/board.exp.json +++ b/e2etests/testdata/stable/sql_table_constraints_width/elk/board.exp.json @@ -8,9 +8,9 @@ "type": "sql_table", "pos": { "x": 12, - "y": 12 + "y": 48 }, - "width": 148, + "width": 146, "height": 72, "opacity": 1, "strokeDash": 0, @@ -81,10 +81,10 @@ "id": "b", "type": "sql_table", "pos": { - "x": 180, - "y": 12 + "x": 178, + "y": 48 }, - "width": 188, + "width": 161, "height": 72, "opacity": 1, "strokeDash": 0, @@ -156,10 +156,10 @@ "id": "c", "type": "sql_table", "pos": { - "x": 388, - "y": 12 + "x": 359, + "y": 48 }, - "width": 188, + "width": 177, "height": 72, "opacity": 1, "strokeDash": 0, @@ -231,10 +231,10 @@ "id": "d", "type": "sql_table", "pos": { - "x": 596, - "y": 12 + "x": 556, + "y": 48 }, - "width": 228, + "width": 209, "height": 72, "opacity": 1, "strokeDash": 0, @@ -302,6 +302,212 @@ "primaryAccentColor": "B2", "secondaryAccentColor": "AA2", "neutralAccentColor": "N2" + }, + { + "id": "e", + "type": "sql_table", + "pos": { + "x": 785, + "y": 12 + }, + "width": 312, + "height": 144, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N1", + "stroke": "N7", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": [ + { + "name": { + "label": "x", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 9, + "labelHeight": 26 + }, + "type": { + "label": "INT", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 29, + "labelHeight": 26 + }, + "constraint": [ + "no_abbrev", + "foreign_key", + "hello" + ], + "reference": "" + }, + { + "name": { + "label": "y", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 10, + "labelHeight": 26 + }, + "type": { + "label": "string", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 48, + "labelHeight": 26 + }, + "constraint": null, + "reference": "" + }, + { + "name": { + "label": "z", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 8, + "labelHeight": 26 + }, + "type": { + "label": "STRING", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 62, + "labelHeight": 26 + }, + "constraint": [ + "yo" + ], + "reference": "" + } + ], + "label": "e", + "fontSize": 20, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 12, + "labelHeight": 31, + "zIndex": 0, + "level": 1, + "primaryAccentColor": "B2", + "secondaryAccentColor": "AA2", + "neutralAccentColor": "N2" + }, + { + "id": "f", + "type": "sql_table", + "pos": { + "x": 1117, + "y": 48 + }, + "width": 88, + "height": 72, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N1", + "stroke": "N7", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": [ + { + "name": { + "label": "x", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 9, + "labelHeight": 26 + }, + "type": { + "label": "INT", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 29, + "labelHeight": 26 + }, + "constraint": null, + "reference": "" + } + ], + "label": "f", + "fontSize": 20, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 9, + "labelHeight": 31, + "zIndex": 0, + "level": 1, + "primaryAccentColor": "B2", + "secondaryAccentColor": "AA2", + "neutralAccentColor": "N2" } ], "connections": [], diff --git a/e2etests/testdata/stable/sql_table_constraints_width/elk/sketch.exp.svg b/e2etests/testdata/stable/sql_table_constraints_width/elk/sketch.exp.svg index 37fd18125..6928b2ad5 100644 --- a/e2etests/testdata/stable/sql_table_constraints_width/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sql_table_constraints_width/elk/sketch.exp.svg @@ -1,10 +1,10 @@ -axINTUNQbxINTPK, FKcxINTFK, UNQdxINTPK, FK, UNQ - + .d2-1097315437 .fill-N1{fill:#0A0F25;} + .d2-1097315437 .fill-N2{fill:#676C7E;} + .d2-1097315437 .fill-N3{fill:#9499AB;} + .d2-1097315437 .fill-N4{fill:#CFD2DD;} + .d2-1097315437 .fill-N5{fill:#DEE1EB;} + .d2-1097315437 .fill-N6{fill:#EEF1F8;} + .d2-1097315437 .fill-N7{fill:#FFFFFF;} + .d2-1097315437 .fill-B1{fill:#0D32B2;} + .d2-1097315437 .fill-B2{fill:#0D32B2;} + .d2-1097315437 .fill-B3{fill:#E3E9FD;} + .d2-1097315437 .fill-B4{fill:#E3E9FD;} + .d2-1097315437 .fill-B5{fill:#EDF0FD;} + .d2-1097315437 .fill-B6{fill:#F7F8FE;} + .d2-1097315437 .fill-AA2{fill:#4A6FF3;} + .d2-1097315437 .fill-AA4{fill:#EDF0FD;} + .d2-1097315437 .fill-AA5{fill:#F7F8FE;} + .d2-1097315437 .fill-AB4{fill:#EDF0FD;} + .d2-1097315437 .fill-AB5{fill:#F7F8FE;} + .d2-1097315437 .stroke-N1{stroke:#0A0F25;} + .d2-1097315437 .stroke-N2{stroke:#676C7E;} + .d2-1097315437 .stroke-N3{stroke:#9499AB;} + .d2-1097315437 .stroke-N4{stroke:#CFD2DD;} + .d2-1097315437 .stroke-N5{stroke:#DEE1EB;} + .d2-1097315437 .stroke-N6{stroke:#EEF1F8;} + .d2-1097315437 .stroke-N7{stroke:#FFFFFF;} + .d2-1097315437 .stroke-B1{stroke:#0D32B2;} + .d2-1097315437 .stroke-B2{stroke:#0D32B2;} + .d2-1097315437 .stroke-B3{stroke:#E3E9FD;} + .d2-1097315437 .stroke-B4{stroke:#E3E9FD;} + .d2-1097315437 .stroke-B5{stroke:#EDF0FD;} + .d2-1097315437 .stroke-B6{stroke:#F7F8FE;} + .d2-1097315437 .stroke-AA2{stroke:#4A6FF3;} + .d2-1097315437 .stroke-AA4{stroke:#EDF0FD;} + .d2-1097315437 .stroke-AA5{stroke:#F7F8FE;} + .d2-1097315437 .stroke-AB4{stroke:#EDF0FD;} + .d2-1097315437 .stroke-AB5{stroke:#F7F8FE;} + .d2-1097315437 .background-color-N1{background-color:#0A0F25;} + .d2-1097315437 .background-color-N2{background-color:#676C7E;} + .d2-1097315437 .background-color-N3{background-color:#9499AB;} + .d2-1097315437 .background-color-N4{background-color:#CFD2DD;} + .d2-1097315437 .background-color-N5{background-color:#DEE1EB;} + .d2-1097315437 .background-color-N6{background-color:#EEF1F8;} + .d2-1097315437 .background-color-N7{background-color:#FFFFFF;} + .d2-1097315437 .background-color-B1{background-color:#0D32B2;} + .d2-1097315437 .background-color-B2{background-color:#0D32B2;} + .d2-1097315437 .background-color-B3{background-color:#E3E9FD;} + .d2-1097315437 .background-color-B4{background-color:#E3E9FD;} + .d2-1097315437 .background-color-B5{background-color:#EDF0FD;} + .d2-1097315437 .background-color-B6{background-color:#F7F8FE;} + .d2-1097315437 .background-color-AA2{background-color:#4A6FF3;} + .d2-1097315437 .background-color-AA4{background-color:#EDF0FD;} + .d2-1097315437 .background-color-AA5{background-color:#F7F8FE;} + .d2-1097315437 .background-color-AB4{background-color:#EDF0FD;} + .d2-1097315437 .background-color-AB5{background-color:#F7F8FE;} + .d2-1097315437 .color-N1{color:#0A0F25;} + .d2-1097315437 .color-N2{color:#676C7E;} + .d2-1097315437 .color-N3{color:#9499AB;} + .d2-1097315437 .color-N4{color:#CFD2DD;} + .d2-1097315437 .color-N5{color:#DEE1EB;} + .d2-1097315437 .color-N6{color:#EEF1F8;} + .d2-1097315437 .color-N7{color:#FFFFFF;} + .d2-1097315437 .color-B1{color:#0D32B2;} + .d2-1097315437 .color-B2{color:#0D32B2;} + .d2-1097315437 .color-B3{color:#E3E9FD;} + .d2-1097315437 .color-B4{color:#E3E9FD;} + .d2-1097315437 .color-B5{color:#EDF0FD;} + .d2-1097315437 .color-B6{color:#F7F8FE;} + .d2-1097315437 .color-AA2{color:#4A6FF3;} + .d2-1097315437 .color-AA4{color:#EDF0FD;} + .d2-1097315437 .color-AA5{color:#F7F8FE;} + .d2-1097315437 .color-AB4{color:#EDF0FD;} + .d2-1097315437 .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}]]>axINTUNQbxINTPK, FKcxINTFK, UNQdxINTPK, FK, UNQexINTno_abbrev, FK, helloystringzSTRINGyofxINT + \ No newline at end of file diff --git a/e2etests/testdata/stable/sql_table_tooltip_animated/dagre/sketch.exp.svg b/e2etests/testdata/stable/sql_table_tooltip_animated/dagre/sketch.exp.svg index 5a22d0c87..beb7da117 100644 --- a/e2etests/testdata/stable/sql_table_tooltip_animated/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sql_table_tooltip_animated/dagre/sketch.exp.svg @@ -98,7 +98,7 @@ .d2-3227093269 .color-AA4{color:#EDF0FD;} .d2-3227093269 .color-AA5{color:#F7F8FE;} .d2-3227093269 .color-AB4{color:#EDF0FD;} - .d2-3227093269 .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}]]>xy + .d2-3227093269 .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}]]>xy @@ -111,7 +111,7 @@ -I like turtlesab +I like turtlesab \ No newline at end of file diff --git a/e2etests/testdata/stable/sql_table_tooltip_animated/elk/sketch.exp.svg b/e2etests/testdata/stable/sql_table_tooltip_animated/elk/sketch.exp.svg index f4289ad69..743c80c1c 100644 --- a/e2etests/testdata/stable/sql_table_tooltip_animated/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sql_table_tooltip_animated/elk/sketch.exp.svg @@ -98,7 +98,7 @@ .d2-514706804 .color-AA4{color:#EDF0FD;} .d2-514706804 .color-AA5{color:#F7F8FE;} .d2-514706804 .color-AB4{color:#EDF0FD;} - .d2-514706804 .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}]]>xy + .d2-514706804 .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}]]>xy @@ -111,7 +111,7 @@ -I like turtlesab +I like turtlesab \ No newline at end of file diff --git a/e2etests/testdata/stable/sql_tables/dagre/board.exp.json b/e2etests/testdata/stable/sql_tables/dagre/board.exp.json index a108d914d..c400a4c67 100644 --- a/e2etests/testdata/stable/sql_tables/dagre/board.exp.json +++ b/e2etests/testdata/stable/sql_tables/dagre/board.exp.json @@ -10,7 +10,7 @@ "x": 0, "y": 0 }, - "width": 268, + "width": 251, "height": 216, "opacity": 1, "strokeDash": 0, @@ -193,7 +193,7 @@ "id": "products", "type": "sql_table", "pos": { - "x": 328, + "x": 311, "y": 18 }, "width": 164, @@ -349,7 +349,7 @@ "id": "orders", "type": "sql_table", "pos": { - "x": 328, + "x": 311, "y": 316 }, "width": 164, @@ -477,7 +477,7 @@ "id": "shipments", "type": "sql_table", "pos": { - "x": 552, + "x": 535, "y": 18 }, "width": 244, @@ -656,20 +656,20 @@ "labelPercentage": 0, "route": [ { - "x": 134, + "x": 125.5, "y": 216 }, { - "x": 134, + "x": 125.5, "y": 256 }, { - "x": 172.8000030517578, - "y": 283.20001220703125 + "x": 162.6999969482422, + "y": 283 }, { - "x": 328, - "y": 352 + "x": 311.5, + "y": 351 } ], "isCurve": true, @@ -703,19 +703,19 @@ "labelPercentage": 0, "route": [ { - "x": 410, + "x": 393, "y": 198 }, { - "x": 410, + "x": 393, "y": 252.39999389648438 }, { - "x": 410, + "x": 393, "y": 276 }, { - "x": 410, + "x": 393, "y": 316 } ], @@ -750,19 +750,19 @@ "labelPercentage": 0, "route": [ { - "x": 674, + "x": 657, "y": 198 }, { - "x": 674, + "x": 657, "y": 252.39999389648438 }, { - "x": 637.5999755859375, + "x": 620.5999755859375, "y": 282.79998779296875 }, { - "x": 492, + "x": 475, "y": 350 } ], diff --git a/e2etests/testdata/stable/sql_tables/dagre/sketch.exp.svg b/e2etests/testdata/stable/sql_tables/dagre/sketch.exp.svg index babe59c83..695ba85a1 100644 --- a/e2etests/testdata/stable/sql_tables/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sql_tables/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -usersidintnamestringemailstringpasswordstringlast_logindatetimePKproductsidintpricedecimalskustringnamestringordersidintuser_idintproduct_idintshipmentsidintorder_idinttracking_numberstringstatusstring - + .d2-995024594 .fill-N1{fill:#0A0F25;} + .d2-995024594 .fill-N2{fill:#676C7E;} + .d2-995024594 .fill-N3{fill:#9499AB;} + .d2-995024594 .fill-N4{fill:#CFD2DD;} + .d2-995024594 .fill-N5{fill:#DEE1EB;} + .d2-995024594 .fill-N6{fill:#EEF1F8;} + .d2-995024594 .fill-N7{fill:#FFFFFF;} + .d2-995024594 .fill-B1{fill:#0D32B2;} + .d2-995024594 .fill-B2{fill:#0D32B2;} + .d2-995024594 .fill-B3{fill:#E3E9FD;} + .d2-995024594 .fill-B4{fill:#E3E9FD;} + .d2-995024594 .fill-B5{fill:#EDF0FD;} + .d2-995024594 .fill-B6{fill:#F7F8FE;} + .d2-995024594 .fill-AA2{fill:#4A6FF3;} + .d2-995024594 .fill-AA4{fill:#EDF0FD;} + .d2-995024594 .fill-AA5{fill:#F7F8FE;} + .d2-995024594 .fill-AB4{fill:#EDF0FD;} + .d2-995024594 .fill-AB5{fill:#F7F8FE;} + .d2-995024594 .stroke-N1{stroke:#0A0F25;} + .d2-995024594 .stroke-N2{stroke:#676C7E;} + .d2-995024594 .stroke-N3{stroke:#9499AB;} + .d2-995024594 .stroke-N4{stroke:#CFD2DD;} + .d2-995024594 .stroke-N5{stroke:#DEE1EB;} + .d2-995024594 .stroke-N6{stroke:#EEF1F8;} + .d2-995024594 .stroke-N7{stroke:#FFFFFF;} + .d2-995024594 .stroke-B1{stroke:#0D32B2;} + .d2-995024594 .stroke-B2{stroke:#0D32B2;} + .d2-995024594 .stroke-B3{stroke:#E3E9FD;} + .d2-995024594 .stroke-B4{stroke:#E3E9FD;} + .d2-995024594 .stroke-B5{stroke:#EDF0FD;} + .d2-995024594 .stroke-B6{stroke:#F7F8FE;} + .d2-995024594 .stroke-AA2{stroke:#4A6FF3;} + .d2-995024594 .stroke-AA4{stroke:#EDF0FD;} + .d2-995024594 .stroke-AA5{stroke:#F7F8FE;} + .d2-995024594 .stroke-AB4{stroke:#EDF0FD;} + .d2-995024594 .stroke-AB5{stroke:#F7F8FE;} + .d2-995024594 .background-color-N1{background-color:#0A0F25;} + .d2-995024594 .background-color-N2{background-color:#676C7E;} + .d2-995024594 .background-color-N3{background-color:#9499AB;} + .d2-995024594 .background-color-N4{background-color:#CFD2DD;} + .d2-995024594 .background-color-N5{background-color:#DEE1EB;} + .d2-995024594 .background-color-N6{background-color:#EEF1F8;} + .d2-995024594 .background-color-N7{background-color:#FFFFFF;} + .d2-995024594 .background-color-B1{background-color:#0D32B2;} + .d2-995024594 .background-color-B2{background-color:#0D32B2;} + .d2-995024594 .background-color-B3{background-color:#E3E9FD;} + .d2-995024594 .background-color-B4{background-color:#E3E9FD;} + .d2-995024594 .background-color-B5{background-color:#EDF0FD;} + .d2-995024594 .background-color-B6{background-color:#F7F8FE;} + .d2-995024594 .background-color-AA2{background-color:#4A6FF3;} + .d2-995024594 .background-color-AA4{background-color:#EDF0FD;} + .d2-995024594 .background-color-AA5{background-color:#F7F8FE;} + .d2-995024594 .background-color-AB4{background-color:#EDF0FD;} + .d2-995024594 .background-color-AB5{background-color:#F7F8FE;} + .d2-995024594 .color-N1{color:#0A0F25;} + .d2-995024594 .color-N2{color:#676C7E;} + .d2-995024594 .color-N3{color:#9499AB;} + .d2-995024594 .color-N4{color:#CFD2DD;} + .d2-995024594 .color-N5{color:#DEE1EB;} + .d2-995024594 .color-N6{color:#EEF1F8;} + .d2-995024594 .color-N7{color:#FFFFFF;} + .d2-995024594 .color-B1{color:#0D32B2;} + .d2-995024594 .color-B2{color:#0D32B2;} + .d2-995024594 .color-B3{color:#E3E9FD;} + .d2-995024594 .color-B4{color:#E3E9FD;} + .d2-995024594 .color-B5{color:#EDF0FD;} + .d2-995024594 .color-B6{color:#F7F8FE;} + .d2-995024594 .color-AA2{color:#4A6FF3;} + .d2-995024594 .color-AA4{color:#EDF0FD;} + .d2-995024594 .color-AA5{color:#F7F8FE;} + .d2-995024594 .color-AB4{color:#EDF0FD;} + .d2-995024594 .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}]]>usersidintnamestringemailstringpasswordstringlast_logindatetimePKproductsidintpricedecimalskustringnamestringordersidintuser_idintproduct_idintshipmentsidintorder_idinttracking_numberstringstatusstring + \ No newline at end of file diff --git a/e2etests/testdata/stable/sql_tables/elk/board.exp.json b/e2etests/testdata/stable/sql_tables/elk/board.exp.json index 2915e1b47..fece8e814 100644 --- a/e2etests/testdata/stable/sql_tables/elk/board.exp.json +++ b/e2etests/testdata/stable/sql_tables/elk/board.exp.json @@ -10,7 +10,7 @@ "x": 12, "y": 12 }, - "width": 268, + "width": 251, "height": 216, "opacity": 1, "strokeDash": 0, @@ -193,7 +193,7 @@ "id": "products", "type": "sql_table", "pos": { - "x": 300, + "x": 283, "y": 48 }, "width": 164, @@ -349,7 +349,7 @@ "id": "orders", "type": "sql_table", "pos": { - "x": 300, + "x": 283, "y": 308 }, "width": 164, @@ -477,7 +477,7 @@ "id": "shipments", "type": "sql_table", "pos": { - "x": 484, + "x": 467, "y": 48 }, "width": 244, @@ -656,19 +656,19 @@ "labelPercentage": 0, "route": [ { - "x": 146, + "x": 137.5, "y": 228 }, { - "x": 146, + "x": 137.5, "y": 268 }, { - "x": 341, + "x": 324, "y": 268 }, { - "x": 341, + "x": 324, "y": 308 } ], @@ -702,11 +702,11 @@ "labelPercentage": 0, "route": [ { - "x": 382, + "x": 365, "y": 228 }, { - "x": 382, + "x": 365, "y": 308 } ], @@ -740,19 +740,19 @@ "labelPercentage": 0, "route": [ { - "x": 606, + "x": 589, "y": 228 }, { - "x": 606, + "x": 589, "y": 268 }, { - "x": 423, + "x": 406, "y": 268 }, { - "x": 423, + "x": 406, "y": 308 } ], diff --git a/e2etests/testdata/stable/sql_tables/elk/sketch.exp.svg b/e2etests/testdata/stable/sql_tables/elk/sketch.exp.svg index dd4fa46e0..d5d04df18 100644 --- a/e2etests/testdata/stable/sql_tables/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sql_tables/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -usersidintnamestringemailstringpasswordstringlast_logindatetimePKproductsidintpricedecimalskustringnamestringordersidintuser_idintproduct_idintshipmentsidintorder_idinttracking_numberstringstatusstring - + .d2-2093233888 .fill-N1{fill:#0A0F25;} + .d2-2093233888 .fill-N2{fill:#676C7E;} + .d2-2093233888 .fill-N3{fill:#9499AB;} + .d2-2093233888 .fill-N4{fill:#CFD2DD;} + .d2-2093233888 .fill-N5{fill:#DEE1EB;} + .d2-2093233888 .fill-N6{fill:#EEF1F8;} + .d2-2093233888 .fill-N7{fill:#FFFFFF;} + .d2-2093233888 .fill-B1{fill:#0D32B2;} + .d2-2093233888 .fill-B2{fill:#0D32B2;} + .d2-2093233888 .fill-B3{fill:#E3E9FD;} + .d2-2093233888 .fill-B4{fill:#E3E9FD;} + .d2-2093233888 .fill-B5{fill:#EDF0FD;} + .d2-2093233888 .fill-B6{fill:#F7F8FE;} + .d2-2093233888 .fill-AA2{fill:#4A6FF3;} + .d2-2093233888 .fill-AA4{fill:#EDF0FD;} + .d2-2093233888 .fill-AA5{fill:#F7F8FE;} + .d2-2093233888 .fill-AB4{fill:#EDF0FD;} + .d2-2093233888 .fill-AB5{fill:#F7F8FE;} + .d2-2093233888 .stroke-N1{stroke:#0A0F25;} + .d2-2093233888 .stroke-N2{stroke:#676C7E;} + .d2-2093233888 .stroke-N3{stroke:#9499AB;} + .d2-2093233888 .stroke-N4{stroke:#CFD2DD;} + .d2-2093233888 .stroke-N5{stroke:#DEE1EB;} + .d2-2093233888 .stroke-N6{stroke:#EEF1F8;} + .d2-2093233888 .stroke-N7{stroke:#FFFFFF;} + .d2-2093233888 .stroke-B1{stroke:#0D32B2;} + .d2-2093233888 .stroke-B2{stroke:#0D32B2;} + .d2-2093233888 .stroke-B3{stroke:#E3E9FD;} + .d2-2093233888 .stroke-B4{stroke:#E3E9FD;} + .d2-2093233888 .stroke-B5{stroke:#EDF0FD;} + .d2-2093233888 .stroke-B6{stroke:#F7F8FE;} + .d2-2093233888 .stroke-AA2{stroke:#4A6FF3;} + .d2-2093233888 .stroke-AA4{stroke:#EDF0FD;} + .d2-2093233888 .stroke-AA5{stroke:#F7F8FE;} + .d2-2093233888 .stroke-AB4{stroke:#EDF0FD;} + .d2-2093233888 .stroke-AB5{stroke:#F7F8FE;} + .d2-2093233888 .background-color-N1{background-color:#0A0F25;} + .d2-2093233888 .background-color-N2{background-color:#676C7E;} + .d2-2093233888 .background-color-N3{background-color:#9499AB;} + .d2-2093233888 .background-color-N4{background-color:#CFD2DD;} + .d2-2093233888 .background-color-N5{background-color:#DEE1EB;} + .d2-2093233888 .background-color-N6{background-color:#EEF1F8;} + .d2-2093233888 .background-color-N7{background-color:#FFFFFF;} + .d2-2093233888 .background-color-B1{background-color:#0D32B2;} + .d2-2093233888 .background-color-B2{background-color:#0D32B2;} + .d2-2093233888 .background-color-B3{background-color:#E3E9FD;} + .d2-2093233888 .background-color-B4{background-color:#E3E9FD;} + .d2-2093233888 .background-color-B5{background-color:#EDF0FD;} + .d2-2093233888 .background-color-B6{background-color:#F7F8FE;} + .d2-2093233888 .background-color-AA2{background-color:#4A6FF3;} + .d2-2093233888 .background-color-AA4{background-color:#EDF0FD;} + .d2-2093233888 .background-color-AA5{background-color:#F7F8FE;} + .d2-2093233888 .background-color-AB4{background-color:#EDF0FD;} + .d2-2093233888 .background-color-AB5{background-color:#F7F8FE;} + .d2-2093233888 .color-N1{color:#0A0F25;} + .d2-2093233888 .color-N2{color:#676C7E;} + .d2-2093233888 .color-N3{color:#9499AB;} + .d2-2093233888 .color-N4{color:#CFD2DD;} + .d2-2093233888 .color-N5{color:#DEE1EB;} + .d2-2093233888 .color-N6{color:#EEF1F8;} + .d2-2093233888 .color-N7{color:#FFFFFF;} + .d2-2093233888 .color-B1{color:#0D32B2;} + .d2-2093233888 .color-B2{color:#0D32B2;} + .d2-2093233888 .color-B3{color:#E3E9FD;} + .d2-2093233888 .color-B4{color:#E3E9FD;} + .d2-2093233888 .color-B5{color:#EDF0FD;} + .d2-2093233888 .color-B6{color:#F7F8FE;} + .d2-2093233888 .color-AA2{color:#4A6FF3;} + .d2-2093233888 .color-AA4{color:#EDF0FD;} + .d2-2093233888 .color-AA5{color:#F7F8FE;} + .d2-2093233888 .color-AB4{color:#EDF0FD;} + .d2-2093233888 .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}]]>usersidintnamestringemailstringpasswordstringlast_logindatetimePKproductsidintpricedecimalskustringnamestringordersidintuser_idintproduct_idintshipmentsidintorder_idinttracking_numberstringstatusstring + \ No newline at end of file diff --git a/e2etests/testdata/stable/unnamed_only_height/dagre/sketch.exp.svg b/e2etests/testdata/stable/unnamed_only_height/dagre/sketch.exp.svg index d52cc2e54..28769aa2b 100644 --- a/e2etests/testdata/stable/unnamed_only_height/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/unnamed_only_height/dagre/sketch.exp.svg @@ -103,7 +103,7 @@ .d2-1407267750 .color-AA4{color:#EDF0FD;} .d2-1407267750 .color-AA5{color:#F7F8FE;} .d2-1407267750 .color-AB4{color:#EDF0FD;} - .d2-1407267750 .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}]]>-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetimea := 5 + .d2-1407267750 .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}]]>-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetimea := 5 b := a + 7 fmt.Printf("%d", b)a := 5 b := a + 7 diff --git a/e2etests/testdata/stable/unnamed_only_height/elk/sketch.exp.svg b/e2etests/testdata/stable/unnamed_only_height/elk/sketch.exp.svg index 61a62b814..411d4cf91 100644 --- a/e2etests/testdata/stable/unnamed_only_height/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/unnamed_only_height/elk/sketch.exp.svg @@ -103,7 +103,7 @@ .d2-161332075 .color-AA4{color:#EDF0FD;} .d2-161332075 .color-AA5{color:#F7F8FE;} .d2-161332075 .color-AB4{color:#EDF0FD;} - .d2-161332075 .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}]]>-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetimea := 5 + .d2-161332075 .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}]]>-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetimea := 5 b := a + 7 fmt.Printf("%d", b)a := 5 b := a + 7 diff --git a/e2etests/testdata/stable/unnamed_only_width/dagre/sketch.exp.svg b/e2etests/testdata/stable/unnamed_only_width/dagre/sketch.exp.svg index bb8598391..214e1d697 100644 --- a/e2etests/testdata/stable/unnamed_only_width/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/unnamed_only_width/dagre/sketch.exp.svg @@ -103,7 +103,7 @@ .d2-2995629861 .color-AA4{color:#EDF0FD;} .d2-2995629861 .color-AA5{color:#F7F8FE;} .d2-2995629861 .color-AB4{color:#EDF0FD;} - .d2-2995629861 .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}]]>-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetimea := 5 + .d2-2995629861 .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}]]>-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetimea := 5 b := a + 7 fmt.Printf("%d", b)a := 5 b := a + 7 diff --git a/e2etests/testdata/stable/unnamed_only_width/elk/sketch.exp.svg b/e2etests/testdata/stable/unnamed_only_width/elk/sketch.exp.svg index 38691fb59..e595adfb4 100644 --- a/e2etests/testdata/stable/unnamed_only_width/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/unnamed_only_width/elk/sketch.exp.svg @@ -103,7 +103,7 @@ .d2-2813224635 .color-AA4{color:#EDF0FD;} .d2-2813224635 .color-AA5{color:#F7F8FE;} .d2-2813224635 .color-AB4{color:#EDF0FD;} - .d2-2813224635 .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}]]>-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetimea := 5 + .d2-2813224635 .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}]]>-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetimea := 5 b := a + 7 fmt.Printf("%d", b)a := 5 b := a + 7 diff --git a/e2etests/testdata/themes/dark_terrastruct_flagship/dagre/sketch.exp.svg b/e2etests/testdata/themes/dark_terrastruct_flagship/dagre/sketch.exp.svg index 3abfc595a..7319b24a4 100644 --- a/e2etests/testdata/themes/dark_terrastruct_flagship/dagre/sketch.exp.svg +++ b/e2etests/testdata/themes/dark_terrastruct_flagship/dagre/sketch.exp.svg @@ -857,7 +857,7 @@ .d2-657362140 .md .contains-task-list:dir(rtl) .task-list-item-checkbox { margin: 0 -1.6em 0.25em 0.2em; } -networkuserapi serverlogsusersidintnamestringemailstringpasswordstringlast_logindatetimeproducts+idint+pricedecimal+skustring+namestring

A tale

+networkuserapi serverlogsusersidintnamestringemailstringpasswordstringlast_logindatetimeproducts+idint+pricedecimal+skustring+namestring

A tale

  • of
  • two cities
    • diff --git a/e2etests/testdata/themes/dark_terrastruct_flagship/elk/sketch.exp.svg b/e2etests/testdata/themes/dark_terrastruct_flagship/elk/sketch.exp.svg index 887020287..0762ba5ad 100644 --- a/e2etests/testdata/themes/dark_terrastruct_flagship/elk/sketch.exp.svg +++ b/e2etests/testdata/themes/dark_terrastruct_flagship/elk/sketch.exp.svg @@ -857,7 +857,7 @@ .d2-414675799 .md .contains-task-list:dir(rtl) .task-list-item-checkbox { margin: 0 -1.6em 0.25em 0.2em; } -networkuserapi serverlogsusersidintnamestringemailstringpasswordstringlast_logindatetimeproducts+idint+pricedecimal+skustring+namestring

    A tale

    +networkuserapi serverlogsusersidintnamestringemailstringpasswordstringlast_logindatetimeproducts+idint+pricedecimal+skustring+namestring

    A tale

    • of
    • two cities
      • diff --git a/e2etests/testdata/themes/terminal/dagre/sketch.exp.svg b/e2etests/testdata/themes/terminal/dagre/sketch.exp.svg index 1ac160d33..2b1dc5c0e 100644 --- a/e2etests/testdata/themes/terminal/dagre/sketch.exp.svg +++ b/e2etests/testdata/themes/terminal/dagre/sketch.exp.svg @@ -883,7 +883,7 @@ -NETWORKUSERAPI SERVERLOGSUSERSidintnamestringemailstringpasswordstringlast_logindatetimePRODUCTS+idint+pricedecimal+skustring+namestring

      A TALE

      +NETWORKUSERAPI SERVERLOGSUSERSidintnamestringemailstringpasswordstringlast_logindatetimePRODUCTS+idint+pricedecimal+skustring+namestring

      A TALE

      • OF
      • TWO CITIES
        • diff --git a/e2etests/testdata/themes/terminal/elk/sketch.exp.svg b/e2etests/testdata/themes/terminal/elk/sketch.exp.svg index ae347036d..5c82d86be 100644 --- a/e2etests/testdata/themes/terminal/elk/sketch.exp.svg +++ b/e2etests/testdata/themes/terminal/elk/sketch.exp.svg @@ -883,7 +883,7 @@ -NETWORKUSERAPI SERVERLOGSUSERSidintnamestringemailstringpasswordstringlast_logindatetimePRODUCTS+idint+pricedecimal+skustring+namestring

        A TALE

        +NETWORKUSERAPI SERVERLOGSUSERSidintnamestringemailstringpasswordstringlast_logindatetimePRODUCTS+idint+pricedecimal+skustring+namestring

        A TALE

        • OF
        • TWO CITIES
          • diff --git a/e2etests/testdata/todo/shape_set_width_height/dagre/sketch.exp.svg b/e2etests/testdata/todo/shape_set_width_height/dagre/sketch.exp.svg index b15c339a6..9e5405a3c 100644 --- a/e2etests/testdata/todo/shape_set_width_height/dagre/sketch.exp.svg +++ b/e2etests/testdata/todo/shape_set_width_height/dagre/sketch.exp.svg @@ -850,7 +850,7 @@ .d2-1380007000 .md .contains-task-list:dir(rtl) .task-list-item-checkbox { margin: 0 -1.6em 0.25em 0.2em; } -containerscloudtall cylinderclass2-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voidusersidintnamestringemailstringpasswordstringlast_logindatetimecontainer

          markdown text expanded to 800x400

          +containerscloudtall cylinderclass2-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voidusersidintnamestringemailstringpasswordstringlast_logindatetimecontainer

          markdown text expanded to 800x400

          a := 5 b := a + 7 fmt.Printf("%d", b)a := 5 diff --git a/e2etests/testdata/todo/shape_set_width_height/elk/sketch.exp.svg b/e2etests/testdata/todo/shape_set_width_height/elk/sketch.exp.svg index 0fedb2be9..8b8248447 100644 --- a/e2etests/testdata/todo/shape_set_width_height/elk/sketch.exp.svg +++ b/e2etests/testdata/todo/shape_set_width_height/elk/sketch.exp.svg @@ -850,7 +850,7 @@ .d2-1599576373 .md .contains-task-list:dir(rtl) .task-list-item-checkbox { margin: 0 -1.6em 0.25em 0.2em; } -containerscloudtall cylinderclass2-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voidusersidintnamestringemailstringpasswordstringlast_logindatetimecontainer

          markdown text expanded to 800x400

          +containerscloudtall cylinderclass2-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voidusersidintnamestringemailstringpasswordstringlast_logindatetimecontainer

          markdown text expanded to 800x400

          a := 5 b := a + 7 fmt.Printf("%d", b)a := 5 From 949de62f79872fba1caf526a92cb185432b16b3e Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Mon, 5 Jun 2023 11:36:36 -0700 Subject: [PATCH 53/62] changelog --- ci/release/changelogs/next.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ci/release/changelogs/next.md b/ci/release/changelogs/next.md index 872f4a7a3..ef58f531f 100644 --- a/ci/release/changelogs/next.md +++ b/ci/release/changelogs/next.md @@ -9,6 +9,8 @@ - Improves grid layout performance when there are many similarly sized shapes. [#1315](https://github.com/terrastruct/d2/pull/1315) - Connections and labels now are adjusted for shapes with `3d` or `multiple`. [#1340](https://github.com/terrastruct/d2/pull/1340) - `sql_table` now alternatively takes an array of constraints instead of being limited to a single one. Thanks @satoqz ! [#1245](https://github.com/terrastruct/d2/pull/1245) +- Constraints in `sql_table` render even if they have no matching abbreviation [#1372](https://github.com/terrastruct/d2/pull/1372) +- Constraints in `sql_table` sheds their excessive letter-spacing and is padded from the end consistently [#1372](https://github.com/terrastruct/d2/pull/1372) #### Bugfixes ⛑️ From b5f8a0223ed490a597272be59745a0a79a0fb18d Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Mon, 5 Jun 2023 11:46:38 -0700 Subject: [PATCH 54/62] [ci-force] fix --- d2graph/d2graph.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/d2graph/d2graph.go b/d2graph/d2graph.go index 3b481cc7d..54862f292 100644 --- a/d2graph/d2graph.go +++ b/d2graph/d2graph.go @@ -1036,7 +1036,7 @@ func (obj *Object) GetDefaultSize(mtexts []*d2target.MText, ruler *textmeasure.R if l := len(c.Constraint); l > 0 { constraintDims := GetTextDimensions(mtexts, ruler, ctexts[2], fontFamily) - if typeDims == nil { + if constraintDims == nil { return nil, fmt.Errorf("dimensions for sql_table constraint %#v not found", ctexts[2].Text) } maxConstraintWidth = go2.Max(maxConstraintWidth, constraintDims.Width) From c40dc7ec34e19f67f4426deb0a3f1915d68e0d17 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Tue, 6 Jun 2023 10:43:52 -0700 Subject: [PATCH 55/62] img optimizations --- lib/imgbundler/imgbundler.go | 25 ++++++++--- lib/imgbundler/imgbundler_test.go | 73 +++++++++++++++++++++++++++++++ 2 files changed, 92 insertions(+), 6 deletions(-) diff --git a/lib/imgbundler/imgbundler.go b/lib/imgbundler/imgbundler.go index 5c6de7038..50e3b126b 100644 --- a/lib/imgbundler/imgbundler.go +++ b/lib/imgbundler/imgbundler.go @@ -23,6 +23,8 @@ import ( "oss.terrastruct.com/util-go/xmain" ) +var imgCache sync.Map + const maxImageSize int64 = 1 << 25 // 33_554_432 var imageRegex = regexp.MustCompile(`ab +`, url1, url2) + + ms := &xmain.State{ + Name: "test", + + Stdin: os.Stdin, + Stdout: os.Stdout, + Stderr: os.Stderr, + + Env: xos.NewEnv(os.Environ()), + } + ms.Log = cmdlog.NewTB(ms.Env, t) + + count := 0 + + httpClient.Transport = roundTripFunc(func(req *http.Request) *http.Response { + count++ + respRecorder := httptest.NewRecorder() + respRecorder.WriteString(`\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n`) + respRecorder.WriteHeader(200) + return respRecorder.Result() + }) + + out, err := BundleRemote(ctx, ms, []byte(sampleSVG)) + if err != nil { + t.Fatal(err) + } + tassert.Equal(t, 1, count) + if strings.Contains(string(out), url1) { + t.Fatal("links still exist") + } + tassert.Equal(t, 2, strings.Count(string(out), "image/svg+xml")) +} From b37b5571e14a1e0f19c768d7a1c99b97407e9d6e Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Tue, 6 Jun 2023 10:56:44 -0700 Subject: [PATCH 56/62] logs --- lib/imgbundler/imgbundler.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/imgbundler/imgbundler.go b/lib/imgbundler/imgbundler.go index 50e3b126b..d7df77851 100644 --- a/lib/imgbundler/imgbundler.go +++ b/lib/imgbundler/imgbundler.go @@ -111,7 +111,7 @@ func runWorkers(ctx context.Context, ms *xmain.State, svg []byte, imgs [][][]byt <-sema }() - bundledImage, err := worker(ctx, &imgCache, img[1], isRemote) + bundledImage, err := worker(ctx, ms, img[1], isRemote) if err != nil { ms.Log.Error.Printf("failed to bundle %s: %v", img[1], err) errhrefsMu.Lock() @@ -150,16 +150,18 @@ func runWorkers(ctx context.Context, ms *xmain.State, svg []byte, imgs [][][]byt } } -func worker(ctx context.Context, cache *sync.Map, href []byte, isRemote bool) ([]byte, error) { - if hit, ok := cache.Load(string(href)); ok { +func worker(ctx context.Context, ms *xmain.State, href []byte, isRemote bool) ([]byte, error) { + if hit, ok := imgCache.Load(string(href)); ok { return hit.([]byte), nil } var buf []byte var mimeType string var err error if isRemote { + ms.Log.Debug.Printf("fetching %s remotely", string(href)) buf, mimeType, err = httpGet(ctx, html.UnescapeString(string(href))) } else { + ms.Log.Debug.Printf("reading %s from disk", string(href)) buf, err = os.ReadFile(html.UnescapeString(string(href))) } if err != nil { @@ -173,7 +175,7 @@ func worker(ctx context.Context, cache *sync.Map, href []byte, isRemote bool) ([ b64 := base64.StdEncoding.EncodeToString(buf) out := []byte(fmt.Sprintf(` Date: Tue, 6 Jun 2023 11:09:19 -0700 Subject: [PATCH 57/62] flag --- ci/release/template/man/d2.1 | 3 +++ d2cli/main.go | 7 +++++++ lib/imgbundler/imgbundler.go | 10 +++++++--- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/ci/release/template/man/d2.1 b/ci/release/template/man/d2.1 index 81bc4e895..ff8263105 100644 --- a/ci/release/template/man/d2.1 +++ b/ci/release/template/man/d2.1 @@ -109,6 +109,9 @@ An appendix for tooltips and links is added to PNG exports since they are not in .Ns . .It Fl d , -debug Print debug logs. +.It Fl -img-cache Ar true +In watch mode, images used in icons are cached for subsequent compilations. This should be disabled if images might change +.Ns . .It Fl h , -help Print usage information and exit. .It Fl v , -version diff --git a/d2cli/main.go b/d2cli/main.go index 0db873bc6..9b5f1cc8a 100644 --- a/d2cli/main.go +++ b/d2cli/main.go @@ -67,6 +67,10 @@ func Run(ctx context.Context, ms *xmain.State) (err error) { if err != nil { return err } + imgCacheFlag, err := ms.Opts.Bool("IMG_CACHE", "img-cache", "", true, "in watch mode, images used in icons are cached for subsequent compilations. This should be disabled if images might change.") + if err != nil { + return err + } layoutFlag := ms.Opts.String("D2_LAYOUT", "layout", "l", "dagre", `the layout engine used`) themeFlag, err := ms.Opts.Int64("D2_THEME", "theme", "t", 0, "the diagram theme ID") if err != nil { @@ -150,6 +154,9 @@ func Run(ctx context.Context, ms *xmain.State) (err error) { if *debugFlag { ms.Env.Setenv("DEBUG", "1") } + if *imgCacheFlag { + ms.Env.Setenv("IMG_CACHE", "1") + } if *browserFlag != "" { ms.Env.Setenv("BROWSER", *browserFlag) } diff --git a/lib/imgbundler/imgbundler.go b/lib/imgbundler/imgbundler.go index d7df77851..526f3bf8d 100644 --- a/lib/imgbundler/imgbundler.go +++ b/lib/imgbundler/imgbundler.go @@ -151,8 +151,10 @@ func runWorkers(ctx context.Context, ms *xmain.State, svg []byte, imgs [][][]byt } func worker(ctx context.Context, ms *xmain.State, href []byte, isRemote bool) ([]byte, error) { - if hit, ok := imgCache.Load(string(href)); ok { - return hit.([]byte), nil + if ms.Env.Getenv("IMG_CACHE") == "1" { + if hit, ok := imgCache.Load(string(href)); ok { + return hit.([]byte), nil + } } var buf []byte var mimeType string @@ -175,7 +177,9 @@ func worker(ctx context.Context, ms *xmain.State, href []byte, isRemote bool) ([ b64 := base64.StdEncoding.EncodeToString(buf) out := []byte(fmt.Sprintf(` Date: Tue, 6 Jun 2023 11:17:02 -0700 Subject: [PATCH 58/62] add test for cache --- lib/imgbundler/imgbundler_test.go | 80 +++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) diff --git a/lib/imgbundler/imgbundler_test.go b/lib/imgbundler/imgbundler_test.go index 4625a4f85..49acdb7d3 100644 --- a/lib/imgbundler/imgbundler_test.go +++ b/lib/imgbundler/imgbundler_test.go @@ -294,3 +294,83 @@ width="328" height="587" viewBox="-100 -131 328 587">ab +`, url1, url2) + + ms := &xmain.State{ + Name: "test", + + Stdin: os.Stdin, + Stdout: os.Stdout, + Stderr: os.Stderr, + + Env: xos.NewEnv(os.Environ()), + } + ms.Log = cmdlog.NewTB(ms.Env, t) + + count := 0 + + httpClient.Transport = roundTripFunc(func(req *http.Request) *http.Response { + count++ + respRecorder := httptest.NewRecorder() + respRecorder.WriteString(`\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n`) + respRecorder.WriteHeader(200) + return respRecorder.Result() + }) + + // Using a cache, imgs are not refetched on multiple runs + ms.Env.Setenv("IMG_CACHE", "1") + _, err := BundleRemote(ctx, ms, []byte(sampleSVG)) + if err != nil { + t.Fatal(err) + } + _, err = BundleRemote(ctx, ms, []byte(sampleSVG)) + if err != nil { + t.Fatal(err) + } + tassert.Equal(t, 1, count) + + // With cache disabled, it refetches + ms.Env.Setenv("IMG_CACHE", "0") + count = 0 + _, err = BundleRemote(ctx, ms, []byte(sampleSVG)) + if err != nil { + t.Fatal(err) + } + _, err = BundleRemote(ctx, ms, []byte(sampleSVG)) + if err != nil { + t.Fatal(err) + } + tassert.Equal(t, 2, count) +} From 8123f8525a63db4675d5630c86355ba68fd0d439 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Tue, 6 Jun 2023 11:19:26 -0700 Subject: [PATCH 59/62] changelog --- ci/release/changelogs/next.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ci/release/changelogs/next.md b/ci/release/changelogs/next.md index ef58f531f..de58d5b7a 100644 --- a/ci/release/changelogs/next.md +++ b/ci/release/changelogs/next.md @@ -11,6 +11,8 @@ - `sql_table` now alternatively takes an array of constraints instead of being limited to a single one. Thanks @satoqz ! [#1245](https://github.com/terrastruct/d2/pull/1245) - Constraints in `sql_table` render even if they have no matching abbreviation [#1372](https://github.com/terrastruct/d2/pull/1372) - Constraints in `sql_table` sheds their excessive letter-spacing and is padded from the end consistently [#1372](https://github.com/terrastruct/d2/pull/1372) +- Duplicate image URLs in icons are only fetched once [#1373](https://github.com/terrastruct/d2/pull/1373) +- In watch mode, images are cached by default across compiles. Can be disabled with flag `--img-cache=0`. [#1373](https://github.com/terrastruct/d2/pull/1373) #### Bugfixes ⛑️ From 79e192f9c1d86dd3ace7f564c6b29b87593e875b Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Tue, 6 Jun 2023 11:33:00 -0700 Subject: [PATCH 60/62] fmt --- lib/imgbundler/imgbundler_test.go | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/imgbundler/imgbundler_test.go b/lib/imgbundler/imgbundler_test.go index 49acdb7d3..c2eddb21a 100644 --- a/lib/imgbundler/imgbundler_test.go +++ b/lib/imgbundler/imgbundler_test.go @@ -14,6 +14,7 @@ import ( "testing" tassert "github.com/stretchr/testify/assert" + "oss.terrastruct.com/util-go/cmdlog" "oss.terrastruct.com/util-go/xos" From 0d4392eac20a5523c1fc9c588644e8fb27ddc64c Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Tue, 6 Jun 2023 20:24:47 -0700 Subject: [PATCH 61/62] add class array footgun --- d2compiler/compile.go | 15 +++++++++++++++ d2compiler/compile_test.go | 17 +++++++++++++++++ .../TestCompile/comma-array-class.exp.json | 12 ++++++++++++ 3 files changed, 44 insertions(+) create mode 100644 testdata/d2compiler/TestCompile/comma-array-class.exp.json diff --git a/d2compiler/compile.go b/d2compiler/compile.go index 661f697f0..b01beb15a 100644 --- a/d2compiler/compile.go +++ b/d2compiler/compile.go @@ -147,6 +147,21 @@ func (c *compiler) compileMap(obj *d2graph.Object, m *d2ir.Map) { classMap := m.GetClassMap(className) if classMap != nil { c.compileMap(obj, classMap) + } else { + if strings.Contains(className, ",") { + split := strings.Split(className, ",") + allFound := true + for _, maybeClassName := range split { + maybeClassName = strings.TrimSpace(maybeClassName) + if m.GetClassMap(maybeClassName) == nil { + allFound = false + break + } + } + if allFound { + c.errorf(class.LastRef().AST(), `class "%s" not found. Did you mean to use ";" to separate array items?`, className) + } + } } } } diff --git a/d2compiler/compile_test.go b/d2compiler/compile_test.go index 985050a83..1ecd7ff30 100644 --- a/d2compiler/compile_test.go +++ b/d2compiler/compile_test.go @@ -2482,6 +2482,23 @@ nostar -> 1star: { class: [path; path2] } tassert.Equal(t, "2", g.Edges[0].Style.StrokeWidth.Value) }, }, + { + name: "comma-array-class", + + text: `classes: { + dragon_ball: { + label: "" + shape: circle + style.fill: orange + } + path: { + label: "then" + style.stroke-width: 4 + } +} +nostar: { class: [dragon_ball, path] }`, + expErr: `d2/testdata/d2compiler/TestCompile/comma-array-class.d2:12:11: class "dragon_ball, path" not found. Did you mean to use ";" to separate array items?`, + }, { name: "reordered-classes", text: `classes: { diff --git a/testdata/d2compiler/TestCompile/comma-array-class.exp.json b/testdata/d2compiler/TestCompile/comma-array-class.exp.json new file mode 100644 index 000000000..cedc232f6 --- /dev/null +++ b/testdata/d2compiler/TestCompile/comma-array-class.exp.json @@ -0,0 +1,12 @@ +{ + "graph": null, + "err": { + "ioerr": null, + "errs": [ + { + "range": "d2/testdata/d2compiler/TestCompile/comma-array-class.d2,11:10:157-11:15:162", + "errmsg": "d2/testdata/d2compiler/TestCompile/comma-array-class.d2:12:11: class \"dragon_ball, path\" not found. Did you mean to use \";\" to separate array items?" + } + ] + } +} From 21907afdd9ff017c82270560fd278ac13ee87a60 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Tue, 6 Jun 2023 20:26:38 -0700 Subject: [PATCH 62/62] changelog --- ci/release/changelogs/next.md | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/release/changelogs/next.md b/ci/release/changelogs/next.md index de58d5b7a..007940101 100644 --- a/ci/release/changelogs/next.md +++ b/ci/release/changelogs/next.md @@ -13,6 +13,7 @@ - Constraints in `sql_table` sheds their excessive letter-spacing and is padded from the end consistently [#1372](https://github.com/terrastruct/d2/pull/1372) - Duplicate image URLs in icons are only fetched once [#1373](https://github.com/terrastruct/d2/pull/1373) - In watch mode, images are cached by default across compiles. Can be disabled with flag `--img-cache=0`. [#1373](https://github.com/terrastruct/d2/pull/1373) +- Common invalid array separator `,` usage in class arrays returns a helpful error message [#1376](https://github.com/terrastruct/d2/pull/1376) #### Bugfixes ⛑️