From d007471d89e5fa71c29f3c0ba83d8aab333f05f8 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Tue, 28 Feb 2023 14:31:18 -0800 Subject: [PATCH] tests --- .../TestCompile/basic_icon.exp.json | 6 - .../TestCompile/basic_sequence.exp.json | 6 - .../TestCompile/basic_shape.exp.json | 6 - .../TestCompile/basic_style.exp.json | 6 - .../TestCompile/class_paren.exp.json | 6 - .../TestCompile/class_style.exp.json | 6 - .../TestCompile/constraint_label.exp.json | 6 - .../TestCompile/default_direction.exp.json | 6 - .../TestCompile/dimension_with_style.exp.json | 6 - .../dimensions_on_nonimage.exp.json | 6 - testdata/d2compiler/TestCompile/edge.exp.json | 12 - .../edge_arrowhead_fields.exp.json | 18 - .../TestCompile/edge_chain.exp.json | 18 - .../TestCompile/edge_chain_map.exp.json | 18 - .../TestCompile/edge_column_index.exp.json | 12 - .../TestCompile/edge_exclusive_style.exp.json | 12 - .../TestCompile/edge_flat_arrowhead.exp.json | 15 - .../edge_flat_label_arrowhead.exp.json | 15 - .../TestCompile/edge_in_column.exp.json | 777 ------------------ .../TestCompile/edge_index.exp.json | 12 - .../TestCompile/edge_index_map.exp.json | 12 - .../TestCompile/edge_index_nested.exp.json | 15 - .../edge_index_nested_cross_scope.exp.json | 15 - .../edge_key_group_flat_nested.exp.json | 15 - ..._key_group_flat_nested_underscore.exp.json | 15 - ..._group_map_flat_nested_underscore.exp.json | 15 - ...e_key_group_map_nested_underscore.exp.json | 15 - .../TestCompile/edge_label_map.exp.json | 12 - .../d2compiler/TestCompile/edge_map.exp.json | 12 - .../TestCompile/edge_map_arrowhead.exp.json | 15 - .../TestCompile/edge_map_group_flat.exp.json | 12 - .../edge_map_group_semiflat.exp.json | 12 - .../TestCompile/edge_map_nested.exp.json | 12 - .../TestCompile/edge_map_nested_flat.exp.json | 12 - .../TestCompile/edge_mixed_arrowhead.exp.json | 18 - .../edge_non_shape_arrowhead.exp.json | 15 - .../edge_semiflat_arrowhead.exp.json | 15 - .../TestCompile/escaped_id.exp.json | 6 - .../TestCompile/image_style.exp.json | 6 - .../TestCompile/link-board-nested.exp.json | 12 +- .../TestCompile/link-board-ok.exp.json | 6 +- .../TestCompile/near_constant.exp.json | 6 - .../TestCompile/nested_sql.exp.json | 9 - testdata/d2compiler/TestCompile/null.exp.json | 6 - .../d2compiler/TestCompile/path_link.exp.json | 5 +- .../reserved_icon_near_style.exp.json | 9 - .../TestCompile/root_direction.exp.json | 3 - .../TestCompile/root_sequence.exp.json | 3 - .../TestCompile/self-referencing.exp.json | 9 - .../TestCompile/sequence_container.exp.json | 30 - .../TestCompile/sequence_container_2.exp.json | 30 - .../sequence_grouped_note.exp.json | 15 - .../TestCompile/sequence_scoping.exp.json | 33 - .../TestCompile/set_direction.exp.json | 6 - .../single_dimension_on_circle.exp.json | 6 - .../TestCompile/sql-regression.exp.json | 12 - .../d2compiler/TestCompile/sql_paren.exp.json | 6 - .../TestCompile/stroke-width.exp.json | 6 - .../table_connection_attr.exp.json | 12 - .../TestCompile/table_style.exp.json | 6 - .../TestCompile/table_style_map.exp.json | 6 - .../TestCompile/underscore_edge.exp.json | 12 - .../underscore_edge_chain.exp.json | 18 - .../underscore_edge_existing.exp.json | 18 - .../underscore_edge_index.exp.json | 15 - .../underscore_edge_nested.exp.json | 15 - .../underscore_parent_create.exp.json | 9 - .../underscore_parent_not_root.exp.json | 12 - .../underscore_parent_preference_1.exp.json | 9 - .../underscore_parent_preference_2.exp.json | 9 - .../underscore_parent_squared.exp.json | 12 - .../underscore_unresolved_obj.exp.json | 9 - .../TestCompile/unescaped_id_cr.exp.json | 6 - .../d2compiler/TestCompile/url_link.exp.json | 5 +- .../TestCompile/wrong_column_index.exp.json | 12 - .../TestCompile2/boards/recursive.exp.json | 30 - .../TestCompile2/boards/root.exp.json | 18 - testdata/d2oracle/TestCreate/base.exp.json | 6 - .../d2oracle/TestCreate/container.exp.json | 9 - .../TestCreate/container_edge.exp.json | 15 - .../TestCreate/container_edge_label.exp.json | 15 - testdata/d2oracle/TestCreate/edge.exp.json | 12 - .../d2oracle/TestCreate/edge_nested.exp.json | 15 - .../d2oracle/TestCreate/edge_scope.exp.json | 15 - .../TestCreate/edge_scope_flat.exp.json | 15 - .../TestCreate/edge_scope_nested.exp.json | 18 - .../d2oracle/TestCreate/edge_unique.exp.json | 30 - testdata/d2oracle/TestCreate/gen_key.exp.json | 9 - .../d2oracle/TestCreate/gen_key_n.exp.json | 45 - .../TestCreate/gen_key_nested.exp.json | 18 - .../TestCreate/gen_key_scope.exp.json | 18 - .../TestCreate/gen_key_suffix.exp.json | 9 - .../TestCreate/make_scope_multiline.exp.json | 9 - .../make_scope_multiline_spacing_1.exp.json | 15 - .../make_scope_multiline_spacing_2.exp.json | 15 - testdata/d2oracle/TestCreate/nested.exp.json | 12 - testdata/d2oracle/TestCreate/scope.exp.json | 15 - .../TestDelete/breakup_arrowhead.exp.json | 6 - .../d2oracle/TestDelete/children.exp.json | 15 - .../TestDelete/children_conflicts.exp.json | 9 - .../children_edge_conflicts.exp.json | 15 - .../children_edges_flat_conflicts.exp.json | 24 - .../children_flat_conflicts.exp.json | 9 - .../children_multiple_conflicts.exp.json | 18 - .../children_nested_conflicts.exp.json | 12 - ...ldren_nested_referenced_conflicts.exp.json | 12 - .../children_no_self_conflict.exp.json | 6 - .../TestDelete/children_order.exp.json | 15 - .../children_referenced_conflicts.exp.json | 9 - .../TestDelete/children_scope.exp.json | 21 - .../TestDelete/container_near.exp.json | 12 - .../d2oracle/TestDelete/delete_icon.exp.json | 8 +- .../d2oracle/TestDelete/delete_link.exp.json | 6 - .../d2oracle/TestDelete/delete_near.exp.json | 9 - .../delete_needed_flat_near.exp.json | 9 - .../delete_redundant_flat_near.exp.json | 9 - .../TestDelete/delete_tooltip.exp.json | 6 - .../edge_both_identical_childs.exp.json | 18 - .../d2oracle/TestDelete/edge_common.exp.json | 12 - .../TestDelete/edge_common_2.exp.json | 12 - .../TestDelete/edge_common_3.exp.json | 12 - .../TestDelete/edge_common_4.exp.json | 12 - .../TestDelete/edge_conflict.exp.json | 18 - .../TestDelete/edge_decrement.exp.json | 21 - .../d2oracle/TestDelete/edge_first.exp.json | 30 - .../TestDelete/edge_flat_style.exp.json | 6 - .../TestDelete/edge_identical_child.exp.json | 21 - .../TestDelete/edge_key_style.exp.json | 12 - .../d2oracle/TestDelete/edge_last.exp.json | 36 - .../TestDelete/edge_map_style.exp.json | 12 - .../d2oracle/TestDelete/edge_middle.exp.json | 36 - .../d2oracle/TestDelete/empty_map.exp.json | 9 - testdata/d2oracle/TestDelete/flat.exp.json | 3 - .../TestDelete/flat_reserved.exp.json | 12 - .../TestDelete/hoist_children.exp.json | 9 - .../TestDelete/hoist_edge_children.exp.json | 15 - .../TestDelete/key_with_edges.exp.json | 12 - .../TestDelete/key_with_edges_2.exp.json | 9 - .../TestDelete/key_with_edges_3.exp.json | 9 - .../TestDelete/key_with_edges_4.exp.json | 12 - .../d2oracle/TestDelete/multi_near.exp.json | 15 - .../multi_path_map_conflict.exp.json | 12 - .../multi_path_map_no_conflict.exp.json | 12 - .../multiple_flat_middle_container.exp.json | 12 - .../TestDelete/multiple_flat_style.exp.json | 6 - .../TestDelete/multiple_map_styles.exp.json | 6 - testdata/d2oracle/TestDelete/near.exp.json | 6 - testdata/d2oracle/TestDelete/nested.exp.json | 12 - .../d2oracle/TestDelete/nested_2.exp.json | 12 - .../TestDelete/nested_edge_key_style.exp.json | 15 - .../TestDelete/nested_flat_style.exp.json | 6 - .../TestDelete/nested_reserved.exp.json | 12 - .../nested_underscore_update.exp.json | 9 - .../d2oracle/TestDelete/node_in_edge.exp.json | 27 - .../TestDelete/node_in_edge_last.exp.json | 33 - .../only_delete_edge_reserved.exp.json | 12 - .../only_delete_obj_reserved.exp.json | 12 - testdata/d2oracle/TestDelete/order_1.exp.json | 15 - testdata/d2oracle/TestDelete/order_2.exp.json | 9 - testdata/d2oracle/TestDelete/order_3.exp.json | 9 - testdata/d2oracle/TestDelete/order_4.exp.json | 6 - testdata/d2oracle/TestDelete/order_5.exp.json | 24 - testdata/d2oracle/TestDelete/order_6.exp.json | 15 - testdata/d2oracle/TestDelete/order_7.exp.json | 18 - testdata/d2oracle/TestDelete/order_8.exp.json | 18 - .../d2oracle/TestDelete/shape_class.exp.json | 6 - .../TestDelete/shape_sql_table.exp.json | 15 - .../TestDelete/singular_flat_style.exp.json | 6 - .../TestDelete/singular_map_style.exp.json | 6 - .../underscore_no_conflict.exp.json | 12 - .../TestDelete/underscore_remove.exp.json | 24 - .../TestMove/append_multiple_styles.exp.json | 9 - testdata/d2oracle/TestMove/basic.exp.json | 6 - .../d2oracle/TestMove/basic_nested.exp.json | 9 - .../TestMove/basic_out_of_container.exp.json | 9 - .../TestMove/between_containers.exp.json | 12 - .../TestMove/chain_connected_nested.exp.json | 18 - ..._connected_nested_no_extra_create.exp.json | 21 - .../TestMove/connected_nested.exp.json | 15 - .../d2oracle/TestMove/container_near.exp.json | 21 - .../TestMove/edge_across_containers.exp.json | 18 - .../d2oracle/TestMove/edge_basic.exp.json | 12 - .../TestMove/edge_chain_basic.exp.json | 18 - .../TestMove/edge_chain_circular.exp.json | 18 - .../edge_chain_into_container.exp.json | 21 - .../edge_chain_out_container.exp.json | 21 - .../d2oracle/TestMove/edge_conflict.exp.json | 21 - .../TestMove/edge_into_container.exp.json | 18 - .../TestMove/edge_nested_basic.exp.json | 15 - .../TestMove/edge_out_of_container.exp.json | 15 - .../d2oracle/TestMove/extend_map.exp.json | 15 - .../TestMove/extend_stationary_path.exp.json | 12 - .../TestMove/flat_between_containers.exp.json | 12 - .../d2oracle/TestMove/flat_merge.exp.json | 15 - .../TestMove/flat_middle_container.exp.json | 15 - .../TestMove/flat_nested_merge.exp.json | 33 - .../flat_nested_merge_multiple_refs.exp.json | 27 - .../flat_reparent_with_map_value.exp.json | 9 - ...lat_reparent_with_mixed_map_value.exp.json | 12 - .../flat_reparent_with_value.exp.json | 9 - .../d2oracle/TestMove/flat_style.exp.json | 9 - .../TestMove/full_edge_slice.exp.json | 21 - .../d2oracle/TestMove/full_slice.exp.json | 12 - testdata/d2oracle/TestMove/gnarly_1.exp.json | 48 -- .../hoist_container_children.exp.json | 15 - .../into_container_existing_map.exp.json | 12 - .../into_container_nonexisting_map.exp.json | 9 - .../into_container_with_flat_keys.exp.json | 9 - .../into_container_with_flat_style.exp.json | 9 - .../d2oracle/TestMove/map_transplant.exp.json | 15 - .../d2oracle/TestMove/map_with_label.exp.json | 12 - .../TestMove/merge_nested_maps.exp.json | 27 - .../d2oracle/TestMove/merge_reserved.exp.json | 21 - .../TestMove/middle_container.exp.json | 12 - .../TestMove/move_container_children.exp.json | 18 - .../move_container_conflict_children.exp.json | 18 - .../move_into_key_with_value.exp.json | 9 - .../TestMove/move_out_of_edge.exp.json | 24 - .../TestMove/move_out_of_nested_edge.exp.json | 24 - .../TestMove/multiple_nesting_levels.exp.json | 24 - testdata/d2oracle/TestMove/near.exp.json | 9 - .../d2oracle/TestMove/nhooyr_one.exp.json | 15 - .../d2oracle/TestMove/nhooyr_two.exp.json | 24 - .../d2oracle/TestMove/parentheses.exp.json | 15 - .../TestMove/partial_edge_slice.exp.json | 15 - .../d2oracle/TestMove/partial_slice.exp.json | 9 - testdata/d2oracle/TestMove/rename_2.exp.json | 18 - testdata/d2oracle/TestMove/reuse_map.exp.json | 18 - .../d2oracle/TestMove/slice_style.exp.json | 9 - .../TestMove/underscore_children.exp.json | 9 - .../underscore_edge_children.exp.json | 15 - .../underscore_edge_container_1.exp.json | 15 - .../underscore_edge_container_2.exp.json | 15 - .../underscore_edge_container_3.exp.json | 15 - .../underscore_edge_container_4.exp.json | 15 - .../underscore_edge_container_5.exp.json | 15 - .../TestMove/underscore_edge_split.exp.json | 21 - .../TestMove/underscore_merge.exp.json | 12 - .../TestMove/underscore_split.exp.json | 15 - .../TestMove/underscore_split_out.exp.json | 18 - .../TestMove/underscore_transplant.exp.json | 12 - .../d2oracle/TestMove/unique_name.exp.json | 15 - .../unique_name_with_references.exp.json | 21 - testdata/d2oracle/TestRename/arrows.exp.json | 12 - .../d2oracle/TestRename/arrows_chain.exp.json | 24 - .../TestRename/arrows_complex.exp.json | 18 - .../TestRename/arrows_trim_common.exp.json | 27 - .../TestRename/arrows_trim_common_2.exp.json | 27 - .../TestRename/complex_edge_1.exp.json | 18 - .../TestRename/complex_edge_2.exp.json | 18 - .../d2oracle/TestRename/conflict.exp.json | 9 - .../d2oracle/TestRename/conflict_2.exp.json | 18 - .../TestRename/conflict_with_dots.exp.json | 9 - .../d2oracle/TestRename/container.exp.json | 72 -- testdata/d2oracle/TestRename/edges.exp.json | 45 - testdata/d2oracle/TestRename/flat.exp.json | 6 - .../d2oracle/TestRename/generated.exp.json | 6 - testdata/d2oracle/TestRename/near.exp.json | 9 - testdata/d2oracle/TestRename/nested.exp.json | 18 - testdata/d2oracle/TestSet/base.exp.json | 6 - .../TestSet/block_string_multiline.exp.json | 6 - .../TestSet/block_string_oneline.exp.json | 6 - testdata/d2oracle/TestSet/edge.exp.json | 12 - .../TestSet/edge_append_style.exp.json | 12 - testdata/d2oracle/TestSet/edge_chain.exp.json | 21 - .../TestSet/edge_chain_append_style.exp.json | 18 - .../edge_chain_existing_style.exp.json | 18 - .../TestSet/edge_chain_nested_set.exp.json | 21 - .../d2oracle/TestSet/edge_index_case.exp.json | 27 - .../TestSet/edge_index_nested.exp.json | 15 - .../TestSet/edge_key_and_key.exp.json | 15 - testdata/d2oracle/TestSet/edge_label.exp.json | 12 - .../TestSet/edge_merge_style.exp.json | 12 - .../TestSet/edge_nested_label_set.exp.json | 15 - .../TestSet/edge_nested_style_set.exp.json | 15 - .../TestSet/expanded_map_style.exp.json | 6 - testdata/d2oracle/TestSet/icon.exp.json | 6 - .../d2oracle/TestSet/inline_style.exp.json | 6 - testdata/d2oracle/TestSet/label.exp.json | 6 - .../d2oracle/TestSet/label_primary.exp.json | 15 - .../d2oracle/TestSet/label_replace.exp.json | 6 - .../d2oracle/TestSet/label_unset.exp.json | 6 - .../d2oracle/TestSet/map_key_missing.exp.json | 12 - .../d2oracle/TestSet/nested_alex.exp.json | 15 - testdata/d2oracle/TestSet/new_style.exp.json | 6 - .../d2oracle/TestSet/replace_shape.exp.json | 6 - .../d2oracle/TestSet/replace_style.exp.json | 6 - .../TestSet/replace_style_edgecase.exp.json | 6 - testdata/d2oracle/TestSet/shape.exp.json | 6 - .../TestSet/shape_nested_style_set.exp.json | 6 - 290 files changed, 9 insertions(+), 4779 deletions(-) diff --git a/testdata/d2compiler/TestCompile/basic_icon.exp.json b/testdata/d2compiler/TestCompile/basic_icon.exp.json index 448df439b..7a8cdb048 100644 --- a/testdata/d2compiler/TestCompile/basic_icon.exp.json +++ b/testdata/d2compiler/TestCompile/basic_icon.exp.json @@ -86,9 +86,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -150,9 +147,6 @@ "Fragment": "", "RawFragment": "" }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/basic_sequence.exp.json b/testdata/d2compiler/TestCompile/basic_sequence.exp.json index 9ecebd2e6..676d6ae9b 100644 --- a/testdata/d2compiler/TestCompile/basic_sequence.exp.json +++ b/testdata/d2compiler/TestCompile/basic_sequence.exp.json @@ -81,9 +81,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -133,9 +130,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "sequence_diagram" diff --git a/testdata/d2compiler/TestCompile/basic_shape.exp.json b/testdata/d2compiler/TestCompile/basic_shape.exp.json index af71e80da..794e3ba97 100644 --- a/testdata/d2compiler/TestCompile/basic_shape.exp.json +++ b/testdata/d2compiler/TestCompile/basic_shape.exp.json @@ -81,9 +81,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -133,9 +130,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "circle" diff --git a/testdata/d2compiler/TestCompile/basic_style.exp.json b/testdata/d2compiler/TestCompile/basic_style.exp.json index ae15a5a11..0db1b4c66 100644 --- a/testdata/d2compiler/TestCompile/basic_style.exp.json +++ b/testdata/d2compiler/TestCompile/basic_style.exp.json @@ -88,9 +88,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -144,9 +141,6 @@ "value": "0.4" } }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/class_paren.exp.json b/testdata/d2compiler/TestCompile/class_paren.exp.json index 3b04c57b4..450f61d62 100644 --- a/testdata/d2compiler/TestCompile/class_paren.exp.json +++ b/testdata/d2compiler/TestCompile/class_paren.exp.json @@ -180,9 +180,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -253,9 +250,6 @@ "value": "shape" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "class" diff --git a/testdata/d2compiler/TestCompile/class_style.exp.json b/testdata/d2compiler/TestCompile/class_style.exp.json index 327ab6b1f..c8a11220a 100644 --- a/testdata/d2compiler/TestCompile/class_style.exp.json +++ b/testdata/d2compiler/TestCompile/class_style.exp.json @@ -154,9 +154,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -220,9 +217,6 @@ "value": "0.4" } }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "class" diff --git a/testdata/d2compiler/TestCompile/constraint_label.exp.json b/testdata/d2compiler/TestCompile/constraint_label.exp.json index 14c1559bc..79e7fd283 100644 --- a/testdata/d2compiler/TestCompile/constraint_label.exp.json +++ b/testdata/d2compiler/TestCompile/constraint_label.exp.json @@ -114,9 +114,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -166,9 +163,6 @@ "value": "bar" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/default_direction.exp.json b/testdata/d2compiler/TestCompile/default_direction.exp.json index af045b007..fa0120ac5 100644 --- a/testdata/d2compiler/TestCompile/default_direction.exp.json +++ b/testdata/d2compiler/TestCompile/default_direction.exp.json @@ -42,9 +42,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -94,9 +91,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/dimension_with_style.exp.json b/testdata/d2compiler/TestCompile/dimension_with_style.exp.json index c0d4d18fd..391a94b8b 100644 --- a/testdata/d2compiler/TestCompile/dimension_with_style.exp.json +++ b/testdata/d2compiler/TestCompile/dimension_with_style.exp.json @@ -116,9 +116,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -172,9 +169,6 @@ "value": "true" } }, - "link": { - "value": "" - }, "width": { "value": "200" }, diff --git a/testdata/d2compiler/TestCompile/dimensions_on_nonimage.exp.json b/testdata/d2compiler/TestCompile/dimensions_on_nonimage.exp.json index 87d8a8ff4..028a12b83 100644 --- a/testdata/d2compiler/TestCompile/dimensions_on_nonimage.exp.json +++ b/testdata/d2compiler/TestCompile/dimensions_on_nonimage.exp.json @@ -144,9 +144,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -196,9 +193,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "width": { "value": "200" }, diff --git a/testdata/d2compiler/TestCompile/edge.exp.json b/testdata/d2compiler/TestCompile/edge.exp.json index 41086f63f..87005d17f 100644 --- a/testdata/d2compiler/TestCompile/edge.exp.json +++ b/testdata/d2compiler/TestCompile/edge.exp.json @@ -65,9 +65,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -103,9 +100,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -155,9 +149,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -205,9 +196,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json b/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json index 495ac7cd2..b30abffa3 100644 --- a/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json +++ b/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json @@ -244,9 +244,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -276,9 +273,6 @@ "value": "Reisner's Rule of Conceptual Inertia" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "diamond" @@ -300,9 +294,6 @@ "value": "true" } }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -324,9 +315,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -376,9 +364,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -426,9 +411,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_chain.exp.json b/testdata/d2compiler/TestCompile/edge_chain.exp.json index 607d5801d..93f38391b 100644 --- a/testdata/d2compiler/TestCompile/edge_chain.exp.json +++ b/testdata/d2compiler/TestCompile/edge_chain.exp.json @@ -112,9 +112,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -150,9 +147,6 @@ "value": "The kids will love our inflatable slides" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -187,9 +181,6 @@ "value": "The kids will love our inflatable slides" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -239,9 +230,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -309,9 +297,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -359,9 +344,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_chain_map.exp.json b/testdata/d2compiler/TestCompile/edge_chain_map.exp.json index d1f436dd4..d9f3b7648 100644 --- a/testdata/d2compiler/TestCompile/edge_chain_map.exp.json +++ b/testdata/d2compiler/TestCompile/edge_chain_map.exp.json @@ -141,9 +141,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -179,9 +176,6 @@ "value": "Space: the final frontier. These are the voyages of the starship Enterprise." }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -216,9 +210,6 @@ "value": "Space: the final frontier. These are the voyages of the starship Enterprise." }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -268,9 +259,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -338,9 +326,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -388,9 +373,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_column_index.exp.json b/testdata/d2compiler/TestCompile/edge_column_index.exp.json index c6645463d..2af478ac8 100644 --- a/testdata/d2compiler/TestCompile/edge_column_index.exp.json +++ b/testdata/d2compiler/TestCompile/edge_column_index.exp.json @@ -343,9 +343,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -383,9 +380,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -526,9 +520,6 @@ "value": "src" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "sql_table" @@ -667,9 +658,6 @@ "value": "dst" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "sql_table" diff --git a/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json b/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json index de31547fa..829b33077 100644 --- a/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json +++ b/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json @@ -110,9 +110,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -152,9 +149,6 @@ "value": "true" } }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -204,9 +198,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -254,9 +245,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json index ea736f843..72fe99087 100644 --- a/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json @@ -153,9 +153,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -185,9 +182,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "diamond" @@ -213,9 +207,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -285,9 +276,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -355,9 +343,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json index 02965c6de..40c0516d0 100644 --- a/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json @@ -121,9 +121,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -153,9 +150,6 @@ "value": "yo" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -178,9 +172,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -230,9 +221,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -280,9 +268,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_in_column.exp.json b/testdata/d2compiler/TestCompile/edge_in_column.exp.json index b13a69ba1..4a390573c 100644 --- a/testdata/d2compiler/TestCompile/edge_in_column.exp.json +++ b/testdata/d2compiler/TestCompile/edge_in_column.exp.json @@ -1,792 +1,15 @@ { -<<<<<<< HEAD - "graph": { - "name": "", - "ast": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,0:0:0-3:1:39", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,0:0:0-3:1:39", - "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,0:3:3-3:0:38", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,1:2:7-1:18:23", - "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,1:2:7-1:7:12", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,1:2:7-1:7:12", - "value": [ - { - "string": "shape", - "raw_string": "shape" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,1:9:14-1:18:23", - "value": [ - { - "string": "sql_table", - "raw_string": "sql_table" - } - ] - } - } - } - }, - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,2:2:26-2:13:37", - "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,2:2:26-2:3:27", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,2:2:26-2:3:27", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,2:5:29-2:12:36", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,2:6:30-2:12:36", - "edges": [ - { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,2:6:30-2:12:36", - "src": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,2:6:30-2:8:32", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,2:6:30-2:7:31", - "value": [ - { - "string": "p", - "raw_string": "p" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,2:10:34-2:12:36", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,2:11:35-2:12:36", - "value": [ - { - "string": "q", - "raw_string": "q" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } - ] - } - } - } - } - ] - } - } - } - } - ] - }, - "root": { - "id": "", - "id_val": "", - "label_dimensions": { - "width": 0, - "height": 0 - }, - "attributes": { - "label": { - "value": "" - }, - "style": {}, - "link": { - "value": "" - }, - "near_key": null, - "shape": { - "value": "" - }, - "direction": { - "value": "" - }, - "constraint": { - "value": "" - } - }, - "zIndex": 0 - }, - "edges": [ -||||||| 0da4e150 - "graph": { - "name": "", - "ast": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,0:0:0-3:1:39", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,0:0:0-3:1:39", - "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,0:3:3-3:0:38", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,1:2:7-1:18:23", - "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,1:2:7-1:7:12", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,1:2:7-1:7:12", - "value": [ - { - "string": "shape", - "raw_string": "shape" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,1:9:14-1:18:23", - "value": [ - { - "string": "sql_table", - "raw_string": "sql_table" - } - ] - } - } - } - }, - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,2:2:26-2:13:37", - "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,2:2:26-2:3:27", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,2:2:26-2:3:27", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,2:5:29-2:12:36", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,2:6:30-2:12:36", - "edges": [ - { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,2:6:30-2:12:36", - "src": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,2:6:30-2:8:32", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,2:6:30-2:7:31", - "value": [ - { - "string": "p", - "raw_string": "p" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,2:10:34-2:12:36", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,2:11:35-2:12:36", - "value": [ - { - "string": "q", - "raw_string": "q" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } - ] - } - } - } - } - ] - } - } - } - } - ] - }, - "root": { - "id": "", - "id_val": "", - "label_dimensions": { - "width": 0, - "height": 0 - }, - "attributes": { - "label": { - "value": "" - }, - "style": {}, - "near_key": null, - "shape": { - "value": "" - }, - "direction": { - "value": "" - }, - "constraint": { - "value": "" - } - }, - "zIndex": 0 - }, - "edges": [ -======= "graph": null, "err": { "ioerr": null, "errs": [ ->>>>>>> master { -<<<<<<< HEAD - "index": 0, - "minWidth": 0, - "minHeight": 0, - "label_dimensions": { - "width": 0, - "height": 0 - }, - "isCurve": false, - "src_arrow": false, - "dst_arrow": true, - "references": [ - { - "map_key_edge_index": 0 - } - ], - "attributes": { - "label": { - "value": "" - }, - "style": {}, - "link": { - "value": "" - }, - "near_key": null, - "shape": { - "value": "" - }, - "direction": { - "value": "" - }, - "constraint": { - "value": "" - } - }, - "zIndex": 0 - } - ], - "objects": [ - { - "id": "x", - "id_val": "x", - "label_dimensions": { - "width": 0, - "height": 0 - }, - "references": [ - { - "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.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": "x", - "fontSize": 0, - "fontFamily": "", - "language": "", - "color": "", - "italic": false, - "bold": false, - "underline": false, - "labelWidth": 0, - "labelHeight": 0 - }, - "type": { - "label": "", - "fontSize": 0, - "fontFamily": "", - "language": "", - "color": "", - "italic": false, - "bold": false, - "underline": false, - "labelWidth": 0, - "labelHeight": 0 - }, - "constraint": "", - "reference": "" - } - ] - }, - "attributes": { - "label": { - "value": "x" - }, - "style": {}, - "link": { - "value": "" - }, - "near_key": null, - "shape": { - "value": "sql_table" - }, - "direction": { - "value": "" - }, - "constraint": { - "value": "" - } - }, - "zIndex": 0 -||||||| 0da4e150 - "index": 0, - "minWidth": 0, - "minHeight": 0, - "label_dimensions": { - "width": 0, - "height": 0 - }, - "isCurve": false, - "src_arrow": false, - "dst_arrow": true, - "references": [ - { - "map_key_edge_index": 0 - } - ], - "attributes": { - "label": { - "value": "" - }, - "style": {}, - "near_key": null, - "shape": { - "value": "" - }, - "direction": { - "value": "" - }, - "constraint": { - "value": "" - } - }, - "zIndex": 0 - } - ], - "objects": [ - { - "id": "x", - "id_val": "x", - "label_dimensions": { - "width": 0, - "height": 0 - }, - "references": [ - { - "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.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": "x", - "fontSize": 0, - "fontFamily": "", - "language": "", - "color": "", - "italic": false, - "bold": false, - "underline": false, - "labelWidth": 0, - "labelHeight": 0 - }, - "type": { - "label": "", - "fontSize": 0, - "fontFamily": "", - "language": "", - "color": "", - "italic": false, - "bold": false, - "underline": false, - "labelWidth": 0, - "labelHeight": 0 - }, - "constraint": "", - "reference": "" - } - ] - }, - "attributes": { - "label": { - "value": "x" - }, - "style": {}, - "near_key": null, - "shape": { - "value": "sql_table" - }, - "direction": { - "value": "" - }, - "constraint": { - "value": "" - } - }, - "zIndex": 0 -======= "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,2:6:30-2:7:31", "errmsg": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2:3:7: sql_table columns cannot have children" ->>>>>>> master }, { -<<<<<<< HEAD - "id": "p", - "id_val": "p", - "label_dimensions": { - "width": 0, - "height": 0 - }, - "references": [ - { - "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,2:6:30-2:8:32", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,2:6:30-2:7:31", - "value": [ - { - "string": "p", - "raw_string": "p" - } - ] - } - } - ] - }, - "key_path_index": 0, - "map_key_edge_index": 0 - } - ], - "attributes": { - "label": { - "value": "p" - }, - "style": {}, - "link": { - "value": "" - }, - "near_key": null, - "shape": { - "value": "rectangle" - }, - "direction": { - "value": "" - }, - "constraint": { - "value": "" - } - }, - "zIndex": 0 - }, - { - "id": "q", - "id_val": "q", - "label_dimensions": { - "width": 0, - "height": 0 - }, - "references": [ - { - "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,2:10:34-2:12:36", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,2:11:35-2:12:36", - "value": [ - { - "string": "q", - "raw_string": "q" - } - ] - } - } - ] - }, - "key_path_index": 0, - "map_key_edge_index": 0 - } - ], - "attributes": { - "label": { - "value": "q" - }, - "style": {}, - "link": { - "value": "" - }, - "near_key": null, - "shape": { - "value": "rectangle" - }, - "direction": { - "value": "" - }, - "constraint": { - "value": "" - } - }, - "zIndex": 0 -||||||| 0da4e150 - "id": "p", - "id_val": "p", - "label_dimensions": { - "width": 0, - "height": 0 - }, - "references": [ - { - "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,2:6:30-2:8:32", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,2:6:30-2:7:31", - "value": [ - { - "string": "p", - "raw_string": "p" - } - ] - } - } - ] - }, - "key_path_index": 0, - "map_key_edge_index": 0 - } - ], - "attributes": { - "label": { - "value": "p" - }, - "style": {}, - "near_key": null, - "shape": { - "value": "rectangle" - }, - "direction": { - "value": "" - }, - "constraint": { - "value": "" - } - }, - "zIndex": 0 - }, - { - "id": "q", - "id_val": "q", - "label_dimensions": { - "width": 0, - "height": 0 - }, - "references": [ - { - "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,2:10:34-2:12:36", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,2:11:35-2:12:36", - "value": [ - { - "string": "q", - "raw_string": "q" - } - ] - } - } - ] - }, - "key_path_index": 0, - "map_key_edge_index": 0 - } - ], - "attributes": { - "label": { - "value": "q" - }, - "style": {}, - "near_key": null, - "shape": { - "value": "rectangle" - }, - "direction": { - "value": "" - }, - "constraint": { - "value": "" - } - }, - "zIndex": 0 -======= "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,2:11:35-2:12:36", "errmsg": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2:3:12: sql_table columns cannot have children" ->>>>>>> master } ] } diff --git a/testdata/d2compiler/TestCompile/edge_index.exp.json b/testdata/d2compiler/TestCompile/edge_index.exp.json index cd4adae88..8f8477966 100644 --- a/testdata/d2compiler/TestCompile/edge_index.exp.json +++ b/testdata/d2compiler/TestCompile/edge_index.exp.json @@ -136,9 +136,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -177,9 +174,6 @@ "value": "two" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -249,9 +243,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -319,9 +310,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_index_map.exp.json b/testdata/d2compiler/TestCompile/edge_index_map.exp.json index 9d51f65ba..a39b54f40 100644 --- a/testdata/d2compiler/TestCompile/edge_index_map.exp.json +++ b/testdata/d2compiler/TestCompile/edge_index_map.exp.json @@ -155,9 +155,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -196,9 +193,6 @@ "value": "Space: the final frontier. These are the voyages of the starship Enterprise." }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -268,9 +262,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -338,9 +329,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_index_nested.exp.json b/testdata/d2compiler/TestCompile/edge_index_nested.exp.json index f2e8cbdf8..ccd156c58 100644 --- a/testdata/d2compiler/TestCompile/edge_index_nested.exp.json +++ b/testdata/d2compiler/TestCompile/edge_index_nested.exp.json @@ -165,9 +165,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -206,9 +203,6 @@ "value": "two" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -258,9 +252,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -328,9 +319,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -398,9 +386,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" 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 b0840d83a..906ff7221 100644 --- a/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json +++ b/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json @@ -181,9 +181,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -222,9 +219,6 @@ "value": "two" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -294,9 +288,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -364,9 +355,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -434,9 +422,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" 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 b8c905f86..2672b1d9f 100644 --- a/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.exp.json +++ b/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.exp.json @@ -194,9 +194,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -239,9 +236,6 @@ "value": "0.4" } }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -311,9 +305,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -381,9 +372,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -451,9 +439,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" 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 cb7d94a81..b71616dca 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 @@ -200,9 +200,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -245,9 +242,6 @@ "value": "0.4" } }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -297,9 +291,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -347,9 +338,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -397,9 +385,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" 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 e2aa20c87..0c97a8965 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 @@ -213,9 +213,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -258,9 +255,6 @@ "value": "0.4" } }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -310,9 +304,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -360,9 +351,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -410,9 +398,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" 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 499269e1f..1566cc1cd 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 @@ -231,9 +231,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -276,9 +273,6 @@ "value": "0.4" } }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -328,9 +322,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -378,9 +369,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -428,9 +416,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_label_map.exp.json b/testdata/d2compiler/TestCompile/edge_label_map.exp.json index beae838be..267fcd755 100644 --- a/testdata/d2compiler/TestCompile/edge_label_map.exp.json +++ b/testdata/d2compiler/TestCompile/edge_label_map.exp.json @@ -121,9 +121,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -163,9 +160,6 @@ "value": "0.5" } }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -215,9 +209,6 @@ "value": "hey y9" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -265,9 +256,6 @@ "value": "qwer" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_map.exp.json b/testdata/d2compiler/TestCompile/edge_map.exp.json index 28a6b6fee..38c27848e 100644 --- a/testdata/d2compiler/TestCompile/edge_map.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map.exp.json @@ -104,9 +104,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -142,9 +139,6 @@ "value": "Space: the final frontier. These are the voyages of the starship Enterprise." }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -194,9 +188,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -244,9 +235,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json index b3c85e3a5..dee106300 100644 --- a/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json @@ -133,9 +133,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -165,9 +162,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "diamond" @@ -190,9 +184,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -242,9 +233,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -292,9 +280,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json b/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json index a8e8c19a3..3be603501 100644 --- a/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json @@ -149,9 +149,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -194,9 +191,6 @@ "value": "0.4" } }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -266,9 +260,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -336,9 +327,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json b/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json index c01257a6b..c2c30b2ea 100644 --- a/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json @@ -167,9 +167,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -212,9 +209,6 @@ "value": "0.4" } }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -284,9 +278,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -354,9 +345,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_map_nested.exp.json b/testdata/d2compiler/TestCompile/edge_map_nested.exp.json index 77f9d68e9..866afcedd 100644 --- a/testdata/d2compiler/TestCompile/edge_map_nested.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_nested.exp.json @@ -129,9 +129,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -171,9 +168,6 @@ "value": "0.4" } }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -223,9 +217,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -273,9 +264,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json b/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json index 4fc99381d..61d6ac371 100644 --- a/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json @@ -111,9 +111,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -153,9 +150,6 @@ "value": "0.4" } }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -205,9 +199,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -255,9 +246,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json index 268f23191..98543d75c 100644 --- a/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json @@ -221,9 +221,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -253,9 +250,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "diamond" @@ -273,9 +267,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "diamond" @@ -300,9 +291,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -372,9 +360,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -442,9 +427,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json index b34f2651e..4f81963ec 100644 --- a/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json @@ -115,9 +115,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -147,9 +144,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "triangle" @@ -172,9 +166,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -224,9 +215,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -274,9 +262,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json index 493d7fe03..537e5cea5 100644 --- a/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json @@ -171,9 +171,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -203,9 +200,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "diamond" @@ -231,9 +225,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -303,9 +294,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -373,9 +361,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/escaped_id.exp.json b/testdata/d2compiler/TestCompile/escaped_id.exp.json index 027509fde..de942475c 100644 --- a/testdata/d2compiler/TestCompile/escaped_id.exp.json +++ b/testdata/d2compiler/TestCompile/escaped_id.exp.json @@ -42,9 +42,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -94,9 +91,6 @@ "value": "b\nb" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/image_style.exp.json b/testdata/d2compiler/TestCompile/image_style.exp.json index 84ba55e1e..0702d187b 100644 --- a/testdata/d2compiler/TestCompile/image_style.exp.json +++ b/testdata/d2compiler/TestCompile/image_style.exp.json @@ -163,9 +163,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -231,9 +228,6 @@ "Fragment": "", "RawFragment": "" }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "image" diff --git a/testdata/d2compiler/TestCompile/link-board-nested.exp.json b/testdata/d2compiler/TestCompile/link-board-nested.exp.json index 4cac13579..4b6819f02 100644 --- a/testdata/d2compiler/TestCompile/link-board-nested.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-nested.exp.json @@ -1,12 +1,13 @@ { "graph": { "name": "", + "isFolderOnly": false, "ast": { "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:0:0-7:1:75", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:8:8-0:25:25", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:0:0-0:25:25", "key": { "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:0:0-0:6:6", "path": [ @@ -172,9 +173,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -255,12 +253,13 @@ "layers": [ { "name": "x", + "isFolderOnly": false, "ast": { "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:0:0-7:1:75", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:8:8-0:25:25", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:0:0-0:25:25", "key": { "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:0:0-0:6:6", "path": [ @@ -426,9 +425,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" diff --git a/testdata/d2compiler/TestCompile/link-board-ok.exp.json b/testdata/d2compiler/TestCompile/link-board-ok.exp.json index b6e66ee2f..eb07427b9 100644 --- a/testdata/d2compiler/TestCompile/link-board-ok.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-ok.exp.json @@ -1,12 +1,13 @@ { "graph": { "name": "", + "isFolderOnly": false, "ast": { "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,0:0:0-3:1:32", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,0:8:8-0:16:16", + "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,0:0:0-0:16:16", "key": { "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,0:0:0-0:6:6", "path": [ @@ -114,9 +115,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" diff --git a/testdata/d2compiler/TestCompile/near_constant.exp.json b/testdata/d2compiler/TestCompile/near_constant.exp.json index f10911516..c19123bcf 100644 --- a/testdata/d2compiler/TestCompile/near_constant.exp.json +++ b/testdata/d2compiler/TestCompile/near_constant.exp.json @@ -63,9 +63,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -126,9 +123,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": { "range": "d2/testdata/d2compiler/TestCompile/near_constant.d2,0:8:8-0:18:18", "path": [ diff --git a/testdata/d2compiler/TestCompile/nested_sql.exp.json b/testdata/d2compiler/TestCompile/nested_sql.exp.json index 35f41085d..3e8e30ad2 100644 --- a/testdata/d2compiler/TestCompile/nested_sql.exp.json +++ b/testdata/d2compiler/TestCompile/nested_sql.exp.json @@ -176,9 +176,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -228,9 +225,6 @@ "value": "outer" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -338,9 +332,6 @@ "value": "table" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "sql_table" diff --git a/testdata/d2compiler/TestCompile/null.exp.json b/testdata/d2compiler/TestCompile/null.exp.json index 701c46cc6..bff516303 100644 --- a/testdata/d2compiler/TestCompile/null.exp.json +++ b/testdata/d2compiler/TestCompile/null.exp.json @@ -42,9 +42,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -94,9 +91,6 @@ "value": "null" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/path_link.exp.json b/testdata/d2compiler/TestCompile/path_link.exp.json index 9a5080163..9c08d24ad 100644 --- a/testdata/d2compiler/TestCompile/path_link.exp.json +++ b/testdata/d2compiler/TestCompile/path_link.exp.json @@ -31,7 +31,7 @@ "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/path_link.d2,1:8:13-1:39:44", + "range": "d2/testdata/d2compiler/TestCompile/path_link.d2,1:2:7-1:39:44", "key": { "range": "d2/testdata/d2compiler/TestCompile/path_link.d2,1:2:7-1:6:11", "path": [ @@ -81,9 +81,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" diff --git a/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json b/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json index 2fa5276f8..b8e63235a 100644 --- a/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json +++ b/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json @@ -276,9 +276,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -381,9 +378,6 @@ "Fragment": "", "RawFragment": "" }, - "link": { - "value": "" - }, "near_key": { "range": "d2/testdata/d2compiler/TestCompile/reserved_icon_near_style.d2,6:8:90-6:9:91", "path": [ @@ -446,9 +440,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/root_direction.exp.json b/testdata/d2compiler/TestCompile/root_direction.exp.json index 64d54aa36..9e491c7cc 100644 --- a/testdata/d2compiler/TestCompile/root_direction.exp.json +++ b/testdata/d2compiler/TestCompile/root_direction.exp.json @@ -52,9 +52,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" diff --git a/testdata/d2compiler/TestCompile/root_sequence.exp.json b/testdata/d2compiler/TestCompile/root_sequence.exp.json index 22936afce..185ef79ad 100644 --- a/testdata/d2compiler/TestCompile/root_sequence.exp.json +++ b/testdata/d2compiler/TestCompile/root_sequence.exp.json @@ -52,9 +52,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "sequence_diagram" diff --git a/testdata/d2compiler/TestCompile/self-referencing.exp.json b/testdata/d2compiler/TestCompile/self-referencing.exp.json index 242faaa00..1c38808f2 100644 --- a/testdata/d2compiler/TestCompile/self-referencing.exp.json +++ b/testdata/d2compiler/TestCompile/self-referencing.exp.json @@ -65,9 +65,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -103,9 +100,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -175,9 +169,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/sequence_container.exp.json b/testdata/d2compiler/TestCompile/sequence_container.exp.json index 6fda1fe67..3c70617f7 100644 --- a/testdata/d2compiler/TestCompile/sequence_container.exp.json +++ b/testdata/d2compiler/TestCompile/sequence_container.exp.json @@ -261,9 +261,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "sequence_diagram" @@ -299,9 +296,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -336,9 +330,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -452,9 +443,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -566,9 +554,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -680,9 +665,6 @@ "value": "q" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -794,9 +776,6 @@ "value": "j" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -908,9 +887,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -1022,9 +998,6 @@ "value": "p" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -1072,9 +1045,6 @@ "value": "ok" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/sequence_container_2.exp.json b/testdata/d2compiler/TestCompile/sequence_container_2.exp.json index 4c5f0f419..7c673a875 100644 --- a/testdata/d2compiler/TestCompile/sequence_container_2.exp.json +++ b/testdata/d2compiler/TestCompile/sequence_container_2.exp.json @@ -239,9 +239,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "sequence_diagram" @@ -277,9 +274,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -393,9 +387,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -507,9 +498,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -621,9 +609,6 @@ "value": "q" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -671,9 +656,6 @@ "value": "ok" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -743,9 +725,6 @@ "value": "j" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -815,9 +794,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -887,9 +863,6 @@ "value": "p" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -937,9 +910,6 @@ "value": "meow" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/sequence_grouped_note.exp.json b/testdata/d2compiler/TestCompile/sequence_grouped_note.exp.json index 22f06ed68..1efddcb4c 100644 --- a/testdata/d2compiler/TestCompile/sequence_grouped_note.exp.json +++ b/testdata/d2compiler/TestCompile/sequence_grouped_note.exp.json @@ -161,9 +161,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "sequence_diagram" @@ -213,9 +210,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -294,9 +288,6 @@ "value": "d" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -344,9 +335,6 @@ "value": "choo" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -405,9 +393,6 @@ "value": "this note" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/sequence_scoping.exp.json b/testdata/d2compiler/TestCompile/sequence_scoping.exp.json index e193fbcef..cf90fb88d 100644 --- a/testdata/d2compiler/TestCompile/sequence_scoping.exp.json +++ b/testdata/d2compiler/TestCompile/sequence_scoping.exp.json @@ -349,9 +349,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -387,9 +384,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -424,9 +418,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -461,9 +452,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -513,9 +501,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "sequence_diagram" @@ -614,9 +599,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -788,9 +770,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -838,9 +817,6 @@ "value": "group" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -899,9 +875,6 @@ "value": "t1" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -1033,9 +1006,6 @@ "value": "t1" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -1105,9 +1075,6 @@ "value": "t2" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/set_direction.exp.json b/testdata/d2compiler/TestCompile/set_direction.exp.json index 20fb3dd0d..672c6a4b3 100644 --- a/testdata/d2compiler/TestCompile/set_direction.exp.json +++ b/testdata/d2compiler/TestCompile/set_direction.exp.json @@ -81,9 +81,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -133,9 +130,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/single_dimension_on_circle.exp.json b/testdata/d2compiler/TestCompile/single_dimension_on_circle.exp.json index 2ae8b8ec0..4d9f5da50 100644 --- a/testdata/d2compiler/TestCompile/single_dimension_on_circle.exp.json +++ b/testdata/d2compiler/TestCompile/single_dimension_on_circle.exp.json @@ -115,9 +115,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -167,9 +164,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "height": { "value": "230" }, diff --git a/testdata/d2compiler/TestCompile/sql-regression.exp.json b/testdata/d2compiler/TestCompile/sql-regression.exp.json index 992f540bc..5bf808844 100644 --- a/testdata/d2compiler/TestCompile/sql-regression.exp.json +++ b/testdata/d2compiler/TestCompile/sql-regression.exp.json @@ -218,9 +218,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -274,9 +271,6 @@ "value": "lemonchiffon" } }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -356,9 +350,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "sql_table" @@ -406,9 +397,6 @@ "value": "d" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/sql_paren.exp.json b/testdata/d2compiler/TestCompile/sql_paren.exp.json index 768d71a99..1fe4cb57d 100644 --- a/testdata/d2compiler/TestCompile/sql_paren.exp.json +++ b/testdata/d2compiler/TestCompile/sql_paren.exp.json @@ -157,9 +157,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -269,9 +266,6 @@ "value": "shape" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "sql_table" diff --git a/testdata/d2compiler/TestCompile/stroke-width.exp.json b/testdata/d2compiler/TestCompile/stroke-width.exp.json index 96d264414..d69521ac6 100644 --- a/testdata/d2compiler/TestCompile/stroke-width.exp.json +++ b/testdata/d2compiler/TestCompile/stroke-width.exp.json @@ -88,9 +88,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -144,9 +141,6 @@ "value": "0" } }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/table_connection_attr.exp.json b/testdata/d2compiler/TestCompile/table_connection_attr.exp.json index e4822fafc..4e37dbe96 100644 --- a/testdata/d2compiler/TestCompile/table_connection_attr.exp.json +++ b/testdata/d2compiler/TestCompile/table_connection_attr.exp.json @@ -302,9 +302,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -346,9 +343,6 @@ "value": "true" } }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -461,9 +455,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "sql_table" @@ -574,9 +565,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "sql_table" diff --git a/testdata/d2compiler/TestCompile/table_style.exp.json b/testdata/d2compiler/TestCompile/table_style.exp.json index 3acb5fadc..c121ac01f 100644 --- a/testdata/d2compiler/TestCompile/table_style.exp.json +++ b/testdata/d2compiler/TestCompile/table_style.exp.json @@ -154,9 +154,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -242,9 +239,6 @@ "value": "0.4" } }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "sql_table" diff --git a/testdata/d2compiler/TestCompile/table_style_map.exp.json b/testdata/d2compiler/TestCompile/table_style_map.exp.json index d97de3e96..ede7c0ad4 100644 --- a/testdata/d2compiler/TestCompile/table_style_map.exp.json +++ b/testdata/d2compiler/TestCompile/table_style_map.exp.json @@ -205,9 +205,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -296,9 +293,6 @@ "value": "blue" } }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "sql_table" diff --git a/testdata/d2compiler/TestCompile/underscore_edge.exp.json b/testdata/d2compiler/TestCompile/underscore_edge.exp.json index 27737c5c6..f19ce6a8c 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge.exp.json @@ -116,9 +116,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -154,9 +151,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -237,9 +231,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -298,9 +289,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json index 52aafa69e..d7ce10dcb 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json @@ -175,9 +175,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -213,9 +210,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -250,9 +244,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -364,9 +355,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -425,9 +413,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -486,9 +471,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json index 8d26dce2c..ff3b0c66b 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json @@ -182,9 +182,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -220,9 +217,6 @@ "value": "Can you imagine how life could be improved if we could do away with" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -257,9 +251,6 @@ "value": "Well, it's garish, ugly, and derelicts have used it for a toilet." }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -340,9 +331,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -421,9 +409,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -471,9 +456,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json index 571b1c0c1..27b8f3d1b 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json @@ -187,9 +187,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -228,9 +225,6 @@ "value": "Well, it's garish, ugly, and derelicts have used it for a toilet." }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -280,9 +274,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -330,9 +321,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -380,9 +368,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json index 3a53d3862..37ff7be18 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json @@ -156,9 +156,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -194,9 +191,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -246,9 +240,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -327,9 +318,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -399,9 +387,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/underscore_parent_create.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_create.exp.json index 728fda5f1..380951b20 100644 --- a/testdata/d2compiler/TestCompile/underscore_parent_create.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_parent_create.exp.json @@ -82,9 +82,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -134,9 +131,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -195,9 +189,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/underscore_parent_not_root.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_not_root.exp.json index d9c54f3bc..3972b42e8 100644 --- a/testdata/d2compiler/TestCompile/underscore_parent_not_root.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_parent_not_root.exp.json @@ -111,9 +111,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -163,9 +160,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -213,9 +207,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -274,9 +265,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/underscore_parent_preference_1.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_preference_1.exp.json index 7dd19e101..44b01dc8f 100644 --- a/testdata/d2compiler/TestCompile/underscore_parent_preference_1.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_parent_preference_1.exp.json @@ -125,9 +125,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -177,9 +174,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -258,9 +252,6 @@ "value": "But it's real. And if it's real it can be affected ... we may not be able" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/underscore_parent_preference_2.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_preference_2.exp.json index 72269fdde..97b34c3e4 100644 --- a/testdata/d2compiler/TestCompile/underscore_parent_preference_2.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_parent_preference_2.exp.json @@ -125,9 +125,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -208,9 +205,6 @@ "value": "All we are given is possibilities -- to make ourselves one thing or another." }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -258,9 +252,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/underscore_parent_squared.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_squared.exp.json index a2b6bd352..e059d5912 100644 --- a/testdata/d2compiler/TestCompile/underscore_parent_squared.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_parent_squared.exp.json @@ -122,9 +122,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -174,9 +171,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -224,9 +218,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -296,9 +287,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/underscore_unresolved_obj.exp.json b/testdata/d2compiler/TestCompile/underscore_unresolved_obj.exp.json index 6044064a0..21964b724 100644 --- a/testdata/d2compiler/TestCompile/underscore_unresolved_obj.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_unresolved_obj.exp.json @@ -82,9 +82,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -134,9 +131,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -195,9 +189,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/unescaped_id_cr.exp.json b/testdata/d2compiler/TestCompile/unescaped_id_cr.exp.json index c0bdbb33a..40c3c1246 100644 --- a/testdata/d2compiler/TestCompile/unescaped_id_cr.exp.json +++ b/testdata/d2compiler/TestCompile/unescaped_id_cr.exp.json @@ -42,9 +42,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -94,9 +91,6 @@ "value": "b\rb" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/url_link.exp.json b/testdata/d2compiler/TestCompile/url_link.exp.json index 0f0835271..f800be68e 100644 --- a/testdata/d2compiler/TestCompile/url_link.exp.json +++ b/testdata/d2compiler/TestCompile/url_link.exp.json @@ -31,7 +31,7 @@ "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/url_link.d2,1:8:13-1:26:31", + "range": "d2/testdata/d2compiler/TestCompile/url_link.d2,1:2:7-1:26:31", "key": { "range": "d2/testdata/d2compiler/TestCompile/url_link.d2,1:2:7-1:6:11", "path": [ @@ -81,9 +81,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" diff --git a/testdata/d2compiler/TestCompile/wrong_column_index.exp.json b/testdata/d2compiler/TestCompile/wrong_column_index.exp.json index fe3eadda9..5b4caf80a 100644 --- a/testdata/d2compiler/TestCompile/wrong_column_index.exp.json +++ b/testdata/d2compiler/TestCompile/wrong_column_index.exp.json @@ -703,9 +703,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -743,9 +740,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -998,9 +992,6 @@ "value": "Chinchillas" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "sql_table" @@ -1167,9 +1158,6 @@ "value": "Chinchillas_Collectibles" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "sql_table" diff --git a/testdata/d2compiler/TestCompile2/boards/recursive.exp.json b/testdata/d2compiler/TestCompile2/boards/recursive.exp.json index d3e58d020..6d2c25d9e 100644 --- a/testdata/d2compiler/TestCompile2/boards/recursive.exp.json +++ b/testdata/d2compiler/TestCompile2/boards/recursive.exp.json @@ -308,9 +308,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -360,9 +357,6 @@ "value": "base" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -687,9 +681,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -739,9 +730,6 @@ "value": "santa" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -1066,9 +1054,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -1118,9 +1103,6 @@ "value": "clause" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -1445,9 +1427,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -1497,9 +1476,6 @@ "value": "reindeer" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -1824,9 +1800,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -1876,9 +1849,6 @@ "value": "montana" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/boards/root.exp.json b/testdata/d2compiler/TestCompile2/boards/root.exp.json index 4a81bc91e..d5578d6ff 100644 --- a/testdata/d2compiler/TestCompile2/boards/root.exp.json +++ b/testdata/d2compiler/TestCompile2/boards/root.exp.json @@ -175,9 +175,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -227,9 +224,6 @@ "value": "base" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -421,9 +415,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -473,9 +464,6 @@ "value": "santa" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -667,9 +655,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -719,9 +704,6 @@ "value": "clause" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/base.exp.json b/testdata/d2oracle/TestCreate/base.exp.json index 222412066..b1773f3e5 100644 --- a/testdata/d2oracle/TestCreate/base.exp.json +++ b/testdata/d2oracle/TestCreate/base.exp.json @@ -42,9 +42,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -94,9 +91,6 @@ "value": "square" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/container.exp.json b/testdata/d2oracle/TestCreate/container.exp.json index 9ea06ade3..45c84a2b9 100644 --- a/testdata/d2oracle/TestCreate/container.exp.json +++ b/testdata/d2oracle/TestCreate/container.exp.json @@ -71,9 +71,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -123,9 +120,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -173,9 +167,6 @@ "value": "q" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/container_edge.exp.json b/testdata/d2oracle/TestCreate/container_edge.exp.json index 1773d68a0..99fa9987f 100644 --- a/testdata/d2oracle/TestCreate/container_edge.exp.json +++ b/testdata/d2oracle/TestCreate/container_edge.exp.json @@ -94,9 +94,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -132,9 +129,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -184,9 +178,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -234,9 +225,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -284,9 +272,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/container_edge_label.exp.json b/testdata/d2oracle/TestCreate/container_edge_label.exp.json index 733cbcb07..874f701c9 100644 --- a/testdata/d2oracle/TestCreate/container_edge_label.exp.json +++ b/testdata/d2oracle/TestCreate/container_edge_label.exp.json @@ -104,9 +104,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -142,9 +139,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -194,9 +188,6 @@ "value": "zoom" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -244,9 +235,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -294,9 +282,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/edge.exp.json b/testdata/d2oracle/TestCreate/edge.exp.json index f2a721f89..7c756f94e 100644 --- a/testdata/d2oracle/TestCreate/edge.exp.json +++ b/testdata/d2oracle/TestCreate/edge.exp.json @@ -65,9 +65,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -103,9 +100,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -155,9 +149,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -205,9 +196,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/edge_nested.exp.json b/testdata/d2oracle/TestCreate/edge_nested.exp.json index 743d8470f..ebd1c4a1f 100644 --- a/testdata/d2oracle/TestCreate/edge_nested.exp.json +++ b/testdata/d2oracle/TestCreate/edge_nested.exp.json @@ -81,9 +81,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -119,9 +116,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -171,9 +165,6 @@ "value": "container" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -221,9 +212,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -271,9 +259,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/edge_scope.exp.json b/testdata/d2oracle/TestCreate/edge_scope.exp.json index 883f4c149..82f59fb8e 100644 --- a/testdata/d2oracle/TestCreate/edge_scope.exp.json +++ b/testdata/d2oracle/TestCreate/edge_scope.exp.json @@ -94,9 +94,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -132,9 +129,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -184,9 +178,6 @@ "value": "container" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -234,9 +225,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -284,9 +272,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json b/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json index c8d1af1cf..0981b56e5 100644 --- a/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json +++ b/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json @@ -94,9 +94,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -132,9 +129,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -184,9 +178,6 @@ "value": "container" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -234,9 +225,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -284,9 +272,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json b/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json index bb99c3bdb..6f03dd3e5 100644 --- a/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json +++ b/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json @@ -105,9 +105,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -143,9 +140,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -206,9 +200,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -267,9 +258,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -317,9 +305,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -367,9 +352,6 @@ "value": "q" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/edge_unique.exp.json b/testdata/d2oracle/TestCreate/edge_unique.exp.json index d89bf8ff5..3feaad7e5 100644 --- a/testdata/d2oracle/TestCreate/edge_unique.exp.json +++ b/testdata/d2oracle/TestCreate/edge_unique.exp.json @@ -251,9 +251,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -289,9 +286,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -326,9 +320,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -363,9 +354,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -400,9 +388,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -452,9 +437,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -502,9 +484,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -592,9 +571,6 @@ "value": "hello" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -682,9 +658,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -772,9 +745,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/gen_key.exp.json b/testdata/d2oracle/TestCreate/gen_key.exp.json index 3f3565208..6b59db7f6 100644 --- a/testdata/d2oracle/TestCreate/gen_key.exp.json +++ b/testdata/d2oracle/TestCreate/gen_key.exp.json @@ -65,9 +65,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -117,9 +114,6 @@ "value": "square" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -167,9 +161,6 @@ "value": "square 2" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/gen_key_n.exp.json b/testdata/d2oracle/TestCreate/gen_key_n.exp.json index d2d3dd48d..a6a3ab175 100644 --- a/testdata/d2oracle/TestCreate/gen_key_n.exp.json +++ b/testdata/d2oracle/TestCreate/gen_key_n.exp.json @@ -323,9 +323,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -397,9 +394,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -469,9 +463,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -541,9 +532,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -591,9 +579,6 @@ "value": "square" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -641,9 +626,6 @@ "value": "square 2" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -691,9 +673,6 @@ "value": "square 3" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -741,9 +720,6 @@ "value": "square 4" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -791,9 +767,6 @@ "value": "square 5" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -841,9 +814,6 @@ "value": "square 6" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -891,9 +861,6 @@ "value": "square 7" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -941,9 +908,6 @@ "value": "square 8" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -991,9 +955,6 @@ "value": "square 9" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -1041,9 +1002,6 @@ "value": "square 10" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -1091,9 +1049,6 @@ "value": "square 11" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/gen_key_nested.exp.json b/testdata/d2oracle/TestCreate/gen_key_nested.exp.json index a79569841..dd647a29e 100644 --- a/testdata/d2oracle/TestCreate/gen_key_nested.exp.json +++ b/testdata/d2oracle/TestCreate/gen_key_nested.exp.json @@ -131,9 +131,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -269,9 +266,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -405,9 +399,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -541,9 +532,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -624,9 +612,6 @@ "value": "square" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -707,9 +692,6 @@ "value": "square 2" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/gen_key_scope.exp.json b/testdata/d2oracle/TestCreate/gen_key_scope.exp.json index 02112c645..fdff71529 100644 --- a/testdata/d2oracle/TestCreate/gen_key_scope.exp.json +++ b/testdata/d2oracle/TestCreate/gen_key_scope.exp.json @@ -116,9 +116,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -190,9 +187,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -262,9 +256,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -334,9 +325,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -384,9 +372,6 @@ "value": "square" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -434,9 +419,6 @@ "value": "square 2" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/gen_key_suffix.exp.json b/testdata/d2oracle/TestCreate/gen_key_suffix.exp.json index 993dcf2c7..9e45e674f 100644 --- a/testdata/d2oracle/TestCreate/gen_key_suffix.exp.json +++ b/testdata/d2oracle/TestCreate/gen_key_suffix.exp.json @@ -65,9 +65,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -117,9 +114,6 @@ "value": "x " }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -167,9 +161,6 @@ "value": "x 2" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/make_scope_multiline.exp.json b/testdata/d2oracle/TestCreate/make_scope_multiline.exp.json index e7954b6b9..9e6166137 100644 --- a/testdata/d2oracle/TestCreate/make_scope_multiline.exp.json +++ b/testdata/d2oracle/TestCreate/make_scope_multiline.exp.json @@ -104,9 +104,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -156,9 +153,6 @@ "value": "rawr" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "circle" @@ -206,9 +200,6 @@ "value": "orange" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" 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 8b6043cd2..1a6d18fc7 100644 --- a/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.exp.json +++ b/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.exp.json @@ -150,9 +150,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -202,9 +199,6 @@ "value": "before" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -252,9 +246,6 @@ "value": "rawr" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "circle" @@ -302,9 +293,6 @@ "value": "orange" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -352,9 +340,6 @@ "value": "after" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" 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 d6f650f32..5c35c062a 100644 --- a/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.exp.json +++ b/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.exp.json @@ -150,9 +150,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -202,9 +199,6 @@ "value": "before" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -252,9 +246,6 @@ "value": "rawr" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "circle" @@ -302,9 +293,6 @@ "value": "orange" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -352,9 +340,6 @@ "value": "after" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/nested.exp.json b/testdata/d2oracle/TestCreate/nested.exp.json index 5110c9abf..13a0e5338 100644 --- a/testdata/d2oracle/TestCreate/nested.exp.json +++ b/testdata/d2oracle/TestCreate/nested.exp.json @@ -64,9 +64,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -138,9 +135,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -210,9 +204,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -282,9 +273,6 @@ "value": "square" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/scope.exp.json b/testdata/d2oracle/TestCreate/scope.exp.json index 7a804162c..9639bbf24 100644 --- a/testdata/d2oracle/TestCreate/scope.exp.json +++ b/testdata/d2oracle/TestCreate/scope.exp.json @@ -93,9 +93,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -167,9 +164,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -239,9 +233,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -311,9 +302,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -361,9 +349,6 @@ "value": "square" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/breakup_arrowhead.exp.json b/testdata/d2oracle/TestDelete/breakup_arrowhead.exp.json index c24fc6d38..b87f7ada7 100644 --- a/testdata/d2oracle/TestDelete/breakup_arrowhead.exp.json +++ b/testdata/d2oracle/TestDelete/breakup_arrowhead.exp.json @@ -42,9 +42,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -94,9 +91,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/children.exp.json b/testdata/d2oracle/TestDelete/children.exp.json index a27344f1f..d72aac1bc 100644 --- a/testdata/d2oracle/TestDelete/children.exp.json +++ b/testdata/d2oracle/TestDelete/children.exp.json @@ -88,9 +88,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -126,9 +123,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -178,9 +172,6 @@ "value": "what's up" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -228,9 +219,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -278,9 +266,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/children_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_conflicts.exp.json index 48eb8b1fd..aa46010d5 100644 --- a/testdata/d2oracle/TestDelete/children_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_conflicts.exp.json @@ -65,9 +65,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -117,9 +114,6 @@ "value": "x 2" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -167,9 +161,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json index 53be16eee..06b1721b9 100644 --- a/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json @@ -121,9 +121,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -159,9 +156,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -231,9 +225,6 @@ "value": "hi" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -281,9 +272,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -331,9 +319,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json index ef04e0363..017b88f80 100644 --- a/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json @@ -214,9 +214,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -252,9 +249,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -289,9 +283,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -361,9 +352,6 @@ "value": "hi" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -431,9 +419,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -501,9 +486,6 @@ "value": "ey" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -551,9 +533,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -601,9 +580,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/children_flat_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_flat_conflicts.exp.json index 165be0f7a..72b006c08 100644 --- a/testdata/d2oracle/TestDelete/children_flat_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_flat_conflicts.exp.json @@ -98,9 +98,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -170,9 +167,6 @@ "value": "hi" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -220,9 +214,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json index 317777b8c..6dd312311 100644 --- a/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json @@ -190,9 +190,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -228,9 +225,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -320,9 +314,6 @@ "value": "hi" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -390,9 +381,6 @@ "value": "y 2" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -440,9 +428,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -490,9 +475,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/children_nested_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_nested_conflicts.exp.json index 97a1804d6..42ec7a673 100644 --- a/testdata/d2oracle/TestDelete/children_nested_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_nested_conflicts.exp.json @@ -94,9 +94,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -146,9 +143,6 @@ "value": "x 2" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -196,9 +190,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -246,9 +237,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/children_nested_referenced_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_nested_referenced_conflicts.exp.json index 4e1388f9b..d093f337b 100644 --- a/testdata/d2oracle/TestDelete/children_nested_referenced_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_nested_referenced_conflicts.exp.json @@ -153,9 +153,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -267,9 +264,6 @@ "value": "hi" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -359,9 +353,6 @@ "value": "hey" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -409,9 +400,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/children_no_self_conflict.exp.json b/testdata/d2oracle/TestDelete/children_no_self_conflict.exp.json index 66e9e92ed..fe35fb0a4 100644 --- a/testdata/d2oracle/TestDelete/children_no_self_conflict.exp.json +++ b/testdata/d2oracle/TestDelete/children_no_self_conflict.exp.json @@ -42,9 +42,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -94,9 +91,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/children_order.exp.json b/testdata/d2oracle/TestDelete/children_order.exp.json index 5e349d80c..824bdeaf7 100644 --- a/testdata/d2oracle/TestDelete/children_order.exp.json +++ b/testdata/d2oracle/TestDelete/children_order.exp.json @@ -117,9 +117,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -169,9 +166,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -219,9 +213,6 @@ "value": "before" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -269,9 +260,6 @@ "value": "congo" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -319,9 +307,6 @@ "value": "after" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/children_referenced_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_referenced_conflicts.exp.json index 8a7e05ec1..d3c25dc9f 100644 --- a/testdata/d2oracle/TestDelete/children_referenced_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_referenced_conflicts.exp.json @@ -98,9 +98,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -170,9 +167,6 @@ "value": "hi" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -220,9 +214,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/children_scope.exp.json b/testdata/d2oracle/TestDelete/children_scope.exp.json index 34edc1f7e..7ef29ec5d 100644 --- a/testdata/d2oracle/TestDelete/children_scope.exp.json +++ b/testdata/d2oracle/TestDelete/children_scope.exp.json @@ -128,9 +128,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -166,9 +163,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -229,9 +223,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -290,9 +281,6 @@ "value": "q" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -340,9 +328,6 @@ "value": "what's up" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -390,9 +375,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -440,9 +422,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/container_near.exp.json b/testdata/d2oracle/TestDelete/container_near.exp.json index 130ea20ce..d687451ab 100644 --- a/testdata/d2oracle/TestDelete/container_near.exp.json +++ b/testdata/d2oracle/TestDelete/container_near.exp.json @@ -166,9 +166,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -218,9 +215,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": { "range": "d2/testdata/d2oracle/TestDelete/container_near.d2,1:8:13-1:9:14", "path": [ @@ -283,9 +277,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -333,9 +324,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": { "range": "d2/testdata/d2oracle/TestDelete/container_near.d2,5:8:32-5:9:33", "path": [ diff --git a/testdata/d2oracle/TestDelete/delete_icon.exp.json b/testdata/d2oracle/TestDelete/delete_icon.exp.json index 727b94b6e..773b7321b 100644 --- a/testdata/d2oracle/TestDelete/delete_icon.exp.json +++ b/testdata/d2oracle/TestDelete/delete_icon.exp.json @@ -42,7 +42,7 @@ "nodes": [ { "map_key": { - "range": "d2/testdata/d2oracle/TestDelete/delete_icon.d2,1:8:15-1:26:33", + "range": "d2/testdata/d2oracle/TestDelete/delete_icon.d2,1:2:9-1:26:33", "key": { "range": "d2/testdata/d2oracle/TestDelete/delete_icon.d2,1:2:9-1:6:13", "path": [ @@ -92,9 +92,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -155,9 +152,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/delete_link.exp.json b/testdata/d2oracle/TestDelete/delete_link.exp.json index 26f8d3a44..d875355be 100644 --- a/testdata/d2oracle/TestDelete/delete_link.exp.json +++ b/testdata/d2oracle/TestDelete/delete_link.exp.json @@ -42,9 +42,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -94,9 +91,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/delete_near.exp.json b/testdata/d2oracle/TestDelete/delete_near.exp.json index d8168eb36..db51e96ed 100644 --- a/testdata/d2oracle/TestDelete/delete_near.exp.json +++ b/testdata/d2oracle/TestDelete/delete_near.exp.json @@ -65,9 +65,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -117,9 +114,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -167,9 +161,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/delete_needed_flat_near.exp.json b/testdata/d2oracle/TestDelete/delete_needed_flat_near.exp.json index 143999c3b..3487837b1 100644 --- a/testdata/d2oracle/TestDelete/delete_needed_flat_near.exp.json +++ b/testdata/d2oracle/TestDelete/delete_needed_flat_near.exp.json @@ -65,9 +65,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -117,9 +114,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -167,9 +161,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/delete_redundant_flat_near.exp.json b/testdata/d2oracle/TestDelete/delete_redundant_flat_near.exp.json index eb0f57086..1880ac013 100644 --- a/testdata/d2oracle/TestDelete/delete_redundant_flat_near.exp.json +++ b/testdata/d2oracle/TestDelete/delete_redundant_flat_near.exp.json @@ -65,9 +65,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -117,9 +114,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -167,9 +161,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/delete_tooltip.exp.json b/testdata/d2oracle/TestDelete/delete_tooltip.exp.json index ac942bc21..494ab611e 100644 --- a/testdata/d2oracle/TestDelete/delete_tooltip.exp.json +++ b/testdata/d2oracle/TestDelete/delete_tooltip.exp.json @@ -42,9 +42,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -94,9 +91,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json b/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json index f3eb8f3a4..40895df52 100644 --- a/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json +++ b/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json @@ -98,9 +98,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -136,9 +133,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -241,9 +235,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -313,9 +304,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -385,9 +373,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -446,9 +431,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/edge_common.exp.json b/testdata/d2oracle/TestDelete/edge_common.exp.json index 6aa8191a9..953bfb7b1 100644 --- a/testdata/d2oracle/TestDelete/edge_common.exp.json +++ b/testdata/d2oracle/TestDelete/edge_common.exp.json @@ -65,9 +65,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -103,9 +100,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -155,9 +149,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -205,9 +196,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/edge_common_2.exp.json b/testdata/d2oracle/TestDelete/edge_common_2.exp.json index 1a3f28120..c3c56a3c0 100644 --- a/testdata/d2oracle/TestDelete/edge_common_2.exp.json +++ b/testdata/d2oracle/TestDelete/edge_common_2.exp.json @@ -65,9 +65,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -103,9 +100,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -155,9 +149,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -205,9 +196,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/edge_common_3.exp.json b/testdata/d2oracle/TestDelete/edge_common_3.exp.json index 312be578b..6bca4cd50 100644 --- a/testdata/d2oracle/TestDelete/edge_common_3.exp.json +++ b/testdata/d2oracle/TestDelete/edge_common_3.exp.json @@ -87,9 +87,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -181,9 +178,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -242,9 +236,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -303,9 +294,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/edge_common_4.exp.json b/testdata/d2oracle/TestDelete/edge_common_4.exp.json index 26464a45e..f085d59f7 100644 --- a/testdata/d2oracle/TestDelete/edge_common_4.exp.json +++ b/testdata/d2oracle/TestDelete/edge_common_4.exp.json @@ -87,9 +87,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -181,9 +178,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -242,9 +236,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -303,9 +294,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/edge_conflict.exp.json b/testdata/d2oracle/TestDelete/edge_conflict.exp.json index 3156898f1..d14b781c5 100644 --- a/testdata/d2oracle/TestDelete/edge_conflict.exp.json +++ b/testdata/d2oracle/TestDelete/edge_conflict.exp.json @@ -110,9 +110,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -148,9 +145,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -242,9 +236,6 @@ "value": "y 2" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -303,9 +294,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -364,9 +352,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -414,9 +399,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/edge_decrement.exp.json b/testdata/d2oracle/TestDelete/edge_decrement.exp.json index 6b772b87c..5275b19bd 100644 --- a/testdata/d2oracle/TestDelete/edge_decrement.exp.json +++ b/testdata/d2oracle/TestDelete/edge_decrement.exp.json @@ -447,9 +447,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -488,9 +485,6 @@ "value": "zero" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -528,9 +522,6 @@ "value": "one" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -568,9 +559,6 @@ "value": "three" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -608,9 +596,6 @@ "value": "four" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -800,9 +785,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -990,9 +972,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/edge_first.exp.json b/testdata/d2oracle/TestDelete/edge_first.exp.json index 9581cbba5..5ba7ba319 100644 --- a/testdata/d2oracle/TestDelete/edge_first.exp.json +++ b/testdata/d2oracle/TestDelete/edge_first.exp.json @@ -176,9 +176,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -214,9 +211,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -251,9 +245,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -325,9 +316,6 @@ "value": "l" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -397,9 +385,6 @@ "value": "p" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -469,9 +454,6 @@ "value": "d" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -519,9 +501,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -569,9 +548,6 @@ "value": "p" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -639,9 +615,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -689,9 +662,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/edge_flat_style.exp.json b/testdata/d2oracle/TestDelete/edge_flat_style.exp.json index 44f31e332..8fe956cea 100644 --- a/testdata/d2oracle/TestDelete/edge_flat_style.exp.json +++ b/testdata/d2oracle/TestDelete/edge_flat_style.exp.json @@ -42,9 +42,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -94,9 +91,6 @@ "value": "B" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/edge_identical_child.exp.json b/testdata/d2oracle/TestDelete/edge_identical_child.exp.json index 97943eac7..ec3514d0e 100644 --- a/testdata/d2oracle/TestDelete/edge_identical_child.exp.json +++ b/testdata/d2oracle/TestDelete/edge_identical_child.exp.json @@ -98,9 +98,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -136,9 +133,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -210,9 +204,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -282,9 +273,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -354,9 +342,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -415,9 +400,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -476,9 +458,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/edge_key_style.exp.json b/testdata/d2oracle/TestDelete/edge_key_style.exp.json index 14b305db0..a3a9d2cd7 100644 --- a/testdata/d2oracle/TestDelete/edge_key_style.exp.json +++ b/testdata/d2oracle/TestDelete/edge_key_style.exp.json @@ -65,9 +65,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -103,9 +100,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -155,9 +149,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -205,9 +196,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/edge_last.exp.json b/testdata/d2oracle/TestDelete/edge_last.exp.json index 7055a8f95..c49abada8 100644 --- a/testdata/d2oracle/TestDelete/edge_last.exp.json +++ b/testdata/d2oracle/TestDelete/edge_last.exp.json @@ -213,9 +213,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -251,9 +248,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -288,9 +282,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -325,9 +316,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -399,9 +387,6 @@ "value": "l" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -471,9 +456,6 @@ "value": "p" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -543,9 +525,6 @@ "value": "d" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -593,9 +572,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -663,9 +639,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -733,9 +706,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -783,9 +753,6 @@ "value": "q" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -833,9 +800,6 @@ "value": "p" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/edge_map_style.exp.json b/testdata/d2oracle/TestDelete/edge_map_style.exp.json index ee63f7569..c7bf64faf 100644 --- a/testdata/d2oracle/TestDelete/edge_map_style.exp.json +++ b/testdata/d2oracle/TestDelete/edge_map_style.exp.json @@ -65,9 +65,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -103,9 +100,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -155,9 +149,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -205,9 +196,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/edge_middle.exp.json b/testdata/d2oracle/TestDelete/edge_middle.exp.json index 9fd4eb866..af0a96fce 100644 --- a/testdata/d2oracle/TestDelete/edge_middle.exp.json +++ b/testdata/d2oracle/TestDelete/edge_middle.exp.json @@ -199,9 +199,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -237,9 +234,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -274,9 +268,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -311,9 +302,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -385,9 +373,6 @@ "value": "l" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -457,9 +442,6 @@ "value": "p" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -529,9 +511,6 @@ "value": "d" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -579,9 +558,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -649,9 +625,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -699,9 +672,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -749,9 +719,6 @@ "value": "q" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -799,9 +766,6 @@ "value": "p" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/empty_map.exp.json b/testdata/d2oracle/TestDelete/empty_map.exp.json index e2e2144e7..c32d34aa9 100644 --- a/testdata/d2oracle/TestDelete/empty_map.exp.json +++ b/testdata/d2oracle/TestDelete/empty_map.exp.json @@ -71,9 +71,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -123,9 +120,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -173,9 +167,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/flat.exp.json b/testdata/d2oracle/TestDelete/flat.exp.json index 095f473a2..f116acb97 100644 --- a/testdata/d2oracle/TestDelete/flat.exp.json +++ b/testdata/d2oracle/TestDelete/flat.exp.json @@ -18,9 +18,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" diff --git a/testdata/d2oracle/TestDelete/flat_reserved.exp.json b/testdata/d2oracle/TestDelete/flat_reserved.exp.json index 30ecb264b..563fd9dfc 100644 --- a/testdata/d2oracle/TestDelete/flat_reserved.exp.json +++ b/testdata/d2oracle/TestDelete/flat_reserved.exp.json @@ -65,9 +65,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -103,9 +100,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -155,9 +149,6 @@ "value": "A" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -205,9 +196,6 @@ "value": "B" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/hoist_children.exp.json b/testdata/d2oracle/TestDelete/hoist_children.exp.json index 24b76489c..063460fb9 100644 --- a/testdata/d2oracle/TestDelete/hoist_children.exp.json +++ b/testdata/d2oracle/TestDelete/hoist_children.exp.json @@ -71,9 +71,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -123,9 +120,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -173,9 +167,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json b/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json index e6fe78569..5e5a55ac1 100644 --- a/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json +++ b/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json @@ -88,9 +88,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -126,9 +123,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -178,9 +172,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -228,9 +219,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -278,9 +266,6 @@ "value": "d" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/key_with_edges.exp.json b/testdata/d2oracle/TestDelete/key_with_edges.exp.json index f3da1716a..9e0700298 100644 --- a/testdata/d2oracle/TestDelete/key_with_edges.exp.json +++ b/testdata/d2oracle/TestDelete/key_with_edges.exp.json @@ -87,9 +87,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -181,9 +178,6 @@ "value": "hello" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -242,9 +236,6 @@ "value": "meow" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -303,9 +294,6 @@ "value": "bark" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/key_with_edges_2.exp.json b/testdata/d2oracle/TestDelete/key_with_edges_2.exp.json index f73454b35..0cd835b7f 100644 --- a/testdata/d2oracle/TestDelete/key_with_edges_2.exp.json +++ b/testdata/d2oracle/TestDelete/key_with_edges_2.exp.json @@ -53,9 +53,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -116,9 +113,6 @@ "value": "hello" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -177,9 +171,6 @@ "value": "bark" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/key_with_edges_3.exp.json b/testdata/d2oracle/TestDelete/key_with_edges_3.exp.json index ce7e30e1b..d505707b4 100644 --- a/testdata/d2oracle/TestDelete/key_with_edges_3.exp.json +++ b/testdata/d2oracle/TestDelete/key_with_edges_3.exp.json @@ -53,9 +53,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -116,9 +113,6 @@ "value": "hello" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -177,9 +171,6 @@ "value": "bark" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/key_with_edges_4.exp.json b/testdata/d2oracle/TestDelete/key_with_edges_4.exp.json index 1e1b07b62..0d1408158 100644 --- a/testdata/d2oracle/TestDelete/key_with_edges_4.exp.json +++ b/testdata/d2oracle/TestDelete/key_with_edges_4.exp.json @@ -87,9 +87,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -181,9 +178,6 @@ "value": "hello" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -242,9 +236,6 @@ "value": "meow" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -303,9 +294,6 @@ "value": "bark" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/multi_near.exp.json b/testdata/d2oracle/TestDelete/multi_near.exp.json index 4b8879ad7..e41f9e3ec 100644 --- a/testdata/d2oracle/TestDelete/multi_near.exp.json +++ b/testdata/d2oracle/TestDelete/multi_near.exp.json @@ -189,9 +189,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -241,9 +238,6 @@ "value": "API" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -291,9 +285,6 @@ "value": "Bluefish" }, "style": {}, - "link": { - "value": "" - }, "near_key": { "range": "d2/testdata/d2oracle/TestDelete/multi_near.d2,2:8:24-2:11:27", "path": [ @@ -356,9 +347,6 @@ "value": "Yo" }, "style": {}, - "link": { - "value": "" - }, "near_key": { "range": "d2/testdata/d2oracle/TestDelete/multi_near.d2,5:8:44-5:12:48", "path": [ @@ -421,9 +409,6 @@ "value": "Blah" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/multi_path_map_conflict.exp.json b/testdata/d2oracle/TestDelete/multi_path_map_conflict.exp.json index ca5340acc..f17fdd862 100644 --- a/testdata/d2oracle/TestDelete/multi_path_map_conflict.exp.json +++ b/testdata/d2oracle/TestDelete/multi_path_map_conflict.exp.json @@ -123,9 +123,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -195,9 +192,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -245,9 +239,6 @@ "value": "z 2" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -295,9 +286,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" 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 a6ab1b9b5..d507d5227 100644 --- a/testdata/d2oracle/TestDelete/multi_path_map_no_conflict.exp.json +++ b/testdata/d2oracle/TestDelete/multi_path_map_no_conflict.exp.json @@ -94,9 +94,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -146,9 +143,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -196,9 +190,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -246,9 +237,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/multiple_flat_middle_container.exp.json b/testdata/d2oracle/TestDelete/multiple_flat_middle_container.exp.json index d07464c53..cd609a383 100644 --- a/testdata/d2oracle/TestDelete/multiple_flat_middle_container.exp.json +++ b/testdata/d2oracle/TestDelete/multiple_flat_middle_container.exp.json @@ -87,9 +87,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -181,9 +178,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -242,9 +236,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -303,9 +294,6 @@ "value": "d" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/multiple_flat_style.exp.json b/testdata/d2oracle/TestDelete/multiple_flat_style.exp.json index 2fe8d0bb5..7c3ad54fb 100644 --- a/testdata/d2oracle/TestDelete/multiple_flat_style.exp.json +++ b/testdata/d2oracle/TestDelete/multiple_flat_style.exp.json @@ -70,9 +70,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -148,9 +145,6 @@ "value": "0.4" } }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/multiple_map_styles.exp.json b/testdata/d2oracle/TestDelete/multiple_map_styles.exp.json index 1ab76c923..bff7c808d 100644 --- a/testdata/d2oracle/TestDelete/multiple_map_styles.exp.json +++ b/testdata/d2oracle/TestDelete/multiple_map_styles.exp.json @@ -106,9 +106,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -162,9 +159,6 @@ "value": "0.4" } }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/near.exp.json b/testdata/d2oracle/TestDelete/near.exp.json index 51adee36a..dfcbdba6c 100644 --- a/testdata/d2oracle/TestDelete/near.exp.json +++ b/testdata/d2oracle/TestDelete/near.exp.json @@ -42,9 +42,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -94,9 +91,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/nested.exp.json b/testdata/d2oracle/TestDelete/nested.exp.json index 4b0882b53..3b67399a7 100644 --- a/testdata/d2oracle/TestDelete/nested.exp.json +++ b/testdata/d2oracle/TestDelete/nested.exp.json @@ -64,9 +64,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -138,9 +135,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -210,9 +204,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -282,9 +273,6 @@ "value": "d" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/nested_2.exp.json b/testdata/d2oracle/TestDelete/nested_2.exp.json index 4136ea74b..eb85fd956 100644 --- a/testdata/d2oracle/TestDelete/nested_2.exp.json +++ b/testdata/d2oracle/TestDelete/nested_2.exp.json @@ -64,9 +64,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -138,9 +135,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -210,9 +204,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -282,9 +273,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json b/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json index 21053dbda..56686e462 100644 --- a/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json +++ b/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json @@ -94,9 +94,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -132,9 +129,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -184,9 +178,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -234,9 +225,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -284,9 +272,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/nested_flat_style.exp.json b/testdata/d2oracle/TestDelete/nested_flat_style.exp.json index ff03dc831..8c3c28001 100644 --- a/testdata/d2oracle/TestDelete/nested_flat_style.exp.json +++ b/testdata/d2oracle/TestDelete/nested_flat_style.exp.json @@ -42,9 +42,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -94,9 +91,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/nested_reserved.exp.json b/testdata/d2oracle/TestDelete/nested_reserved.exp.json index c7989547f..629f232ba 100644 --- a/testdata/d2oracle/TestDelete/nested_reserved.exp.json +++ b/testdata/d2oracle/TestDelete/nested_reserved.exp.json @@ -98,9 +98,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -203,9 +200,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -306,9 +300,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -378,9 +369,6 @@ "value": "jingle" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/nested_underscore_update.exp.json b/testdata/d2oracle/TestDelete/nested_underscore_update.exp.json index 69267f041..aa3e1c083 100644 --- a/testdata/d2oracle/TestDelete/nested_underscore_update.exp.json +++ b/testdata/d2oracle/TestDelete/nested_underscore_update.exp.json @@ -82,9 +82,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -134,9 +131,6 @@ "value": "books" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -195,9 +189,6 @@ "value": "pipe" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/node_in_edge.exp.json b/testdata/d2oracle/TestDelete/node_in_edge.exp.json index 96edc3a98..0c55e6543 100644 --- a/testdata/d2oracle/TestDelete/node_in_edge.exp.json +++ b/testdata/d2oracle/TestDelete/node_in_edge.exp.json @@ -163,9 +163,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -201,9 +198,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -238,9 +232,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -290,9 +281,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -340,9 +328,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -390,9 +375,6 @@ "value": "q" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -440,9 +422,6 @@ "value": "p" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -490,9 +469,6 @@ "value": "ok" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -540,9 +516,6 @@ "value": "what's up" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json b/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json index 8ece8587b..59fc5db5e 100644 --- a/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json +++ b/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json @@ -202,9 +202,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -240,9 +237,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -277,9 +271,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -314,9 +305,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -366,9 +354,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -436,9 +421,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -506,9 +488,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -556,9 +535,6 @@ "value": "q" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -617,9 +593,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -678,9 +651,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -728,9 +698,6 @@ "value": "what's up" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json b/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json index 9cc9c7d38..6836d20b7 100644 --- a/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json +++ b/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json @@ -161,9 +161,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -199,9 +196,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -275,9 +269,6 @@ "value": "#000e3d" } }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -345,9 +336,6 @@ "value": "B" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json b/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json index 2f1fe933e..562a4955f 100644 --- a/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json +++ b/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json @@ -161,9 +161,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -203,9 +200,6 @@ "value": "#2b50c2" } }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -275,9 +269,6 @@ "value": "A" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -345,9 +336,6 @@ "value": "B" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/order_1.exp.json b/testdata/d2oracle/TestDelete/order_1.exp.json index d94b6c448..a6b002f3e 100644 --- a/testdata/d2oracle/TestDelete/order_1.exp.json +++ b/testdata/d2oracle/TestDelete/order_1.exp.json @@ -88,9 +88,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -126,9 +123,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -178,9 +172,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -228,9 +219,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -278,9 +266,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/order_2.exp.json b/testdata/d2oracle/TestDelete/order_2.exp.json index 621e5abe6..31461ae7b 100644 --- a/testdata/d2oracle/TestDelete/order_2.exp.json +++ b/testdata/d2oracle/TestDelete/order_2.exp.json @@ -65,9 +65,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -117,9 +114,6 @@ "value": "p" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -167,9 +161,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/order_3.exp.json b/testdata/d2oracle/TestDelete/order_3.exp.json index dc38dce88..ed8eae736 100644 --- a/testdata/d2oracle/TestDelete/order_3.exp.json +++ b/testdata/d2oracle/TestDelete/order_3.exp.json @@ -65,9 +65,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -117,9 +114,6 @@ "value": "p" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -167,9 +161,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/order_4.exp.json b/testdata/d2oracle/TestDelete/order_4.exp.json index 3f92383c6..7775c60d5 100644 --- a/testdata/d2oracle/TestDelete/order_4.exp.json +++ b/testdata/d2oracle/TestDelete/order_4.exp.json @@ -42,9 +42,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -94,9 +91,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/order_5.exp.json b/testdata/d2oracle/TestDelete/order_5.exp.json index 16189c3a6..6baa9b67d 100644 --- a/testdata/d2oracle/TestDelete/order_5.exp.json +++ b/testdata/d2oracle/TestDelete/order_5.exp.json @@ -140,9 +140,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -178,9 +175,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -215,9 +209,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -267,9 +258,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -317,9 +305,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -367,9 +352,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -417,9 +399,6 @@ "value": "q" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -467,9 +446,6 @@ "value": "p" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/order_6.exp.json b/testdata/d2oracle/TestDelete/order_6.exp.json index cd55bf44e..8ad11ae8f 100644 --- a/testdata/d2oracle/TestDelete/order_6.exp.json +++ b/testdata/d2oracle/TestDelete/order_6.exp.json @@ -116,9 +116,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -210,9 +207,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -260,9 +254,6 @@ "value": "lol" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -332,9 +323,6 @@ "value": "p" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -404,9 +392,6 @@ "value": "q" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/order_7.exp.json b/testdata/d2oracle/TestDelete/order_7.exp.json index 65fd109cf..25f840379 100644 --- a/testdata/d2oracle/TestDelete/order_7.exp.json +++ b/testdata/d2oracle/TestDelete/order_7.exp.json @@ -127,9 +127,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -232,9 +229,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -282,9 +276,6 @@ "value": "lol" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -365,9 +356,6 @@ "value": "p" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -448,9 +436,6 @@ "value": "q" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -531,9 +516,6 @@ "value": "more" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/order_8.exp.json b/testdata/d2oracle/TestDelete/order_8.exp.json index 836059fad..7b88c05e1 100644 --- a/testdata/d2oracle/TestDelete/order_8.exp.json +++ b/testdata/d2oracle/TestDelete/order_8.exp.json @@ -134,9 +134,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -186,9 +183,6 @@ "value": "bark" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -236,9 +230,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -286,9 +277,6 @@ "value": "zebra" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -336,9 +324,6 @@ "value": "q" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -386,9 +371,6 @@ "value": "kang" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/shape_class.exp.json b/testdata/d2oracle/TestDelete/shape_class.exp.json index abb74d6d0..9cffa89e8 100644 --- a/testdata/d2oracle/TestDelete/shape_class.exp.json +++ b/testdata/d2oracle/TestDelete/shape_class.exp.json @@ -42,9 +42,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -94,9 +91,6 @@ "value": "github.com/terrastruct/d2parser.git" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/shape_sql_table.exp.json b/testdata/d2oracle/TestDelete/shape_sql_table.exp.json index 4605e0480..d86497638 100644 --- a/testdata/d2oracle/TestDelete/shape_sql_table.exp.json +++ b/testdata/d2oracle/TestDelete/shape_sql_table.exp.json @@ -262,9 +262,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -300,9 +297,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -352,9 +346,6 @@ "value": "cloud" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -485,9 +476,6 @@ "value": "disks" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "sql_table" @@ -535,9 +523,6 @@ "value": "AWS S3 Vancouver" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/singular_flat_style.exp.json b/testdata/d2oracle/TestDelete/singular_flat_style.exp.json index 69195897e..ef7b7af9d 100644 --- a/testdata/d2oracle/TestDelete/singular_flat_style.exp.json +++ b/testdata/d2oracle/TestDelete/singular_flat_style.exp.json @@ -42,9 +42,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -94,9 +91,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/singular_map_style.exp.json b/testdata/d2oracle/TestDelete/singular_map_style.exp.json index 919892ffc..66ac50413 100644 --- a/testdata/d2oracle/TestDelete/singular_map_style.exp.json +++ b/testdata/d2oracle/TestDelete/singular_map_style.exp.json @@ -42,9 +42,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -94,9 +91,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/underscore_no_conflict.exp.json b/testdata/d2oracle/TestDelete/underscore_no_conflict.exp.json index ca43b4ef8..67c1be91f 100644 --- a/testdata/d2oracle/TestDelete/underscore_no_conflict.exp.json +++ b/testdata/d2oracle/TestDelete/underscore_no_conflict.exp.json @@ -105,9 +105,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -157,9 +154,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -218,9 +212,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -268,9 +259,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/underscore_remove.exp.json b/testdata/d2oracle/TestDelete/underscore_remove.exp.json index 59c752b6c..df4d7620d 100644 --- a/testdata/d2oracle/TestDelete/underscore_remove.exp.json +++ b/testdata/d2oracle/TestDelete/underscore_remove.exp.json @@ -134,9 +134,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -172,9 +169,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -209,9 +203,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -261,9 +252,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -311,9 +299,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -361,9 +346,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -411,9 +393,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -461,9 +440,6 @@ "value": "d" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/append_multiple_styles.exp.json b/testdata/d2oracle/TestMove/append_multiple_styles.exp.json index cc6ea6664..7a0b72a22 100644 --- a/testdata/d2oracle/TestMove/append_multiple_styles.exp.json +++ b/testdata/d2oracle/TestMove/append_multiple_styles.exp.json @@ -226,9 +226,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -278,9 +275,6 @@ "value": "d" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -355,9 +349,6 @@ "value": "red" } }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/basic.exp.json b/testdata/d2oracle/TestMove/basic.exp.json index d5bc304f0..b15b540e3 100644 --- a/testdata/d2oracle/TestMove/basic.exp.json +++ b/testdata/d2oracle/TestMove/basic.exp.json @@ -42,9 +42,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -94,9 +91,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/basic_nested.exp.json b/testdata/d2oracle/TestMove/basic_nested.exp.json index eedb7f0b1..62e197700 100644 --- a/testdata/d2oracle/TestMove/basic_nested.exp.json +++ b/testdata/d2oracle/TestMove/basic_nested.exp.json @@ -71,9 +71,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -123,9 +120,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -173,9 +167,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/basic_out_of_container.exp.json b/testdata/d2oracle/TestMove/basic_out_of_container.exp.json index 2c7374d42..22381d85e 100644 --- a/testdata/d2oracle/TestMove/basic_out_of_container.exp.json +++ b/testdata/d2oracle/TestMove/basic_out_of_container.exp.json @@ -65,9 +65,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -117,9 +114,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -167,9 +161,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/between_containers.exp.json b/testdata/d2oracle/TestMove/between_containers.exp.json index a2afc38ce..65a69a9bf 100644 --- a/testdata/d2oracle/TestMove/between_containers.exp.json +++ b/testdata/d2oracle/TestMove/between_containers.exp.json @@ -94,9 +94,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -146,9 +143,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -196,9 +190,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -246,9 +237,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/chain_connected_nested.exp.json b/testdata/d2oracle/TestMove/chain_connected_nested.exp.json index 895fc4526..c3a49a0d4 100644 --- a/testdata/d2oracle/TestMove/chain_connected_nested.exp.json +++ b/testdata/d2oracle/TestMove/chain_connected_nested.exp.json @@ -125,9 +125,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -163,9 +160,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -200,9 +194,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -272,9 +263,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -342,9 +330,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -392,9 +377,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" 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 c13d5bc26..b769353e0 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 @@ -113,9 +113,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -151,9 +148,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -188,9 +182,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -251,9 +242,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -312,9 +300,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -382,9 +367,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -432,9 +414,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/connected_nested.exp.json b/testdata/d2oracle/TestMove/connected_nested.exp.json index 083ed1186..47015323e 100644 --- a/testdata/d2oracle/TestMove/connected_nested.exp.json +++ b/testdata/d2oracle/TestMove/connected_nested.exp.json @@ -88,9 +88,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -126,9 +123,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -178,9 +172,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -228,9 +219,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -278,9 +266,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/container_near.exp.json b/testdata/d2oracle/TestMove/container_near.exp.json index 2f81f3766..64a272e47 100644 --- a/testdata/d2oracle/TestMove/container_near.exp.json +++ b/testdata/d2oracle/TestMove/container_near.exp.json @@ -196,9 +196,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -248,9 +245,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -298,9 +292,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": { "range": "d2/testdata/d2oracle/TestMove/container_near.d2,2:10:22-2:15:27", "path": [ @@ -396,9 +387,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -457,9 +445,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -507,9 +492,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -557,9 +539,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/edge_across_containers.exp.json b/testdata/d2oracle/TestMove/edge_across_containers.exp.json index 148750b0a..f06a052be 100644 --- a/testdata/d2oracle/TestMove/edge_across_containers.exp.json +++ b/testdata/d2oracle/TestMove/edge_across_containers.exp.json @@ -139,9 +139,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -177,9 +174,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -229,9 +223,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -321,9 +312,6 @@ "value": "d" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -393,9 +381,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -443,9 +428,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/edge_basic.exp.json b/testdata/d2oracle/TestMove/edge_basic.exp.json index e14fa2aa9..80e4b270e 100644 --- a/testdata/d2oracle/TestMove/edge_basic.exp.json +++ b/testdata/d2oracle/TestMove/edge_basic.exp.json @@ -65,9 +65,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -103,9 +100,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -155,9 +149,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -205,9 +196,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/edge_chain_basic.exp.json b/testdata/d2oracle/TestMove/edge_chain_basic.exp.json index 74ef1eafd..ebe3e5c99 100644 --- a/testdata/d2oracle/TestMove/edge_chain_basic.exp.json +++ b/testdata/d2oracle/TestMove/edge_chain_basic.exp.json @@ -102,9 +102,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -140,9 +137,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -177,9 +171,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -229,9 +220,6 @@ "value": "d" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -299,9 +287,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -349,9 +334,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/edge_chain_circular.exp.json b/testdata/d2oracle/TestMove/edge_chain_circular.exp.json index 81c8990a6..f2bd3ba19 100644 --- a/testdata/d2oracle/TestMove/edge_chain_circular.exp.json +++ b/testdata/d2oracle/TestMove/edge_chain_circular.exp.json @@ -153,9 +153,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -191,9 +188,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -228,9 +222,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -280,9 +271,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -372,9 +360,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -442,9 +427,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json b/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json index e25272be2..ec4268b34 100644 --- a/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json +++ b/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json @@ -136,9 +136,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -174,9 +171,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -211,9 +205,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -294,9 +285,6 @@ "value": "d" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -355,9 +343,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -425,9 +410,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -475,9 +457,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json b/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json index b4b17bcd4..6638f7c31 100644 --- a/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json +++ b/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json @@ -153,9 +153,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -191,9 +188,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -228,9 +222,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -280,9 +271,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -330,9 +318,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -422,9 +407,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -472,9 +454,6 @@ "value": "d" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/edge_conflict.exp.json b/testdata/d2oracle/TestMove/edge_conflict.exp.json index e25202d10..250ef5dc8 100644 --- a/testdata/d2oracle/TestMove/edge_conflict.exp.json +++ b/testdata/d2oracle/TestMove/edge_conflict.exp.json @@ -139,9 +139,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -177,9 +174,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -271,9 +265,6 @@ "value": "y 2" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -332,9 +323,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -393,9 +381,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -443,9 +428,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -493,9 +475,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/edge_into_container.exp.json b/testdata/d2oracle/TestMove/edge_into_container.exp.json index 50f16df22..9e0d32d1a 100644 --- a/testdata/d2oracle/TestMove/edge_into_container.exp.json +++ b/testdata/d2oracle/TestMove/edge_into_container.exp.json @@ -128,9 +128,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -166,9 +163,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -249,9 +243,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -299,9 +290,6 @@ "value": "d" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -360,9 +348,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -410,9 +395,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/edge_nested_basic.exp.json b/testdata/d2oracle/TestMove/edge_nested_basic.exp.json index d971571e8..f15452aa2 100644 --- a/testdata/d2oracle/TestMove/edge_nested_basic.exp.json +++ b/testdata/d2oracle/TestMove/edge_nested_basic.exp.json @@ -94,9 +94,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -132,9 +129,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -184,9 +178,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -234,9 +225,6 @@ "value": "d" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -284,9 +272,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/edge_out_of_container.exp.json b/testdata/d2oracle/TestMove/edge_out_of_container.exp.json index faa341279..753207e8f 100644 --- a/testdata/d2oracle/TestMove/edge_out_of_container.exp.json +++ b/testdata/d2oracle/TestMove/edge_out_of_container.exp.json @@ -105,9 +105,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -143,9 +140,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -195,9 +189,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -256,9 +247,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -306,9 +294,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/extend_map.exp.json b/testdata/d2oracle/TestMove/extend_map.exp.json index a270d53d8..013d862d0 100644 --- a/testdata/d2oracle/TestMove/extend_map.exp.json +++ b/testdata/d2oracle/TestMove/extend_map.exp.json @@ -152,9 +152,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -224,9 +221,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -274,9 +268,6 @@ "value": "e" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -324,9 +315,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -374,9 +362,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/extend_stationary_path.exp.json b/testdata/d2oracle/TestMove/extend_stationary_path.exp.json index de52ee3a2..bb1f992fd 100644 --- a/testdata/d2oracle/TestMove/extend_stationary_path.exp.json +++ b/testdata/d2oracle/TestMove/extend_stationary_path.exp.json @@ -145,9 +145,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -239,9 +236,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -331,9 +325,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -423,9 +414,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/flat_between_containers.exp.json b/testdata/d2oracle/TestMove/flat_between_containers.exp.json index 1531b4b61..5ffa855d0 100644 --- a/testdata/d2oracle/TestMove/flat_between_containers.exp.json +++ b/testdata/d2oracle/TestMove/flat_between_containers.exp.json @@ -94,9 +94,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -146,9 +143,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -196,9 +190,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -246,9 +237,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/flat_merge.exp.json b/testdata/d2oracle/TestMove/flat_merge.exp.json index 46b39334d..6f058bf60 100644 --- a/testdata/d2oracle/TestMove/flat_merge.exp.json +++ b/testdata/d2oracle/TestMove/flat_merge.exp.json @@ -127,9 +127,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -179,9 +176,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -229,9 +223,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -279,9 +270,6 @@ "value": "meow" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -329,9 +317,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/flat_middle_container.exp.json b/testdata/d2oracle/TestMove/flat_middle_container.exp.json index 5eb36003b..a02d287e7 100644 --- a/testdata/d2oracle/TestMove/flat_middle_container.exp.json +++ b/testdata/d2oracle/TestMove/flat_middle_container.exp.json @@ -105,9 +105,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -168,9 +165,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -229,9 +223,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -279,9 +270,6 @@ "value": "d" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -329,9 +317,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/flat_nested_merge.exp.json b/testdata/d2oracle/TestMove/flat_nested_merge.exp.json index 9720a61e8..dbbe76c0d 100644 --- a/testdata/d2oracle/TestMove/flat_nested_merge.exp.json +++ b/testdata/d2oracle/TestMove/flat_nested_merge.exp.json @@ -183,9 +183,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -268,9 +265,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -351,9 +345,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -434,9 +425,6 @@ "value": "d" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -517,9 +505,6 @@ "value": "e" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -578,9 +563,6 @@ "value": "p" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -639,9 +621,6 @@ "value": "q" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -711,9 +690,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -783,9 +759,6 @@ "value": "m" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -855,9 +828,6 @@ "value": "o" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -905,9 +875,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" 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 fb0af04bb..001c5db56 100644 --- a/testdata/d2oracle/TestMove/flat_nested_merge_multiple_refs.exp.json +++ b/testdata/d2oracle/TestMove/flat_nested_merge_multiple_refs.exp.json @@ -281,9 +281,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -428,9 +425,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -584,9 +578,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -740,9 +731,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -790,9 +778,6 @@ "value": "d" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -840,9 +825,6 @@ "value": "e" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -890,9 +872,6 @@ "value": "f" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -940,9 +919,6 @@ "value": "g" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -1023,9 +999,6 @@ "value": "q" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" 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 0bea45bb2..dfca9d602 100644 --- a/testdata/d2oracle/TestMove/flat_reparent_with_map_value.exp.json +++ b/testdata/d2oracle/TestMove/flat_reparent_with_map_value.exp.json @@ -104,9 +104,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -156,9 +153,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -206,9 +200,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "hexagon" 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 f5609d334..ac221c573 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 @@ -145,9 +145,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -197,9 +194,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -247,9 +241,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -297,9 +288,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "hexagon" diff --git a/testdata/d2oracle/TestMove/flat_reparent_with_value.exp.json b/testdata/d2oracle/TestMove/flat_reparent_with_value.exp.json index dcb36870e..87493703a 100644 --- a/testdata/d2oracle/TestMove/flat_reparent_with_value.exp.json +++ b/testdata/d2oracle/TestMove/flat_reparent_with_value.exp.json @@ -75,9 +75,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -127,9 +124,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -177,9 +171,6 @@ "value": "yo" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/flat_style.exp.json b/testdata/d2oracle/TestMove/flat_style.exp.json index 2f790aa88..0ee95a436 100644 --- a/testdata/d2oracle/TestMove/flat_style.exp.json +++ b/testdata/d2oracle/TestMove/flat_style.exp.json @@ -154,9 +154,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -206,9 +203,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -327,9 +321,6 @@ "value": "black" } }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/full_edge_slice.exp.json b/testdata/d2oracle/TestMove/full_edge_slice.exp.json index 536cbf6e9..4f326348f 100644 --- a/testdata/d2oracle/TestMove/full_edge_slice.exp.json +++ b/testdata/d2oracle/TestMove/full_edge_slice.exp.json @@ -208,9 +208,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -246,9 +243,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -283,9 +277,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -366,9 +357,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -416,9 +404,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -517,9 +502,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -598,9 +580,6 @@ "value": "d" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/full_slice.exp.json b/testdata/d2oracle/TestMove/full_slice.exp.json index 90494bfcd..337f23590 100644 --- a/testdata/d2oracle/TestMove/full_slice.exp.json +++ b/testdata/d2oracle/TestMove/full_slice.exp.json @@ -94,9 +94,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -146,9 +143,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -196,9 +190,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -246,9 +237,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/gnarly_1.exp.json b/testdata/d2oracle/TestMove/gnarly_1.exp.json index f147a7008..6b23f4c58 100644 --- a/testdata/d2oracle/TestMove/gnarly_1.exp.json +++ b/testdata/d2oracle/TestMove/gnarly_1.exp.json @@ -352,9 +352,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -390,9 +387,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -427,9 +421,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -464,9 +455,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -538,9 +526,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -610,9 +595,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -682,9 +664,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -794,9 +773,6 @@ "value": "d" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -866,9 +842,6 @@ "value": "e" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -938,9 +911,6 @@ "value": "f" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -988,9 +958,6 @@ "value": "meow" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -1100,9 +1067,6 @@ "value": "eyy" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -1181,9 +1145,6 @@ "value": "q" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -1242,9 +1203,6 @@ "value": "p" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -1303,9 +1261,6 @@ "value": "q" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -1364,9 +1319,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/hoist_container_children.exp.json b/testdata/d2oracle/TestMove/hoist_container_children.exp.json index d4f476a86..c99804d09 100644 --- a/testdata/d2oracle/TestMove/hoist_container_children.exp.json +++ b/testdata/d2oracle/TestMove/hoist_container_children.exp.json @@ -117,9 +117,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -169,9 +166,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -219,9 +213,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -269,9 +260,6 @@ "value": "d" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -319,9 +307,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/into_container_existing_map.exp.json b/testdata/d2oracle/TestMove/into_container_existing_map.exp.json index 9ef59fc99..472a2ee02 100644 --- a/testdata/d2oracle/TestMove/into_container_existing_map.exp.json +++ b/testdata/d2oracle/TestMove/into_container_existing_map.exp.json @@ -94,9 +94,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -146,9 +143,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -196,9 +190,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -246,9 +237,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/into_container_nonexisting_map.exp.json b/testdata/d2oracle/TestMove/into_container_nonexisting_map.exp.json index 9e23bee32..0bde25179 100644 --- a/testdata/d2oracle/TestMove/into_container_nonexisting_map.exp.json +++ b/testdata/d2oracle/TestMove/into_container_nonexisting_map.exp.json @@ -71,9 +71,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -123,9 +120,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -173,9 +167,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" 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 6a6fc3608..53318f42d 100644 --- a/testdata/d2oracle/TestMove/into_container_with_flat_keys.exp.json +++ b/testdata/d2oracle/TestMove/into_container_with_flat_keys.exp.json @@ -205,9 +205,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -257,9 +254,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -317,9 +311,6 @@ "value": "#FFFFFF" } }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" 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 404a9c675..377783a8f 100644 --- a/testdata/d2oracle/TestMove/into_container_with_flat_style.exp.json +++ b/testdata/d2oracle/TestMove/into_container_with_flat_style.exp.json @@ -111,9 +111,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -167,9 +164,6 @@ "value": "5" } }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -217,9 +211,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/map_transplant.exp.json b/testdata/d2oracle/TestMove/map_transplant.exp.json index 319d75317..fdeece592 100644 --- a/testdata/d2oracle/TestMove/map_transplant.exp.json +++ b/testdata/d2oracle/TestMove/map_transplant.exp.json @@ -214,9 +214,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -266,9 +263,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -316,9 +310,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -366,9 +357,6 @@ "value": "d" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -420,9 +408,6 @@ "value": "0.4" } }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/map_with_label.exp.json b/testdata/d2oracle/TestMove/map_with_label.exp.json index 517d54556..bdd5f2c3d 100644 --- a/testdata/d2oracle/TestMove/map_with_label.exp.json +++ b/testdata/d2oracle/TestMove/map_with_label.exp.json @@ -104,9 +104,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -156,9 +153,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -206,9 +200,6 @@ "value": "d" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -256,9 +247,6 @@ "value": "yo" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/merge_nested_maps.exp.json b/testdata/d2oracle/TestMove/merge_nested_maps.exp.json index 500e7dbda..0ebaafa78 100644 --- a/testdata/d2oracle/TestMove/merge_nested_maps.exp.json +++ b/testdata/d2oracle/TestMove/merge_nested_maps.exp.json @@ -265,9 +265,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -317,9 +314,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -471,9 +465,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -532,9 +523,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -613,9 +601,6 @@ "value": "d" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -685,9 +670,6 @@ "value": "e" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -757,9 +739,6 @@ "value": "g" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -807,9 +786,6 @@ "value": "o" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -857,9 +833,6 @@ "value": "k" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/merge_reserved.exp.json b/testdata/d2oracle/TestMove/merge_reserved.exp.json index 4f9329d20..2d2043a01 100644 --- a/testdata/d2oracle/TestMove/merge_reserved.exp.json +++ b/testdata/d2oracle/TestMove/merge_reserved.exp.json @@ -256,9 +256,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -308,9 +305,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -451,9 +445,6 @@ "value": "hi" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -512,9 +503,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -573,9 +561,6 @@ "value": "e" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -634,9 +619,6 @@ "value": "g" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -684,9 +666,6 @@ "value": "k" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/middle_container.exp.json b/testdata/d2oracle/TestMove/middle_container.exp.json index 9432a5f71..ef2e9c413 100644 --- a/testdata/d2oracle/TestMove/middle_container.exp.json +++ b/testdata/d2oracle/TestMove/middle_container.exp.json @@ -94,9 +94,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -146,9 +143,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -196,9 +190,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -246,9 +237,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/move_container_children.exp.json b/testdata/d2oracle/TestMove/move_container_children.exp.json index bfb7ece7a..dc9f8d8dc 100644 --- a/testdata/d2oracle/TestMove/move_container_children.exp.json +++ b/testdata/d2oracle/TestMove/move_container_children.exp.json @@ -140,9 +140,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -192,9 +189,6 @@ "value": "p" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -242,9 +236,6 @@ "value": "q" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -292,9 +283,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -342,9 +330,6 @@ "value": "d" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -392,9 +377,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/move_container_conflict_children.exp.json b/testdata/d2oracle/TestMove/move_container_conflict_children.exp.json index 5f1139bec..4c4851834 100644 --- a/testdata/d2oracle/TestMove/move_container_conflict_children.exp.json +++ b/testdata/d2oracle/TestMove/move_container_conflict_children.exp.json @@ -140,9 +140,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -192,9 +189,6 @@ "value": "a 2" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -242,9 +236,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -292,9 +283,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -342,9 +330,6 @@ "value": "d" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -392,9 +377,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" 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 3a7afab56..7c657d924 100644 --- a/testdata/d2oracle/TestMove/move_into_key_with_value.exp.json +++ b/testdata/d2oracle/TestMove/move_into_key_with_value.exp.json @@ -81,9 +81,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -133,9 +130,6 @@ "value": "meow" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -183,9 +177,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/move_out_of_edge.exp.json b/testdata/d2oracle/TestMove/move_out_of_edge.exp.json index 1a8534854..99efcb3e8 100644 --- a/testdata/d2oracle/TestMove/move_out_of_edge.exp.json +++ b/testdata/d2oracle/TestMove/move_out_of_edge.exp.json @@ -121,9 +121,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -159,9 +156,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -222,9 +216,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -283,9 +274,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -355,9 +343,6 @@ "value": "d" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -427,9 +412,6 @@ "value": "e" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -499,9 +481,6 @@ "value": "f" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -549,9 +528,6 @@ "value": "q" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" 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 6b2472b2f..ba86c5f1d 100644 --- a/testdata/d2oracle/TestMove/move_out_of_nested_edge.exp.json +++ b/testdata/d2oracle/TestMove/move_out_of_nested_edge.exp.json @@ -161,9 +161,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -199,9 +196,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -262,9 +256,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -323,9 +314,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -426,9 +414,6 @@ "value": "d" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -529,9 +514,6 @@ "value": "e" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -601,9 +583,6 @@ "value": "f" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -651,9 +630,6 @@ "value": "q" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/multiple_nesting_levels.exp.json b/testdata/d2oracle/TestMove/multiple_nesting_levels.exp.json index d6a478550..45c0f7ac6 100644 --- a/testdata/d2oracle/TestMove/multiple_nesting_levels.exp.json +++ b/testdata/d2oracle/TestMove/multiple_nesting_levels.exp.json @@ -276,9 +276,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -381,9 +378,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -526,9 +520,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -691,9 +682,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -741,9 +729,6 @@ "value": "g" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -791,9 +776,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -863,9 +845,6 @@ "value": "d" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -946,9 +925,6 @@ "value": "f" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/near.exp.json b/testdata/d2oracle/TestMove/near.exp.json index 8b416ca8f..d1aac8e9b 100644 --- a/testdata/d2oracle/TestMove/near.exp.json +++ b/testdata/d2oracle/TestMove/near.exp.json @@ -133,9 +133,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -185,9 +182,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": { "range": "d2/testdata/d2oracle/TestMove/near.d2,1:8:13-1:11:16", "path": [ @@ -308,9 +302,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/nhooyr_one.exp.json b/testdata/d2oracle/TestMove/nhooyr_one.exp.json index 25afb96ad..004758cd5 100644 --- a/testdata/d2oracle/TestMove/nhooyr_one.exp.json +++ b/testdata/d2oracle/TestMove/nhooyr_one.exp.json @@ -123,9 +123,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -175,9 +172,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -225,9 +219,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -275,9 +266,6 @@ "value": "d" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -325,9 +313,6 @@ "value": "q" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/nhooyr_two.exp.json b/testdata/d2oracle/TestMove/nhooyr_two.exp.json index c960f5b10..1855b26dd 100644 --- a/testdata/d2oracle/TestMove/nhooyr_two.exp.json +++ b/testdata/d2oracle/TestMove/nhooyr_two.exp.json @@ -169,9 +169,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -207,9 +204,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -259,9 +253,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -309,9 +300,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -359,9 +347,6 @@ "value": "meow" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -409,9 +394,6 @@ "value": "d" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -459,9 +441,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -509,9 +488,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/parentheses.exp.json b/testdata/d2oracle/TestMove/parentheses.exp.json index 5a3abfd86..18dd78d44 100644 --- a/testdata/d2oracle/TestMove/parentheses.exp.json +++ b/testdata/d2oracle/TestMove/parentheses.exp.json @@ -104,9 +104,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -142,9 +139,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -194,9 +188,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -275,9 +266,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -336,9 +324,6 @@ "value": "y (z)" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/partial_edge_slice.exp.json b/testdata/d2oracle/TestMove/partial_edge_slice.exp.json index fc2de799a..d65ed6f61 100644 --- a/testdata/d2oracle/TestMove/partial_edge_slice.exp.json +++ b/testdata/d2oracle/TestMove/partial_edge_slice.exp.json @@ -111,9 +111,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -149,9 +146,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -201,9 +195,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -271,9 +262,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -321,9 +309,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/partial_slice.exp.json b/testdata/d2oracle/TestMove/partial_slice.exp.json index f86f1b7ea..ae724b877 100644 --- a/testdata/d2oracle/TestMove/partial_slice.exp.json +++ b/testdata/d2oracle/TestMove/partial_slice.exp.json @@ -65,9 +65,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -117,9 +114,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -167,9 +161,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/rename_2.exp.json b/testdata/d2oracle/TestMove/rename_2.exp.json index 4d7fa797f..b8f7bd85a 100644 --- a/testdata/d2oracle/TestMove/rename_2.exp.json +++ b/testdata/d2oracle/TestMove/rename_2.exp.json @@ -140,9 +140,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -192,9 +189,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -242,9 +236,6 @@ "value": "y 2" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -292,9 +283,6 @@ "value": "b 2" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -342,9 +330,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -392,9 +377,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/reuse_map.exp.json b/testdata/d2oracle/TestMove/reuse_map.exp.json index 752d29b85..fc588be56 100644 --- a/testdata/d2oracle/TestMove/reuse_map.exp.json +++ b/testdata/d2oracle/TestMove/reuse_map.exp.json @@ -157,9 +157,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -209,9 +206,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -290,9 +284,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -340,9 +331,6 @@ "value": "hey" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -390,9 +378,6 @@ "value": "k" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -451,9 +436,6 @@ "value": "yo" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/slice_style.exp.json b/testdata/d2oracle/TestMove/slice_style.exp.json index dbf7b317c..5faba70e0 100644 --- a/testdata/d2oracle/TestMove/slice_style.exp.json +++ b/testdata/d2oracle/TestMove/slice_style.exp.json @@ -109,9 +109,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -161,9 +158,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -254,9 +248,6 @@ "Fragment": "", "RawFragment": "" }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/underscore_children.exp.json b/testdata/d2oracle/TestMove/underscore_children.exp.json index 31620a414..0fcedfa8b 100644 --- a/testdata/d2oracle/TestMove/underscore_children.exp.json +++ b/testdata/d2oracle/TestMove/underscore_children.exp.json @@ -105,9 +105,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -157,9 +154,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -238,9 +232,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/underscore_edge_children.exp.json b/testdata/d2oracle/TestMove/underscore_edge_children.exp.json index 83012671e..1b85cac85 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_children.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_children.exp.json @@ -128,9 +128,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -166,9 +163,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -218,9 +212,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -299,9 +290,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -349,9 +337,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json index 9364f6af0..9acd8d391 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json @@ -94,9 +94,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -132,9 +129,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -184,9 +178,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -234,9 +225,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -284,9 +272,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json index 69e593af6..077302a94 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json @@ -105,9 +105,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -143,9 +140,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -195,9 +189,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -276,9 +267,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -337,9 +325,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json index 8e8b3eed1..7c442f9f5 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json @@ -105,9 +105,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -143,9 +140,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -195,9 +189,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -256,9 +247,6 @@ "value": "d" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -306,9 +294,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json index bb343350a..2732b7cfd 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json @@ -94,9 +94,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -132,9 +129,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -184,9 +178,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -234,9 +225,6 @@ "value": "f" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -284,9 +272,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json index ca68c3286..e91b2f8e3 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json @@ -127,9 +127,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -165,9 +162,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -217,9 +211,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -320,9 +311,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -392,9 +380,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/underscore_edge_split.exp.json b/testdata/d2oracle/TestMove/underscore_edge_split.exp.json index f0a47c4d6..712405d97 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_split.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_split.exp.json @@ -157,9 +157,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -195,9 +192,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -247,9 +241,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -297,9 +288,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -358,9 +346,6 @@ "value": "f" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -408,9 +393,6 @@ "value": "yo" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -458,9 +440,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/underscore_merge.exp.json b/testdata/d2oracle/TestMove/underscore_merge.exp.json index 473ded447..9dca613fa 100644 --- a/testdata/d2oracle/TestMove/underscore_merge.exp.json +++ b/testdata/d2oracle/TestMove/underscore_merge.exp.json @@ -137,9 +137,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -189,9 +186,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -239,9 +233,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -309,9 +300,6 @@ "value": "what" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/underscore_split.exp.json b/testdata/d2oracle/TestMove/underscore_split.exp.json index 4830652a8..d612a8983 100644 --- a/testdata/d2oracle/TestMove/underscore_split.exp.json +++ b/testdata/d2oracle/TestMove/underscore_split.exp.json @@ -134,9 +134,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -186,9 +183,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -236,9 +230,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -297,9 +288,6 @@ "value": "f" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -347,9 +335,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/underscore_split_out.exp.json b/testdata/d2oracle/TestMove/underscore_split_out.exp.json index dba2a4378..0772fd4cf 100644 --- a/testdata/d2oracle/TestMove/underscore_split_out.exp.json +++ b/testdata/d2oracle/TestMove/underscore_split_out.exp.json @@ -192,9 +192,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -244,9 +241,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -294,9 +288,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -375,9 +366,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -425,9 +413,6 @@ "value": "e" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -475,9 +460,6 @@ "value": "f" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/underscore_transplant.exp.json b/testdata/d2oracle/TestMove/underscore_transplant.exp.json index 395afec1e..5795f4ccf 100644 --- a/testdata/d2oracle/TestMove/underscore_transplant.exp.json +++ b/testdata/d2oracle/TestMove/underscore_transplant.exp.json @@ -94,9 +94,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -146,9 +143,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -196,9 +190,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -246,9 +237,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/unique_name.exp.json b/testdata/d2oracle/TestMove/unique_name.exp.json index 7b14dfb3e..7f3a853d2 100644 --- a/testdata/d2oracle/TestMove/unique_name.exp.json +++ b/testdata/d2oracle/TestMove/unique_name.exp.json @@ -151,9 +151,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -234,9 +231,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -315,9 +309,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -365,9 +356,6 @@ "value": "b 2" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -415,9 +403,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/unique_name_with_references.exp.json b/testdata/d2oracle/TestMove/unique_name_with_references.exp.json index aa4b375f0..d28c3b420 100644 --- a/testdata/d2oracle/TestMove/unique_name_with_references.exp.json +++ b/testdata/d2oracle/TestMove/unique_name_with_references.exp.json @@ -174,9 +174,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -212,9 +209,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -295,9 +289,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -345,9 +336,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -426,9 +414,6 @@ "value": "b 2" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -476,9 +461,6 @@ "value": "d" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -526,9 +508,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestRename/arrows.exp.json b/testdata/d2oracle/TestRename/arrows.exp.json index f9c1e49e5..d24981b23 100644 --- a/testdata/d2oracle/TestRename/arrows.exp.json +++ b/testdata/d2oracle/TestRename/arrows.exp.json @@ -65,9 +65,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -103,9 +100,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -155,9 +149,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -205,9 +196,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestRename/arrows_chain.exp.json b/testdata/d2oracle/TestRename/arrows_chain.exp.json index 1789285a5..e4a145958 100644 --- a/testdata/d2oracle/TestRename/arrows_chain.exp.json +++ b/testdata/d2oracle/TestRename/arrows_chain.exp.json @@ -139,9 +139,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -177,9 +174,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -214,9 +208,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -251,9 +242,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -303,9 +291,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -373,9 +358,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -443,9 +425,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -493,9 +472,6 @@ "value": "q" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestRename/arrows_complex.exp.json b/testdata/d2oracle/TestRename/arrows_complex.exp.json index f9eb8d32e..3a0b0e7fd 100644 --- a/testdata/d2oracle/TestRename/arrows_complex.exp.json +++ b/testdata/d2oracle/TestRename/arrows_complex.exp.json @@ -119,9 +119,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -157,9 +154,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -220,9 +214,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -281,9 +272,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -331,9 +319,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -381,9 +366,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestRename/arrows_trim_common.exp.json b/testdata/d2oracle/TestRename/arrows_trim_common.exp.json index 4298619f9..82bae106f 100644 --- a/testdata/d2oracle/TestRename/arrows_trim_common.exp.json +++ b/testdata/d2oracle/TestRename/arrows_trim_common.exp.json @@ -155,9 +155,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -193,9 +190,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -230,9 +224,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -267,9 +258,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -319,9 +307,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -369,9 +354,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -439,9 +421,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -509,9 +488,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -559,9 +535,6 @@ "value": "q" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json b/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json index 9e9dc3c23..6db44d5f8 100644 --- a/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json +++ b/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json @@ -205,9 +205,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -243,9 +240,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -280,9 +274,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -317,9 +308,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -535,9 +523,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -596,9 +581,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -688,9 +670,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -780,9 +759,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -841,9 +817,6 @@ "value": "q)" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestRename/complex_edge_1.exp.json b/testdata/d2oracle/TestRename/complex_edge_1.exp.json index 564d69ca3..f0f162256 100644 --- a/testdata/d2oracle/TestRename/complex_edge_1.exp.json +++ b/testdata/d2oracle/TestRename/complex_edge_1.exp.json @@ -119,9 +119,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -157,9 +154,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -220,9 +214,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -281,9 +272,6 @@ "value": "ooo" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -331,9 +319,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -381,9 +366,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestRename/complex_edge_2.exp.json b/testdata/d2oracle/TestRename/complex_edge_2.exp.json index 254b47ba0..b01784f5f 100644 --- a/testdata/d2oracle/TestRename/complex_edge_2.exp.json +++ b/testdata/d2oracle/TestRename/complex_edge_2.exp.json @@ -119,9 +119,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -157,9 +154,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -220,9 +214,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -281,9 +272,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -331,9 +319,6 @@ "value": "papa" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -381,9 +366,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestRename/conflict.exp.json b/testdata/d2oracle/TestRename/conflict.exp.json index c6f2ab48e..5252e87c1 100644 --- a/testdata/d2oracle/TestRename/conflict.exp.json +++ b/testdata/d2oracle/TestRename/conflict.exp.json @@ -65,9 +65,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -117,9 +114,6 @@ "value": "la 2" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -167,9 +161,6 @@ "value": "la" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestRename/conflict_2.exp.json b/testdata/d2oracle/TestRename/conflict_2.exp.json index ef5c0653f..9861dedd8 100644 --- a/testdata/d2oracle/TestRename/conflict_2.exp.json +++ b/testdata/d2oracle/TestRename/conflict_2.exp.json @@ -116,9 +116,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -190,9 +187,6 @@ "value": "1" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -262,9 +256,6 @@ "value": "2" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -334,9 +325,6 @@ "value": "3" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -384,9 +372,6 @@ "value": "5 2" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -434,9 +419,6 @@ "value": "5" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestRename/conflict_with_dots.exp.json b/testdata/d2oracle/TestRename/conflict_with_dots.exp.json index 254508da4..f7aeff695 100644 --- a/testdata/d2oracle/TestRename/conflict_with_dots.exp.json +++ b/testdata/d2oracle/TestRename/conflict_with_dots.exp.json @@ -65,9 +65,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -117,9 +114,6 @@ "value": "a.b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -167,9 +161,6 @@ "value": "a.b 2" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestRename/container.exp.json b/testdata/d2oracle/TestRename/container.exp.json index 43557b7b6..087ca3c1f 100644 --- a/testdata/d2oracle/TestRename/container.exp.json +++ b/testdata/d2oracle/TestRename/container.exp.json @@ -744,9 +744,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -785,9 +782,6 @@ "value": "furbling, v.:" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -822,9 +816,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -859,9 +850,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -896,9 +884,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -933,9 +918,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -970,9 +952,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -1007,9 +986,6 @@ "value": "furbling, v.:" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -1300,9 +1276,6 @@ "value": "ok" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -1591,9 +1564,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -1871,9 +1841,6 @@ "value": "label" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -1994,9 +1961,6 @@ "value": "p" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -2117,9 +2081,6 @@ "value": "k" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -2209,9 +2170,6 @@ "value": "l" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -2301,9 +2259,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -2351,9 +2306,6 @@ "value": "q" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -2421,9 +2373,6 @@ "value": "+" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -2471,9 +2420,6 @@ "value": "i" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -2521,9 +2467,6 @@ "value": "more" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -2593,9 +2536,6 @@ "value": "ok" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -2665,9 +2605,6 @@ "value": "q" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -2737,9 +2674,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -2798,9 +2732,6 @@ "value": "p" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -2859,9 +2790,6 @@ "value": "k" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestRename/edges.exp.json b/testdata/d2oracle/TestRename/edges.exp.json index 52eaaedb4..58c135e78 100644 --- a/testdata/d2oracle/TestRename/edges.exp.json +++ b/testdata/d2oracle/TestRename/edges.exp.json @@ -409,9 +409,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -447,9 +444,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -484,9 +478,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -521,9 +512,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -558,9 +546,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -595,9 +580,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -632,9 +614,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -808,9 +787,6 @@ "value": "q" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -1002,9 +978,6 @@ "value": "label" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -1094,9 +1067,6 @@ "value": "p" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -1186,9 +1156,6 @@ "value": "k" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -1278,9 +1245,6 @@ "value": "l" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -1370,9 +1334,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -1420,9 +1381,6 @@ "value": "q" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -1490,9 +1448,6 @@ "value": "+" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestRename/flat.exp.json b/testdata/d2oracle/TestRename/flat.exp.json index 7529c1bfb..7320fc13c 100644 --- a/testdata/d2oracle/TestRename/flat.exp.json +++ b/testdata/d2oracle/TestRename/flat.exp.json @@ -42,9 +42,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -94,9 +91,6 @@ "value": "---" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestRename/generated.exp.json b/testdata/d2oracle/TestRename/generated.exp.json index b81472c71..3c579e170 100644 --- a/testdata/d2oracle/TestRename/generated.exp.json +++ b/testdata/d2oracle/TestRename/generated.exp.json @@ -42,9 +42,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -94,9 +91,6 @@ "value": "Square" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestRename/near.exp.json b/testdata/d2oracle/TestRename/near.exp.json index 46e48cb5d..872d8157d 100644 --- a/testdata/d2oracle/TestRename/near.exp.json +++ b/testdata/d2oracle/TestRename/near.exp.json @@ -104,9 +104,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -156,9 +153,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": { "range": "d2/testdata/d2oracle/TestRename/near.d2,1:8:13-1:9:14", "path": [ @@ -221,9 +215,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestRename/nested.exp.json b/testdata/d2oracle/TestRename/nested.exp.json index 7b8a2afdb..23130b5ff 100644 --- a/testdata/d2oracle/TestRename/nested.exp.json +++ b/testdata/d2oracle/TestRename/nested.exp.json @@ -171,9 +171,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -320,9 +317,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -467,9 +461,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -614,9 +605,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -761,9 +749,6 @@ "value": "q" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -875,9 +860,6 @@ "value": "nerve-gift-jingler" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/base.exp.json b/testdata/d2oracle/TestSet/base.exp.json index e71537087..40751dbdf 100644 --- a/testdata/d2oracle/TestSet/base.exp.json +++ b/testdata/d2oracle/TestSet/base.exp.json @@ -42,9 +42,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -94,9 +91,6 @@ "value": "square" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/block_string_multiline.exp.json b/testdata/d2oracle/TestSet/block_string_multiline.exp.json index d140b1f59..ca6b20dcc 100644 --- a/testdata/d2oracle/TestSet/block_string_multiline.exp.json +++ b/testdata/d2oracle/TestSet/block_string_multiline.exp.json @@ -49,9 +49,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -101,9 +98,6 @@ "value": "# header\nHe has not acquired a fortune; the fortune has acquired him.\nHe has not acquired a fortune; the fortune has acquired him." }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "language": "markdown", "shape": { diff --git a/testdata/d2oracle/TestSet/block_string_oneline.exp.json b/testdata/d2oracle/TestSet/block_string_oneline.exp.json index 67aa09c02..822f69bc4 100644 --- a/testdata/d2oracle/TestSet/block_string_oneline.exp.json +++ b/testdata/d2oracle/TestSet/block_string_oneline.exp.json @@ -49,9 +49,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -101,9 +98,6 @@ "value": "|||what's up|||" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "language": "markdown", "shape": { diff --git a/testdata/d2oracle/TestSet/edge.exp.json b/testdata/d2oracle/TestSet/edge.exp.json index b6833f268..1a3dac238 100644 --- a/testdata/d2oracle/TestSet/edge.exp.json +++ b/testdata/d2oracle/TestSet/edge.exp.json @@ -75,9 +75,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -113,9 +110,6 @@ "value": "two" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -165,9 +159,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -215,9 +206,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/edge_append_style.exp.json b/testdata/d2oracle/TestSet/edge_append_style.exp.json index ca8e4e67c..5705a640f 100644 --- a/testdata/d2oracle/TestSet/edge_append_style.exp.json +++ b/testdata/d2oracle/TestSet/edge_append_style.exp.json @@ -110,9 +110,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -152,9 +149,6 @@ "value": "true" } }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -204,9 +198,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -254,9 +245,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/edge_chain.exp.json b/testdata/d2oracle/TestSet/edge_chain.exp.json index b397442d6..9eeadba7e 100644 --- a/testdata/d2oracle/TestSet/edge_chain.exp.json +++ b/testdata/d2oracle/TestSet/edge_chain.exp.json @@ -202,9 +202,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -243,9 +240,6 @@ "value": "QOTD:\n \"It's been Monday all week today.\"" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -280,9 +274,6 @@ "value": "wsup" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -332,9 +323,6 @@ "value": "oreo" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -402,9 +390,6 @@ "value": "q" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -492,9 +477,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -542,9 +524,6 @@ "value": "p" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json b/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json index f9e3502d8..f075b2f9e 100644 --- a/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json +++ b/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json @@ -185,9 +185,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -230,9 +227,6 @@ "value": "true" } }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -267,9 +261,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -339,9 +330,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -429,9 +417,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -479,9 +464,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json b/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json index 87b0bf2bc..0b0854fa3 100644 --- a/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json +++ b/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json @@ -269,9 +269,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -307,9 +304,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -357,9 +351,6 @@ "value": "true" } }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -409,9 +400,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -519,9 +507,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -609,9 +594,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json b/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json index ac67ea078..58298d21c 100644 --- a/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json +++ b/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json @@ -225,9 +225,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -270,9 +267,6 @@ "value": "0.4" } }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -307,9 +301,6 @@ "value": "wsup" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -359,9 +350,6 @@ "value": "oreo" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -429,9 +417,6 @@ "value": "q" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -519,9 +504,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -569,9 +551,6 @@ "value": "p" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/edge_index_case.exp.json b/testdata/d2oracle/TestSet/edge_index_case.exp.json index e20fd8569..3149173d3 100644 --- a/testdata/d2oracle/TestSet/edge_index_case.exp.json +++ b/testdata/d2oracle/TestSet/edge_index_case.exp.json @@ -179,9 +179,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -217,9 +214,6 @@ "value": "two" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -254,9 +248,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -306,9 +297,6 @@ "value": "Square" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -356,9 +344,6 @@ "value": "Square" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -406,9 +391,6 @@ "value": "Square 2" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -456,9 +438,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -506,9 +485,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -556,9 +532,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/edge_index_nested.exp.json b/testdata/d2oracle/TestSet/edge_index_nested.exp.json index 6d76011fe..68f7861de 100644 --- a/testdata/d2oracle/TestSet/edge_index_nested.exp.json +++ b/testdata/d2oracle/TestSet/edge_index_nested.exp.json @@ -104,9 +104,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -142,9 +139,6 @@ "value": "QOTD" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -194,9 +188,6 @@ "value": "oreo" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -244,9 +235,6 @@ "value": "q" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -294,9 +282,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/edge_key_and_key.exp.json b/testdata/d2oracle/TestSet/edge_key_and_key.exp.json index c7ef2bc7b..4c7fc0bce 100644 --- a/testdata/d2oracle/TestSet/edge_key_and_key.exp.json +++ b/testdata/d2oracle/TestSet/edge_key_and_key.exp.json @@ -155,9 +155,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -197,9 +194,6 @@ "value": "true" } }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -311,9 +305,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -372,9 +363,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -433,9 +421,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/edge_label.exp.json b/testdata/d2oracle/TestSet/edge_label.exp.json index 0db2b36bc..b43925f2f 100644 --- a/testdata/d2oracle/TestSet/edge_label.exp.json +++ b/testdata/d2oracle/TestSet/edge_label.exp.json @@ -120,9 +120,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -162,9 +159,6 @@ "value": "true" } }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -214,9 +208,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -264,9 +255,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/edge_merge_style.exp.json b/testdata/d2oracle/TestSet/edge_merge_style.exp.json index 74a797871..72a0a788e 100644 --- a/testdata/d2oracle/TestSet/edge_merge_style.exp.json +++ b/testdata/d2oracle/TestSet/edge_merge_style.exp.json @@ -157,9 +157,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -202,9 +199,6 @@ "value": "true" } }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -254,9 +248,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -304,9 +295,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json b/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json index 2cdf17bfa..f6b9d8b7b 100644 --- a/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json +++ b/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json @@ -104,9 +104,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -142,9 +139,6 @@ "value": "yo" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -194,9 +188,6 @@ "value": "oreo" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -244,9 +235,6 @@ "value": "q" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -294,9 +282,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json b/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json index f297e4351..9bae3fe9e 100644 --- a/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json +++ b/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json @@ -150,9 +150,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -192,9 +189,6 @@ "value": "0.4" } }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -244,9 +238,6 @@ "value": "oreo" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -294,9 +285,6 @@ "value": "q" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -344,9 +332,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/expanded_map_style.exp.json b/testdata/d2oracle/TestSet/expanded_map_style.exp.json index f37286370..4b0dd5e66 100644 --- a/testdata/d2oracle/TestSet/expanded_map_style.exp.json +++ b/testdata/d2oracle/TestSet/expanded_map_style.exp.json @@ -106,9 +106,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -162,9 +159,6 @@ "value": "0.2" } }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/icon.exp.json b/testdata/d2oracle/TestSet/icon.exp.json index 9198e9d7a..554bee4a4 100644 --- a/testdata/d2oracle/TestSet/icon.exp.json +++ b/testdata/d2oracle/TestSet/icon.exp.json @@ -81,9 +81,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -145,9 +142,6 @@ "Fragment": "", "RawFragment": "" }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/inline_style.exp.json b/testdata/d2oracle/TestSet/inline_style.exp.json index 677009f9f..d35e5f507 100644 --- a/testdata/d2oracle/TestSet/inline_style.exp.json +++ b/testdata/d2oracle/TestSet/inline_style.exp.json @@ -132,9 +132,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -191,9 +188,6 @@ "value": "red" } }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/label.exp.json b/testdata/d2oracle/TestSet/label.exp.json index c4ae1578c..fa0485116 100644 --- a/testdata/d2oracle/TestSet/label.exp.json +++ b/testdata/d2oracle/TestSet/label.exp.json @@ -52,9 +52,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -104,9 +101,6 @@ "value": "Always try to do things in chronological order; it's less confusing that way." }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/label_primary.exp.json b/testdata/d2oracle/TestSet/label_primary.exp.json index c336614a1..aa680310a 100644 --- a/testdata/d2oracle/TestSet/label_primary.exp.json +++ b/testdata/d2oracle/TestSet/label_primary.exp.json @@ -100,9 +100,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -138,9 +135,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -190,9 +184,6 @@ "value": "QOTD: \"It's been Monday all week today.\"" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -240,9 +231,6 @@ "value": "q" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -290,9 +278,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/label_replace.exp.json b/testdata/d2oracle/TestSet/label_replace.exp.json index 24314551f..c4061c809 100644 --- a/testdata/d2oracle/TestSet/label_replace.exp.json +++ b/testdata/d2oracle/TestSet/label_replace.exp.json @@ -52,9 +52,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -104,9 +101,6 @@ "value": "Always try to do things in chronological order; it's less confusing that way." }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/label_unset.exp.json b/testdata/d2oracle/TestSet/label_unset.exp.json index 32330bce3..b9105e16a 100644 --- a/testdata/d2oracle/TestSet/label_unset.exp.json +++ b/testdata/d2oracle/TestSet/label_unset.exp.json @@ -42,9 +42,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -94,9 +91,6 @@ "value": "square" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/map_key_missing.exp.json b/testdata/d2oracle/TestSet/map_key_missing.exp.json index 8661ccf8b..3a1447d10 100644 --- a/testdata/d2oracle/TestSet/map_key_missing.exp.json +++ b/testdata/d2oracle/TestSet/map_key_missing.exp.json @@ -98,9 +98,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -136,9 +133,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -208,9 +202,6 @@ "value": "Never offend people with style when you can offend them with substance." }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -258,9 +249,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/nested_alex.exp.json b/testdata/d2oracle/TestSet/nested_alex.exp.json index 67bb9769b..ffbbad25c 100644 --- a/testdata/d2oracle/TestSet/nested_alex.exp.json +++ b/testdata/d2oracle/TestSet/nested_alex.exp.json @@ -170,9 +170,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -208,9 +205,6 @@ "value": "asdf" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -260,9 +254,6 @@ "value": "do" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -310,9 +301,6 @@ "value": "test" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -380,9 +368,6 @@ "value": "How much of their influence on you is a result of your influence on them?\nA conference is a gathering of important people who singly can do nothing" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/new_style.exp.json b/testdata/d2oracle/TestSet/new_style.exp.json index 6a4a6bce7..492cc2ff7 100644 --- a/testdata/d2oracle/TestSet/new_style.exp.json +++ b/testdata/d2oracle/TestSet/new_style.exp.json @@ -88,9 +88,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -144,9 +141,6 @@ "value": "0.2" } }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/replace_shape.exp.json b/testdata/d2oracle/TestSet/replace_shape.exp.json index b1442cc0d..8b1ab7ff5 100644 --- a/testdata/d2oracle/TestSet/replace_shape.exp.json +++ b/testdata/d2oracle/TestSet/replace_shape.exp.json @@ -63,9 +63,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -126,9 +123,6 @@ "value": "square" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "circle" diff --git a/testdata/d2oracle/TestSet/replace_style.exp.json b/testdata/d2oracle/TestSet/replace_style.exp.json index 71795f0c6..d555df516 100644 --- a/testdata/d2oracle/TestSet/replace_style.exp.json +++ b/testdata/d2oracle/TestSet/replace_style.exp.json @@ -70,9 +70,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -148,9 +145,6 @@ "value": "0.2" } }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/replace_style_edgecase.exp.json b/testdata/d2oracle/TestSet/replace_style_edgecase.exp.json index 0264b7ac4..88e135c5e 100644 --- a/testdata/d2oracle/TestSet/replace_style_edgecase.exp.json +++ b/testdata/d2oracle/TestSet/replace_style_edgecase.exp.json @@ -125,9 +125,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -248,9 +245,6 @@ "value": "orange" } }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/shape.exp.json b/testdata/d2oracle/TestSet/shape.exp.json index d374a7302..0e70324e8 100644 --- a/testdata/d2oracle/TestSet/shape.exp.json +++ b/testdata/d2oracle/TestSet/shape.exp.json @@ -81,9 +81,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -133,9 +130,6 @@ "value": "square" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "square" diff --git a/testdata/d2oracle/TestSet/shape_nested_style_set.exp.json b/testdata/d2oracle/TestSet/shape_nested_style_set.exp.json index 73e57edb9..60376017b 100644 --- a/testdata/d2oracle/TestSet/shape_nested_style_set.exp.json +++ b/testdata/d2oracle/TestSet/shape_nested_style_set.exp.json @@ -88,9 +88,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -144,9 +141,6 @@ "value": "0.4" } }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle"