From a943bea1119512ef4582ca5ce7272470dc83d7ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BAlio=20C=C3=A9sar=20Batista?= Date: Tue, 15 Nov 2022 19:41:44 -0300 Subject: [PATCH] Add [From/To]TableRowIndex to edges --- d2compiler/compile.go | 9 +++++---- d2graph/d2graph.go | 3 +++ testdata/d2compiler/TestCompile/edge.exp.json | 2 ++ .../TestCompile/edge_arrowhead_fields.exp.json | 2 ++ .../d2compiler/TestCompile/edge_chain.exp.json | 4 ++++ .../d2compiler/TestCompile/edge_chain_map.exp.json | 4 ++++ .../TestCompile/edge_exclusive_style.exp.json | 2 ++ .../TestCompile/edge_flat_arrowhead.exp.json | 2 ++ .../TestCompile/edge_flat_label_arrowhead.exp.json | 2 ++ .../d2compiler/TestCompile/edge_index.exp.json | 2 ++ .../d2compiler/TestCompile/edge_index_map.exp.json | 2 ++ .../TestCompile/edge_index_nested.exp.json | 2 ++ .../edge_index_nested_cross_scope.exp.json | 2 ++ .../edge_key_group_flat_nested.exp.json | 2 ++ .../edge_key_group_flat_nested_underscore.exp.json | 2 ++ ...e_key_group_map_flat_nested_underscore.exp.json | 2 ++ .../edge_key_group_map_nested_underscore.exp.json | 2 ++ .../d2compiler/TestCompile/edge_label_map.exp.json | 2 ++ testdata/d2compiler/TestCompile/edge_map.exp.json | 2 ++ .../TestCompile/edge_map_arrowhead.exp.json | 2 ++ .../TestCompile/edge_map_group_flat.exp.json | 2 ++ .../TestCompile/edge_map_group_semiflat.exp.json | 2 ++ .../TestCompile/edge_map_nested.exp.json | 2 ++ .../TestCompile/edge_map_nested_flat.exp.json | 2 ++ .../TestCompile/edge_mixed_arrowhead.exp.json | 2 ++ .../TestCompile/edge_non_shape_arrowhead.exp.json | 2 ++ .../TestCompile/edge_semiflat_arrowhead.exp.json | 2 ++ .../TestCompile/underscore_edge.exp.json | 2 ++ .../TestCompile/underscore_edge_chain.exp.json | 4 ++++ .../TestCompile/underscore_edge_existing.exp.json | 4 ++++ .../TestCompile/underscore_edge_index.exp.json | 2 ++ .../TestCompile/underscore_edge_nested.exp.json | 2 ++ .../d2oracle/TestCreate/container_edge.exp.json | 2 ++ .../TestCreate/container_edge_label.exp.json | 2 ++ testdata/d2oracle/TestCreate/edge.exp.json | 2 ++ testdata/d2oracle/TestCreate/edge_nested.exp.json | 2 ++ testdata/d2oracle/TestCreate/edge_scope.exp.json | 2 ++ .../d2oracle/TestCreate/edge_scope_flat.exp.json | 2 ++ .../d2oracle/TestCreate/edge_scope_nested.exp.json | 2 ++ testdata/d2oracle/TestCreate/edge_unique.exp.json | 8 ++++++++ testdata/d2oracle/TestDelete/children.exp.json | 2 ++ .../TestDelete/children_edge_conflicts.exp.json | 2 ++ .../children_edges_flat_conflicts.exp.json | 4 ++++ .../children_multiple_conflicts.exp.json | 2 ++ .../d2oracle/TestDelete/children_scope.exp.json | 2 ++ .../TestDelete/edge_both_identical_childs.exp.json | 2 ++ testdata/d2oracle/TestDelete/edge_common.exp.json | 2 ++ .../d2oracle/TestDelete/edge_common_2.exp.json | 2 ++ .../d2oracle/TestDelete/edge_conflict.exp.json | 2 ++ .../d2oracle/TestDelete/edge_decrement.exp.json | 8 ++++++++ testdata/d2oracle/TestDelete/edge_first.exp.json | 4 ++++ .../TestDelete/edge_identical_child.exp.json | 2 ++ .../d2oracle/TestDelete/edge_key_style.exp.json | 2 ++ testdata/d2oracle/TestDelete/edge_last.exp.json | 6 ++++++ .../d2oracle/TestDelete/edge_map_style.exp.json | 2 ++ testdata/d2oracle/TestDelete/edge_middle.exp.json | 6 ++++++ .../d2oracle/TestDelete/flat_reserved.exp.json | 2 ++ .../TestDelete/hoist_edge_children.exp.json | 2 ++ .../TestDelete/nested_edge_key_style.exp.json | 2 ++ testdata/d2oracle/TestDelete/node_in_edge.exp.json | 4 ++++ .../d2oracle/TestDelete/node_in_edge_last.exp.json | 6 ++++++ .../TestDelete/only_delete_edge_reserved.exp.json | 2 ++ .../TestDelete/only_delete_obj_reserved.exp.json | 2 ++ testdata/d2oracle/TestDelete/order_1.exp.json | 2 ++ testdata/d2oracle/TestDelete/order_5.exp.json | 4 ++++ .../d2oracle/TestDelete/shape_sql_table.exp.json | 2 ++ .../d2oracle/TestDelete/underscore_remove.exp.json | 4 ++++ .../TestMove/chain_connected_nested.exp.json | 4 ++++ ...chain_connected_nested_no_extra_create.exp.json | 4 ++++ .../d2oracle/TestMove/connected_nested.exp.json | 2 ++ .../TestMove/edge_across_containers.exp.json | 2 ++ testdata/d2oracle/TestMove/edge_basic.exp.json | 2 ++ .../d2oracle/TestMove/edge_chain_basic.exp.json | 4 ++++ .../d2oracle/TestMove/edge_chain_circular.exp.json | 4 ++++ .../TestMove/edge_chain_into_container.exp.json | 4 ++++ .../TestMove/edge_chain_out_container.exp.json | 4 ++++ testdata/d2oracle/TestMove/edge_conflict.exp.json | 2 ++ .../d2oracle/TestMove/edge_into_container.exp.json | 2 ++ .../d2oracle/TestMove/edge_nested_basic.exp.json | 2 ++ .../TestMove/edge_out_of_container.exp.json | 2 ++ .../d2oracle/TestMove/full_edge_slice.exp.json | 4 ++++ testdata/d2oracle/TestMove/gnarly_1.exp.json | 6 ++++++ .../d2oracle/TestMove/move_out_of_edge.exp.json | 2 ++ .../TestMove/move_out_of_nested_edge.exp.json | 2 ++ testdata/d2oracle/TestMove/nhooyr_two.exp.json | 2 ++ testdata/d2oracle/TestMove/parentheses.exp.json | 2 ++ .../d2oracle/TestMove/partial_edge_slice.exp.json | 2 ++ .../TestMove/underscore_edge_children.exp.json | 2 ++ .../TestMove/underscore_edge_container_1.exp.json | 2 ++ .../TestMove/underscore_edge_container_2.exp.json | 2 ++ .../TestMove/underscore_edge_container_3.exp.json | 2 ++ .../TestMove/underscore_edge_container_4.exp.json | 2 ++ .../TestMove/underscore_edge_container_5.exp.json | 2 ++ .../TestMove/underscore_edge_split.exp.json | 2 ++ .../TestMove/unique_name_with_references.exp.json | 2 ++ testdata/d2oracle/TestRename/arrows.exp.json | 2 ++ testdata/d2oracle/TestRename/arrows_chain.exp.json | 6 ++++++ .../d2oracle/TestRename/arrows_complex.exp.json | 2 ++ .../TestRename/arrows_trim_common.exp.json | 6 ++++++ .../TestRename/arrows_trim_common_2.exp.json | 6 ++++++ .../d2oracle/TestRename/complex_edge_1.exp.json | 2 ++ .../d2oracle/TestRename/complex_edge_2.exp.json | 2 ++ testdata/d2oracle/TestRename/container.exp.json | 14 ++++++++++++++ testdata/d2oracle/TestRename/edges.exp.json | 12 ++++++++++++ testdata/d2oracle/TestSet/edge.exp.json | 2 ++ .../d2oracle/TestSet/edge_append_style.exp.json | 2 ++ testdata/d2oracle/TestSet/edge_chain.exp.json | 4 ++++ .../TestSet/edge_chain_append_style.exp.json | 4 ++++ .../TestSet/edge_chain_existing_style.exp.json | 4 ++++ .../TestSet/edge_chain_nested_set.exp.json | 4 ++++ testdata/d2oracle/TestSet/edge_index_case.exp.json | 4 ++++ .../d2oracle/TestSet/edge_index_nested.exp.json | 2 ++ .../d2oracle/TestSet/edge_key_and_key.exp.json | 2 ++ testdata/d2oracle/TestSet/edge_label.exp.json | 2 ++ .../d2oracle/TestSet/edge_merge_style.exp.json | 2 ++ .../TestSet/edge_nested_label_set.exp.json | 2 ++ .../TestSet/edge_nested_style_set.exp.json | 2 ++ testdata/d2oracle/TestSet/label_primary.exp.json | 2 ++ testdata/d2oracle/TestSet/map_key_missing.exp.json | 2 ++ testdata/d2oracle/TestSet/nested_alex.exp.json | 2 ++ 120 files changed, 348 insertions(+), 4 deletions(-) diff --git a/d2compiler/compile.go b/d2compiler/compile.go index 895b86d75..506f765f9 100644 --- a/d2compiler/compile.go +++ b/d2compiler/compile.go @@ -682,10 +682,9 @@ func (c *compiler) compileSQLTable(obj *d2graph.Object) { if srcID == absID { // Frontend isn't aware of container IDs. d2Col.Reference = strings.TrimPrefix(dstID, parentID+".") - relSrc := strings.TrimPrefix(absID, parentID+".") - e.Attributes.Label.Value = fmt.Sprintf("%s %s %s", relSrc, e.ArrowString(), d2Col.Reference) - // removeContainer() will adjust the edge to point to the table and not inside. - break + e.FromTableRowIndex = len(obj.SQLTable.Columns) + } else { + e.ToTableRowIndex = len(obj.SQLTable.Columns) } } @@ -746,6 +745,8 @@ func flattenContainer(g *d2graph.Graph, obj *d2graph.Object) { newEdge, _ = g.Root.Connect(e.Src.AbsIDArray(), obj.AbsIDArray(), e.SrcArrow, e.DstArrow, e.Attributes.Label.Value) } // TODO more attributes + newEdge.FromTableRowIndex = e.FromTableRowIndex + newEdge.ToTableRowIndex = e.ToTableRowIndex newEdge.Attributes.Label = e.Attributes.Label newEdge.References = e.References } diff --git a/d2graph/d2graph.go b/d2graph/d2graph.go index aef91878f..f1165730e 100644 --- a/d2graph/d2graph.go +++ b/d2graph/d2graph.go @@ -607,6 +607,9 @@ type Edge struct { MinWidth int `json:"minWidth"` MinHeight int `json:"minHeight"` + FromTableRowIndex int `json:"fromTableRowIndex"` + ToTableRowIndex int `json:"toTableRowIndex"` + LabelDimensions d2target.TextDimensions `json:"label_dimensions"` LabelPosition *string `json:"labelPosition,omitempty"` LabelPercentage *float64 `json:"labelPercentage,omitempty"` diff --git a/testdata/d2compiler/TestCompile/edge.exp.json b/testdata/d2compiler/TestCompile/edge.exp.json index 9ca4f6511..124e16991 100644 --- a/testdata/d2compiler/TestCompile/edge.exp.json +++ b/testdata/d2compiler/TestCompile/edge.exp.json @@ -74,6 +74,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json b/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json index 3110298fc..3d094b9d3 100644 --- a/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json +++ b/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json @@ -253,6 +253,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/edge_chain.exp.json b/testdata/d2compiler/TestCompile/edge_chain.exp.json index fad3904ac..f64d999d9 100644 --- a/testdata/d2compiler/TestCompile/edge_chain.exp.json +++ b/testdata/d2compiler/TestCompile/edge_chain.exp.json @@ -121,6 +121,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -148,6 +150,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/edge_chain_map.exp.json b/testdata/d2compiler/TestCompile/edge_chain_map.exp.json index df003d462..d065ea860 100644 --- a/testdata/d2compiler/TestCompile/edge_chain_map.exp.json +++ b/testdata/d2compiler/TestCompile/edge_chain_map.exp.json @@ -150,6 +150,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -177,6 +179,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json b/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json index 47a51ab19..0bac4d0e8 100644 --- a/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json +++ b/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json @@ -119,6 +119,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json index 5655158a5..009e8e42d 100644 --- a/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json @@ -162,6 +162,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json index cb91401f8..7928b9a1d 100644 --- a/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json @@ -130,6 +130,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/edge_index.exp.json b/testdata/d2compiler/TestCompile/edge_index.exp.json index 4ac3a630e..e166f550f 100644 --- a/testdata/d2compiler/TestCompile/edge_index.exp.json +++ b/testdata/d2compiler/TestCompile/edge_index.exp.json @@ -145,6 +145,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/edge_index_map.exp.json b/testdata/d2compiler/TestCompile/edge_index_map.exp.json index 35a310c17..dcb1cd57c 100644 --- a/testdata/d2compiler/TestCompile/edge_index_map.exp.json +++ b/testdata/d2compiler/TestCompile/edge_index_map.exp.json @@ -164,6 +164,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/edge_index_nested.exp.json b/testdata/d2compiler/TestCompile/edge_index_nested.exp.json index b27801d49..8404305e7 100644 --- a/testdata/d2compiler/TestCompile/edge_index_nested.exp.json +++ b/testdata/d2compiler/TestCompile/edge_index_nested.exp.json @@ -174,6 +174,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json b/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json index 87518a63e..82dbf0c11 100644 --- a/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json +++ b/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json @@ -190,6 +190,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.exp.json b/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.exp.json index 169522086..a1717f2ad 100644 --- a/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.exp.json +++ b/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.exp.json @@ -203,6 +203,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.exp.json b/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.exp.json index 6db8f6429..4da868821 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 @@ -209,6 +209,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.exp.json b/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.exp.json index c85eccedc..e11003972 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 @@ -222,6 +222,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.exp.json b/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.exp.json index f689762ad..132968412 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 @@ -240,6 +240,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/edge_label_map.exp.json b/testdata/d2compiler/TestCompile/edge_label_map.exp.json index e91142b98..3e8a6b6ba 100644 --- a/testdata/d2compiler/TestCompile/edge_label_map.exp.json +++ b/testdata/d2compiler/TestCompile/edge_label_map.exp.json @@ -130,6 +130,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/edge_map.exp.json b/testdata/d2compiler/TestCompile/edge_map.exp.json index e1d436a20..bfb703665 100644 --- a/testdata/d2compiler/TestCompile/edge_map.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map.exp.json @@ -113,6 +113,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json index 9abaa0abc..90abaad35 100644 --- a/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json @@ -142,6 +142,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json b/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json index 77788e717..ed7c148d5 100644 --- a/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json @@ -158,6 +158,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json b/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json index 67b44e188..85ea1c5df 100644 --- a/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json @@ -176,6 +176,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/edge_map_nested.exp.json b/testdata/d2compiler/TestCompile/edge_map_nested.exp.json index 44d73ca4d..cf697dee2 100644 --- a/testdata/d2compiler/TestCompile/edge_map_nested.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_nested.exp.json @@ -138,6 +138,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json b/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json index 18161ea9f..8e32b92a4 100644 --- a/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json @@ -120,6 +120,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json index 40af4edf1..3e4570240 100644 --- a/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json @@ -230,6 +230,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json index 0298cbd45..216975d17 100644 --- a/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json @@ -124,6 +124,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json index d55583d16..41f697c38 100644 --- a/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json @@ -180,6 +180,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/underscore_edge.exp.json b/testdata/d2compiler/TestCompile/underscore_edge.exp.json index eb8834c51..6ed409295 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge.exp.json @@ -125,6 +125,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json index 6d20bf30c..288c99817 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json @@ -184,6 +184,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -211,6 +213,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json index cdbb0e417..57572fb70 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json @@ -191,6 +191,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -218,6 +220,8 @@ "index": 1, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json index 9dc877365..ddab4d207 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json @@ -196,6 +196,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json index f69c79872..14ecfbd7f 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json @@ -165,6 +165,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestCreate/container_edge.exp.json b/testdata/d2oracle/TestCreate/container_edge.exp.json index 39697a995..bf06c85fc 100644 --- a/testdata/d2oracle/TestCreate/container_edge.exp.json +++ b/testdata/d2oracle/TestCreate/container_edge.exp.json @@ -103,6 +103,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestCreate/container_edge_label.exp.json b/testdata/d2oracle/TestCreate/container_edge_label.exp.json index 4804a6f1e..29ad7eef0 100644 --- a/testdata/d2oracle/TestCreate/container_edge_label.exp.json +++ b/testdata/d2oracle/TestCreate/container_edge_label.exp.json @@ -113,6 +113,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestCreate/edge.exp.json b/testdata/d2oracle/TestCreate/edge.exp.json index 9b2014c1e..fc60bae77 100644 --- a/testdata/d2oracle/TestCreate/edge.exp.json +++ b/testdata/d2oracle/TestCreate/edge.exp.json @@ -74,6 +74,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestCreate/edge_nested.exp.json b/testdata/d2oracle/TestCreate/edge_nested.exp.json index 149603016..1f464b526 100644 --- a/testdata/d2oracle/TestCreate/edge_nested.exp.json +++ b/testdata/d2oracle/TestCreate/edge_nested.exp.json @@ -90,6 +90,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestCreate/edge_scope.exp.json b/testdata/d2oracle/TestCreate/edge_scope.exp.json index ea6ae05e1..8e7821de1 100644 --- a/testdata/d2oracle/TestCreate/edge_scope.exp.json +++ b/testdata/d2oracle/TestCreate/edge_scope.exp.json @@ -103,6 +103,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json b/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json index dc5658e40..6a3e4d579 100644 --- a/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json +++ b/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json @@ -103,6 +103,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json b/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json index ea215f9ed..b7af67bb8 100644 --- a/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json +++ b/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json @@ -114,6 +114,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestCreate/edge_unique.exp.json b/testdata/d2oracle/TestCreate/edge_unique.exp.json index 64946f4f7..97da8095e 100644 --- a/testdata/d2oracle/TestCreate/edge_unique.exp.json +++ b/testdata/d2oracle/TestCreate/edge_unique.exp.json @@ -260,6 +260,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -287,6 +289,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -314,6 +318,8 @@ "index": 1, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -341,6 +347,8 @@ "index": 2, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestDelete/children.exp.json b/testdata/d2oracle/TestDelete/children.exp.json index f0cfc7ed9..fc9a1b920 100644 --- a/testdata/d2oracle/TestDelete/children.exp.json +++ b/testdata/d2oracle/TestDelete/children.exp.json @@ -97,6 +97,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json index 23512a8fa..31ce9deed 100644 --- a/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json @@ -130,6 +130,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json index 87432da31..a525711d8 100644 --- a/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json @@ -223,6 +223,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -250,6 +252,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json index 7843427b7..24ceb61d5 100644 --- a/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json @@ -199,6 +199,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestDelete/children_scope.exp.json b/testdata/d2oracle/TestDelete/children_scope.exp.json index 13095ab3f..dc2091ab8 100644 --- a/testdata/d2oracle/TestDelete/children_scope.exp.json +++ b/testdata/d2oracle/TestDelete/children_scope.exp.json @@ -137,6 +137,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json b/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json index be9e9d472..54a921a7c 100644 --- a/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json +++ b/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json @@ -107,6 +107,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestDelete/edge_common.exp.json b/testdata/d2oracle/TestDelete/edge_common.exp.json index 99941b391..925d313c9 100644 --- a/testdata/d2oracle/TestDelete/edge_common.exp.json +++ b/testdata/d2oracle/TestDelete/edge_common.exp.json @@ -74,6 +74,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestDelete/edge_common_2.exp.json b/testdata/d2oracle/TestDelete/edge_common_2.exp.json index 08de68293..fb9787232 100644 --- a/testdata/d2oracle/TestDelete/edge_common_2.exp.json +++ b/testdata/d2oracle/TestDelete/edge_common_2.exp.json @@ -74,6 +74,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestDelete/edge_conflict.exp.json b/testdata/d2oracle/TestDelete/edge_conflict.exp.json index 7a272710b..cfcd34319 100644 --- a/testdata/d2oracle/TestDelete/edge_conflict.exp.json +++ b/testdata/d2oracle/TestDelete/edge_conflict.exp.json @@ -119,6 +119,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestDelete/edge_decrement.exp.json b/testdata/d2oracle/TestDelete/edge_decrement.exp.json index d1d9ef1ec..959b0037a 100644 --- a/testdata/d2oracle/TestDelete/edge_decrement.exp.json +++ b/testdata/d2oracle/TestDelete/edge_decrement.exp.json @@ -456,6 +456,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -486,6 +488,8 @@ "index": 1, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -516,6 +520,8 @@ "index": 2, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -546,6 +552,8 @@ "index": 3, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestDelete/edge_first.exp.json b/testdata/d2oracle/TestDelete/edge_first.exp.json index 53f981334..f0f488b58 100644 --- a/testdata/d2oracle/TestDelete/edge_first.exp.json +++ b/testdata/d2oracle/TestDelete/edge_first.exp.json @@ -185,6 +185,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -212,6 +214,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestDelete/edge_identical_child.exp.json b/testdata/d2oracle/TestDelete/edge_identical_child.exp.json index 7cacbe9bb..64696bc89 100644 --- a/testdata/d2oracle/TestDelete/edge_identical_child.exp.json +++ b/testdata/d2oracle/TestDelete/edge_identical_child.exp.json @@ -107,6 +107,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestDelete/edge_key_style.exp.json b/testdata/d2oracle/TestDelete/edge_key_style.exp.json index 4f1b062c7..4198c6047 100644 --- a/testdata/d2oracle/TestDelete/edge_key_style.exp.json +++ b/testdata/d2oracle/TestDelete/edge_key_style.exp.json @@ -74,6 +74,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestDelete/edge_last.exp.json b/testdata/d2oracle/TestDelete/edge_last.exp.json index 33cd89cd6..d8c091987 100644 --- a/testdata/d2oracle/TestDelete/edge_last.exp.json +++ b/testdata/d2oracle/TestDelete/edge_last.exp.json @@ -222,6 +222,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -249,6 +251,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -276,6 +280,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestDelete/edge_map_style.exp.json b/testdata/d2oracle/TestDelete/edge_map_style.exp.json index 9192eebd7..f53be47d0 100644 --- a/testdata/d2oracle/TestDelete/edge_map_style.exp.json +++ b/testdata/d2oracle/TestDelete/edge_map_style.exp.json @@ -74,6 +74,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestDelete/edge_middle.exp.json b/testdata/d2oracle/TestDelete/edge_middle.exp.json index ddb63fae2..b0d8a0883 100644 --- a/testdata/d2oracle/TestDelete/edge_middle.exp.json +++ b/testdata/d2oracle/TestDelete/edge_middle.exp.json @@ -208,6 +208,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -235,6 +237,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -262,6 +266,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestDelete/flat_reserved.exp.json b/testdata/d2oracle/TestDelete/flat_reserved.exp.json index d88534289..3fc782f09 100644 --- a/testdata/d2oracle/TestDelete/flat_reserved.exp.json +++ b/testdata/d2oracle/TestDelete/flat_reserved.exp.json @@ -74,6 +74,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json b/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json index 76fbfc09c..cdc15ffc0 100644 --- a/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json +++ b/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json @@ -97,6 +97,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json b/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json index 81d77418a..5031509ac 100644 --- a/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json +++ b/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json @@ -103,6 +103,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestDelete/node_in_edge.exp.json b/testdata/d2oracle/TestDelete/node_in_edge.exp.json index 3052f799d..724743e33 100644 --- a/testdata/d2oracle/TestDelete/node_in_edge.exp.json +++ b/testdata/d2oracle/TestDelete/node_in_edge.exp.json @@ -172,6 +172,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -199,6 +201,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json b/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json index 45740d4b1..39b79da16 100644 --- a/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json +++ b/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json @@ -211,6 +211,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -238,6 +240,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -265,6 +269,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json b/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json index 30d5e1158..e20ab37f8 100644 --- a/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json +++ b/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json @@ -170,6 +170,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json b/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json index f46008172..49546f538 100644 --- a/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json +++ b/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json @@ -170,6 +170,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestDelete/order_1.exp.json b/testdata/d2oracle/TestDelete/order_1.exp.json index 7736e550d..14d3b3449 100644 --- a/testdata/d2oracle/TestDelete/order_1.exp.json +++ b/testdata/d2oracle/TestDelete/order_1.exp.json @@ -97,6 +97,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestDelete/order_5.exp.json b/testdata/d2oracle/TestDelete/order_5.exp.json index 54f05a0dc..286378b3e 100644 --- a/testdata/d2oracle/TestDelete/order_5.exp.json +++ b/testdata/d2oracle/TestDelete/order_5.exp.json @@ -149,6 +149,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -176,6 +178,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestDelete/shape_sql_table.exp.json b/testdata/d2oracle/TestDelete/shape_sql_table.exp.json index 9fdb4cb6c..54e268dda 100644 --- a/testdata/d2oracle/TestDelete/shape_sql_table.exp.json +++ b/testdata/d2oracle/TestDelete/shape_sql_table.exp.json @@ -271,6 +271,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestDelete/underscore_remove.exp.json b/testdata/d2oracle/TestDelete/underscore_remove.exp.json index 88abfd541..406c74572 100644 --- a/testdata/d2oracle/TestDelete/underscore_remove.exp.json +++ b/testdata/d2oracle/TestDelete/underscore_remove.exp.json @@ -143,6 +143,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -170,6 +172,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/chain_connected_nested.exp.json b/testdata/d2oracle/TestMove/chain_connected_nested.exp.json index 16aed2451..d9c93c103 100644 --- a/testdata/d2oracle/TestMove/chain_connected_nested.exp.json +++ b/testdata/d2oracle/TestMove/chain_connected_nested.exp.json @@ -134,6 +134,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -161,6 +163,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.exp.json b/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.exp.json index c97e6fdc1..c4c11a362 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 @@ -122,6 +122,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -149,6 +151,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/connected_nested.exp.json b/testdata/d2oracle/TestMove/connected_nested.exp.json index 030919340..23433b9a4 100644 --- a/testdata/d2oracle/TestMove/connected_nested.exp.json +++ b/testdata/d2oracle/TestMove/connected_nested.exp.json @@ -97,6 +97,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/edge_across_containers.exp.json b/testdata/d2oracle/TestMove/edge_across_containers.exp.json index e16514bda..49046296a 100644 --- a/testdata/d2oracle/TestMove/edge_across_containers.exp.json +++ b/testdata/d2oracle/TestMove/edge_across_containers.exp.json @@ -148,6 +148,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/edge_basic.exp.json b/testdata/d2oracle/TestMove/edge_basic.exp.json index b82200541..e84230c97 100644 --- a/testdata/d2oracle/TestMove/edge_basic.exp.json +++ b/testdata/d2oracle/TestMove/edge_basic.exp.json @@ -74,6 +74,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/edge_chain_basic.exp.json b/testdata/d2oracle/TestMove/edge_chain_basic.exp.json index fa6cea6af..aa2bcc9d4 100644 --- a/testdata/d2oracle/TestMove/edge_chain_basic.exp.json +++ b/testdata/d2oracle/TestMove/edge_chain_basic.exp.json @@ -111,6 +111,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -138,6 +140,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/edge_chain_circular.exp.json b/testdata/d2oracle/TestMove/edge_chain_circular.exp.json index f190d1a29..f1b9b0a26 100644 --- a/testdata/d2oracle/TestMove/edge_chain_circular.exp.json +++ b/testdata/d2oracle/TestMove/edge_chain_circular.exp.json @@ -162,6 +162,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -189,6 +191,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json b/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json index a1227cd4b..375b91a64 100644 --- a/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json +++ b/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json @@ -145,6 +145,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -172,6 +174,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json b/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json index c4f8fe4ab..28aba03a7 100644 --- a/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json +++ b/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json @@ -162,6 +162,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -189,6 +191,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/edge_conflict.exp.json b/testdata/d2oracle/TestMove/edge_conflict.exp.json index 517ea0676..140ab2968 100644 --- a/testdata/d2oracle/TestMove/edge_conflict.exp.json +++ b/testdata/d2oracle/TestMove/edge_conflict.exp.json @@ -148,6 +148,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/edge_into_container.exp.json b/testdata/d2oracle/TestMove/edge_into_container.exp.json index f2ab40dd1..181af1439 100644 --- a/testdata/d2oracle/TestMove/edge_into_container.exp.json +++ b/testdata/d2oracle/TestMove/edge_into_container.exp.json @@ -137,6 +137,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/edge_nested_basic.exp.json b/testdata/d2oracle/TestMove/edge_nested_basic.exp.json index f2658dc1a..568dbebfb 100644 --- a/testdata/d2oracle/TestMove/edge_nested_basic.exp.json +++ b/testdata/d2oracle/TestMove/edge_nested_basic.exp.json @@ -103,6 +103,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/edge_out_of_container.exp.json b/testdata/d2oracle/TestMove/edge_out_of_container.exp.json index 13f4ebe2a..67b45ed26 100644 --- a/testdata/d2oracle/TestMove/edge_out_of_container.exp.json +++ b/testdata/d2oracle/TestMove/edge_out_of_container.exp.json @@ -114,6 +114,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/full_edge_slice.exp.json b/testdata/d2oracle/TestMove/full_edge_slice.exp.json index 0d5875894..f25008ec8 100644 --- a/testdata/d2oracle/TestMove/full_edge_slice.exp.json +++ b/testdata/d2oracle/TestMove/full_edge_slice.exp.json @@ -217,6 +217,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -244,6 +246,8 @@ "index": 1, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/gnarly_1.exp.json b/testdata/d2oracle/TestMove/gnarly_1.exp.json index dc97d0024..a6b80bf4d 100644 --- a/testdata/d2oracle/TestMove/gnarly_1.exp.json +++ b/testdata/d2oracle/TestMove/gnarly_1.exp.json @@ -361,6 +361,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -388,6 +390,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -415,6 +419,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/move_out_of_edge.exp.json b/testdata/d2oracle/TestMove/move_out_of_edge.exp.json index a74d2c5cd..a94526ac5 100644 --- a/testdata/d2oracle/TestMove/move_out_of_edge.exp.json +++ b/testdata/d2oracle/TestMove/move_out_of_edge.exp.json @@ -130,6 +130,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/move_out_of_nested_edge.exp.json b/testdata/d2oracle/TestMove/move_out_of_nested_edge.exp.json index 593084ee0..ed99f0a61 100644 --- a/testdata/d2oracle/TestMove/move_out_of_nested_edge.exp.json +++ b/testdata/d2oracle/TestMove/move_out_of_nested_edge.exp.json @@ -170,6 +170,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/nhooyr_two.exp.json b/testdata/d2oracle/TestMove/nhooyr_two.exp.json index 326f0c5d7..2f0420e17 100644 --- a/testdata/d2oracle/TestMove/nhooyr_two.exp.json +++ b/testdata/d2oracle/TestMove/nhooyr_two.exp.json @@ -178,6 +178,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/parentheses.exp.json b/testdata/d2oracle/TestMove/parentheses.exp.json index 81e26df25..8a3002281 100644 --- a/testdata/d2oracle/TestMove/parentheses.exp.json +++ b/testdata/d2oracle/TestMove/parentheses.exp.json @@ -113,6 +113,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/partial_edge_slice.exp.json b/testdata/d2oracle/TestMove/partial_edge_slice.exp.json index d4f638277..8856c1d3d 100644 --- a/testdata/d2oracle/TestMove/partial_edge_slice.exp.json +++ b/testdata/d2oracle/TestMove/partial_edge_slice.exp.json @@ -120,6 +120,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/underscore_edge_children.exp.json b/testdata/d2oracle/TestMove/underscore_edge_children.exp.json index c25fc70ca..d1883d2e0 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_children.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_children.exp.json @@ -137,6 +137,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json index 1177bff53..3a80fc825 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json @@ -103,6 +103,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json index aef075e64..67f4256e2 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json @@ -114,6 +114,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json index 01d482296..719a51f26 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json @@ -114,6 +114,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json index ac60f92d9..18bc1bb71 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json @@ -103,6 +103,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json index 6aa8777c1..dbe464ab5 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json @@ -136,6 +136,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/underscore_edge_split.exp.json b/testdata/d2oracle/TestMove/underscore_edge_split.exp.json index 6f2f331e9..0c69b2044 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_split.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_split.exp.json @@ -166,6 +166,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/unique_name_with_references.exp.json b/testdata/d2oracle/TestMove/unique_name_with_references.exp.json index 60bf00ba9..53671a1e7 100644 --- a/testdata/d2oracle/TestMove/unique_name_with_references.exp.json +++ b/testdata/d2oracle/TestMove/unique_name_with_references.exp.json @@ -183,6 +183,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestRename/arrows.exp.json b/testdata/d2oracle/TestRename/arrows.exp.json index e83ff7555..0059a0ee0 100644 --- a/testdata/d2oracle/TestRename/arrows.exp.json +++ b/testdata/d2oracle/TestRename/arrows.exp.json @@ -74,6 +74,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestRename/arrows_chain.exp.json b/testdata/d2oracle/TestRename/arrows_chain.exp.json index 7838e805c..d2f0c684f 100644 --- a/testdata/d2oracle/TestRename/arrows_chain.exp.json +++ b/testdata/d2oracle/TestRename/arrows_chain.exp.json @@ -148,6 +148,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -175,6 +177,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -202,6 +206,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestRename/arrows_complex.exp.json b/testdata/d2oracle/TestRename/arrows_complex.exp.json index 8cfc0614e..2c23df4e9 100644 --- a/testdata/d2oracle/TestRename/arrows_complex.exp.json +++ b/testdata/d2oracle/TestRename/arrows_complex.exp.json @@ -128,6 +128,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestRename/arrows_trim_common.exp.json b/testdata/d2oracle/TestRename/arrows_trim_common.exp.json index 385ac743d..370c2dbd7 100644 --- a/testdata/d2oracle/TestRename/arrows_trim_common.exp.json +++ b/testdata/d2oracle/TestRename/arrows_trim_common.exp.json @@ -164,6 +164,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -191,6 +193,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -218,6 +222,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json b/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json index a05533059..6c590ee96 100644 --- a/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json +++ b/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json @@ -214,6 +214,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -241,6 +243,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -268,6 +272,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestRename/complex_edge_1.exp.json b/testdata/d2oracle/TestRename/complex_edge_1.exp.json index 43127797e..e043fe96b 100644 --- a/testdata/d2oracle/TestRename/complex_edge_1.exp.json +++ b/testdata/d2oracle/TestRename/complex_edge_1.exp.json @@ -128,6 +128,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestRename/complex_edge_2.exp.json b/testdata/d2oracle/TestRename/complex_edge_2.exp.json index a7920769a..8d4b5bcbb 100644 --- a/testdata/d2oracle/TestRename/complex_edge_2.exp.json +++ b/testdata/d2oracle/TestRename/complex_edge_2.exp.json @@ -128,6 +128,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestRename/container.exp.json b/testdata/d2oracle/TestRename/container.exp.json index 2b263f935..dfc7368c1 100644 --- a/testdata/d2oracle/TestRename/container.exp.json +++ b/testdata/d2oracle/TestRename/container.exp.json @@ -753,6 +753,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -783,6 +785,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -810,6 +814,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -837,6 +843,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -864,6 +872,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -891,6 +901,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -918,6 +930,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestRename/edges.exp.json b/testdata/d2oracle/TestRename/edges.exp.json index a67dce07d..05332edac 100644 --- a/testdata/d2oracle/TestRename/edges.exp.json +++ b/testdata/d2oracle/TestRename/edges.exp.json @@ -418,6 +418,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -445,6 +447,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -472,6 +476,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -499,6 +505,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -526,6 +534,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -553,6 +563,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestSet/edge.exp.json b/testdata/d2oracle/TestSet/edge.exp.json index 507949965..84eaa0647 100644 --- a/testdata/d2oracle/TestSet/edge.exp.json +++ b/testdata/d2oracle/TestSet/edge.exp.json @@ -84,6 +84,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestSet/edge_append_style.exp.json b/testdata/d2oracle/TestSet/edge_append_style.exp.json index 8f0021f3f..5149efba5 100644 --- a/testdata/d2oracle/TestSet/edge_append_style.exp.json +++ b/testdata/d2oracle/TestSet/edge_append_style.exp.json @@ -119,6 +119,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestSet/edge_chain.exp.json b/testdata/d2oracle/TestSet/edge_chain.exp.json index a4a3367d0..197fd7e8f 100644 --- a/testdata/d2oracle/TestSet/edge_chain.exp.json +++ b/testdata/d2oracle/TestSet/edge_chain.exp.json @@ -211,6 +211,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -241,6 +243,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json b/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json index 9d923038f..5aec0843b 100644 --- a/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json +++ b/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json @@ -194,6 +194,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -228,6 +230,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json b/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json index 812c17710..b733a2aad 100644 --- a/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json +++ b/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json @@ -278,6 +278,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -305,6 +307,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json b/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json index 8e321df40..4788f201e 100644 --- a/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json +++ b/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json @@ -234,6 +234,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -268,6 +270,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestSet/edge_index_case.exp.json b/testdata/d2oracle/TestSet/edge_index_case.exp.json index 6ab4ab7cb..ed7457e4a 100644 --- a/testdata/d2oracle/TestSet/edge_index_case.exp.json +++ b/testdata/d2oracle/TestSet/edge_index_case.exp.json @@ -188,6 +188,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -215,6 +217,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestSet/edge_index_nested.exp.json b/testdata/d2oracle/TestSet/edge_index_nested.exp.json index 375636762..eee99c486 100644 --- a/testdata/d2oracle/TestSet/edge_index_nested.exp.json +++ b/testdata/d2oracle/TestSet/edge_index_nested.exp.json @@ -113,6 +113,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestSet/edge_key_and_key.exp.json b/testdata/d2oracle/TestSet/edge_key_and_key.exp.json index 421bb7d40..c2429d831 100644 --- a/testdata/d2oracle/TestSet/edge_key_and_key.exp.json +++ b/testdata/d2oracle/TestSet/edge_key_and_key.exp.json @@ -164,6 +164,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestSet/edge_label.exp.json b/testdata/d2oracle/TestSet/edge_label.exp.json index 1f228e913..84ca3dd12 100644 --- a/testdata/d2oracle/TestSet/edge_label.exp.json +++ b/testdata/d2oracle/TestSet/edge_label.exp.json @@ -129,6 +129,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestSet/edge_merge_style.exp.json b/testdata/d2oracle/TestSet/edge_merge_style.exp.json index 121ce1019..02875c753 100644 --- a/testdata/d2oracle/TestSet/edge_merge_style.exp.json +++ b/testdata/d2oracle/TestSet/edge_merge_style.exp.json @@ -166,6 +166,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json b/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json index 5d36f0f28..f90a08042 100644 --- a/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json +++ b/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json @@ -113,6 +113,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json b/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json index 0b5d5025b..ea3e1858e 100644 --- a/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json +++ b/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json @@ -159,6 +159,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestSet/label_primary.exp.json b/testdata/d2oracle/TestSet/label_primary.exp.json index 719f76e71..fd5dae0fa 100644 --- a/testdata/d2oracle/TestSet/label_primary.exp.json +++ b/testdata/d2oracle/TestSet/label_primary.exp.json @@ -109,6 +109,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestSet/map_key_missing.exp.json b/testdata/d2oracle/TestSet/map_key_missing.exp.json index 9253e09f0..6cb4cafa7 100644 --- a/testdata/d2oracle/TestSet/map_key_missing.exp.json +++ b/testdata/d2oracle/TestSet/map_key_missing.exp.json @@ -107,6 +107,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestSet/nested_alex.exp.json b/testdata/d2oracle/TestSet/nested_alex.exp.json index 29e099bda..e69c81902 100644 --- a/testdata/d2oracle/TestSet/nested_alex.exp.json +++ b/testdata/d2oracle/TestSet/nested_alex.exp.json @@ -179,6 +179,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0