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 1/8] 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 From 07bd4cca50b1f05db2f26ce38f5ddbe12c880973 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BAlio=20C=C3=A9sar=20Batista?= Date: Wed, 16 Nov 2022 11:51:55 -0300 Subject: [PATCH 2/8] Rename rows to columns and omit empty indices --- d2compiler/compile.go | 15 +++++++++------ d2graph/d2graph.go | 4 ++-- e2etests/stable_test.go | 38 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 49 insertions(+), 8 deletions(-) diff --git a/d2compiler/compile.go b/d2compiler/compile.go index 506f765f9..570a12908 100644 --- a/d2compiler/compile.go +++ b/d2compiler/compile.go @@ -680,11 +680,12 @@ func (c *compiler) compileSQLTable(obj *d2graph.Object) { continue } if srcID == absID { - // Frontend isn't aware of container IDs. d2Col.Reference = strings.TrimPrefix(dstID, parentID+".") - e.FromTableRowIndex = len(obj.SQLTable.Columns) - } else { - e.ToTableRowIndex = len(obj.SQLTable.Columns) + e.FromTableColumnIndex = new(int) + *e.FromTableColumnIndex = len(obj.SQLTable.Columns) + } else if dstID == absID { + e.ToTableColumnIndex = new(int) + *e.ToTableColumnIndex = len(obj.SQLTable.Columns) } } @@ -745,8 +746,10 @@ 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.FromTableColumnIndex = new(int) + *newEdge.FromTableColumnIndex = *e.FromTableColumnIndex + newEdge.ToTableColumnIndex = new(int) + *newEdge.ToTableColumnIndex = *e.ToTableColumnIndex newEdge.Attributes.Label = e.Attributes.Label newEdge.References = e.References } diff --git a/d2graph/d2graph.go b/d2graph/d2graph.go index f1165730e..170aad88d 100644 --- a/d2graph/d2graph.go +++ b/d2graph/d2graph.go @@ -607,8 +607,8 @@ type Edge struct { MinWidth int `json:"minWidth"` MinHeight int `json:"minHeight"` - FromTableRowIndex int `json:"fromTableRowIndex"` - ToTableRowIndex int `json:"toTableRowIndex"` + FromTableColumnIndex *int `json:"fromTableColumnIndex,omitempty"` + ToTableColumnIndex *int `json:"toTableColumnIndex,omitempty"` LabelDimensions d2target.TextDimensions `json:"label_dimensions"` LabelPosition *string `json:"labelPosition,omitempty"` diff --git a/e2etests/stable_test.go b/e2etests/stable_test.go index c9a1a87fc..64d2403bb 100644 --- a/e2etests/stable_test.go +++ b/e2etests/stable_test.go @@ -831,6 +831,44 @@ a -> md -> b +setTimeout(seconds int) } `, + }, { + name: "sql_tables", + script: ` + users: { + shape: sql_table + id: int + name: string + email: string + password: string + last_login: datetime + } + + products: { + shape: sql_table + id: int + price: decimal + sku: string + name: string + } + + orders: { + shape: sql_table + id: int + user_id: int + product_id: int + } + + shipments: { + shape: sql_table + id: int + order_id: int + tracking_number: string + status: string + } + + users.id <-> orders.user_id + products.id <-> orders.product_id + shipments.order_id <-> orders.id`, }, } From 618d7f5edf82c073705839986119aab851bf6787 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BAlio=20C=C3=A9sar=20Batista?= Date: Wed, 16 Nov 2022 11:56:28 -0300 Subject: [PATCH 3/8] Update tests --- d2compiler/compile.go | 12 +- .../stable/sql_tables/dagre/board.exp.json | 396 ++++++++++++++++++ .../stable/sql_tables/dagre/sketch.exp.svg | 56 +++ .../stable/sql_tables/elk/board.exp.json | 385 +++++++++++++++++ .../stable/sql_tables/elk/sketch.exp.svg | 56 +++ testdata/d2compiler/TestCompile/edge.exp.json | 2 - .../edge_arrowhead_fields.exp.json | 2 - .../TestCompile/edge_chain.exp.json | 4 - .../TestCompile/edge_chain_map.exp.json | 4 - .../TestCompile/edge_exclusive_style.exp.json | 2 - .../TestCompile/edge_flat_arrowhead.exp.json | 2 - .../edge_flat_label_arrowhead.exp.json | 2 - .../TestCompile/edge_index.exp.json | 2 - .../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 - ..._key_group_flat_nested_underscore.exp.json | 2 - ..._group_map_flat_nested_underscore.exp.json | 2 - ...e_key_group_map_nested_underscore.exp.json | 2 - .../TestCompile/edge_label_map.exp.json | 2 - .../d2compiler/TestCompile/edge_map.exp.json | 2 - .../TestCompile/edge_map_arrowhead.exp.json | 2 - .../TestCompile/edge_map_group_flat.exp.json | 2 - .../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 - .../edge_non_shape_arrowhead.exp.json | 2 - .../edge_semiflat_arrowhead.exp.json | 2 - .../TestCompile/underscore_edge.exp.json | 2 - .../underscore_edge_chain.exp.json | 4 - .../underscore_edge_existing.exp.json | 4 - .../underscore_edge_index.exp.json | 2 - .../underscore_edge_nested.exp.json | 2 - .../TestCreate/container_edge.exp.json | 2 - .../TestCreate/container_edge_label.exp.json | 2 - testdata/d2oracle/TestCreate/edge.exp.json | 2 - .../d2oracle/TestCreate/edge_nested.exp.json | 2 - .../d2oracle/TestCreate/edge_scope.exp.json | 2 - .../TestCreate/edge_scope_flat.exp.json | 2 - .../TestCreate/edge_scope_nested.exp.json | 2 - .../d2oracle/TestCreate/edge_unique.exp.json | 8 - .../d2oracle/TestDelete/children.exp.json | 2 - .../children_edge_conflicts.exp.json | 2 - .../children_edges_flat_conflicts.exp.json | 4 - .../children_multiple_conflicts.exp.json | 2 - .../TestDelete/children_scope.exp.json | 2 - .../edge_both_identical_childs.exp.json | 2 - .../d2oracle/TestDelete/edge_common.exp.json | 2 - .../TestDelete/edge_common_2.exp.json | 2 - .../TestDelete/edge_conflict.exp.json | 2 - .../TestDelete/edge_decrement.exp.json | 8 - .../d2oracle/TestDelete/edge_first.exp.json | 4 - .../TestDelete/edge_identical_child.exp.json | 2 - .../TestDelete/edge_key_style.exp.json | 2 - .../d2oracle/TestDelete/edge_last.exp.json | 6 - .../TestDelete/edge_map_style.exp.json | 2 - .../d2oracle/TestDelete/edge_middle.exp.json | 6 - .../TestDelete/flat_reserved.exp.json | 2 - .../TestDelete/hoist_edge_children.exp.json | 2 - .../TestDelete/nested_edge_key_style.exp.json | 2 - .../d2oracle/TestDelete/node_in_edge.exp.json | 4 - .../TestDelete/node_in_edge_last.exp.json | 6 - .../only_delete_edge_reserved.exp.json | 2 - .../only_delete_obj_reserved.exp.json | 2 - testdata/d2oracle/TestDelete/order_1.exp.json | 2 - testdata/d2oracle/TestDelete/order_5.exp.json | 4 - .../TestDelete/shape_sql_table.exp.json | 2 - .../TestDelete/underscore_remove.exp.json | 4 - .../TestMove/chain_connected_nested.exp.json | 4 - ..._connected_nested_no_extra_create.exp.json | 4 - .../TestMove/connected_nested.exp.json | 2 - .../TestMove/edge_across_containers.exp.json | 2 - .../d2oracle/TestMove/edge_basic.exp.json | 2 - .../TestMove/edge_chain_basic.exp.json | 4 - .../TestMove/edge_chain_circular.exp.json | 4 - .../edge_chain_into_container.exp.json | 4 - .../edge_chain_out_container.exp.json | 4 - .../d2oracle/TestMove/edge_conflict.exp.json | 2 - .../TestMove/edge_into_container.exp.json | 2 - .../TestMove/edge_nested_basic.exp.json | 2 - .../TestMove/edge_out_of_container.exp.json | 2 - .../TestMove/full_edge_slice.exp.json | 4 - testdata/d2oracle/TestMove/gnarly_1.exp.json | 6 - .../TestMove/move_out_of_edge.exp.json | 2 - .../TestMove/move_out_of_nested_edge.exp.json | 2 - .../d2oracle/TestMove/nhooyr_two.exp.json | 2 - .../d2oracle/TestMove/parentheses.exp.json | 2 - .../TestMove/partial_edge_slice.exp.json | 2 - .../underscore_edge_children.exp.json | 2 - .../underscore_edge_container_1.exp.json | 2 - .../underscore_edge_container_2.exp.json | 2 - .../underscore_edge_container_3.exp.json | 2 - .../underscore_edge_container_4.exp.json | 2 - .../underscore_edge_container_5.exp.json | 2 - .../TestMove/underscore_edge_split.exp.json | 2 - .../unique_name_with_references.exp.json | 2 - testdata/d2oracle/TestRename/arrows.exp.json | 2 - .../d2oracle/TestRename/arrows_chain.exp.json | 6 - .../TestRename/arrows_complex.exp.json | 2 - .../TestRename/arrows_trim_common.exp.json | 6 - .../TestRename/arrows_trim_common_2.exp.json | 6 - .../TestRename/complex_edge_1.exp.json | 2 - .../TestRename/complex_edge_2.exp.json | 2 - .../d2oracle/TestRename/container.exp.json | 14 - testdata/d2oracle/TestRename/edges.exp.json | 12 - testdata/d2oracle/TestSet/edge.exp.json | 2 - .../TestSet/edge_append_style.exp.json | 2 - testdata/d2oracle/TestSet/edge_chain.exp.json | 4 - .../TestSet/edge_chain_append_style.exp.json | 4 - .../edge_chain_existing_style.exp.json | 4 - .../TestSet/edge_chain_nested_set.exp.json | 4 - .../d2oracle/TestSet/edge_index_case.exp.json | 4 - .../TestSet/edge_index_nested.exp.json | 2 - .../TestSet/edge_key_and_key.exp.json | 2 - testdata/d2oracle/TestSet/edge_label.exp.json | 2 - .../TestSet/edge_merge_style.exp.json | 2 - .../TestSet/edge_nested_label_set.exp.json | 2 - .../TestSet/edge_nested_style_set.exp.json | 2 - .../d2oracle/TestSet/label_primary.exp.json | 2 - .../d2oracle/TestSet/map_key_missing.exp.json | 2 - .../d2oracle/TestSet/nested_alex.exp.json | 2 - 123 files changed, 901 insertions(+), 344 deletions(-) create mode 100644 e2etests/testdata/stable/sql_tables/dagre/board.exp.json create mode 100644 e2etests/testdata/stable/sql_tables/dagre/sketch.exp.svg create mode 100644 e2etests/testdata/stable/sql_tables/elk/board.exp.json create mode 100644 e2etests/testdata/stable/sql_tables/elk/sketch.exp.svg diff --git a/d2compiler/compile.go b/d2compiler/compile.go index 570a12908..d2bd49d2e 100644 --- a/d2compiler/compile.go +++ b/d2compiler/compile.go @@ -746,10 +746,14 @@ 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.FromTableColumnIndex = new(int) - *newEdge.FromTableColumnIndex = *e.FromTableColumnIndex - newEdge.ToTableColumnIndex = new(int) - *newEdge.ToTableColumnIndex = *e.ToTableColumnIndex + if e.FromTableColumnIndex != nil { + newEdge.FromTableColumnIndex = new(int) + *newEdge.FromTableColumnIndex = *e.FromTableColumnIndex + } + if e.ToTableColumnIndex != nil { + newEdge.ToTableColumnIndex = new(int) + *newEdge.ToTableColumnIndex = *e.ToTableColumnIndex + } newEdge.Attributes.Label = e.Attributes.Label newEdge.References = e.References } diff --git a/e2etests/testdata/stable/sql_tables/dagre/board.exp.json b/e2etests/testdata/stable/sql_tables/dagre/board.exp.json new file mode 100644 index 000000000..da031d9b2 --- /dev/null +++ b/e2etests/testdata/stable/sql_tables/dagre/board.exp.json @@ -0,0 +1,396 @@ +{ + "name": "", + "shapes": [ + { + "id": "users", + "type": "sql_table", + "pos": { + "x": 0, + "y": 0 + }, + "width": 259, + "height": 216, + "level": 1, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#FFFFFF", + "stroke": "#0A0F25", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "fields": null, + "methods": null, + "columns": [ + { + "name": "id", + "type": "int", + "constraint": "", + "reference": "orders.user_id" + }, + { + "name": "name", + "type": "string", + "constraint": "", + "reference": "" + }, + { + "name": "email", + "type": "string", + "constraint": "", + "reference": "" + }, + { + "name": "password", + "type": "string", + "constraint": "", + "reference": "" + }, + { + "name": "last_login", + "type": "datetime", + "constraint": "", + "reference": "" + } + ], + "label": "users", + "fontSize": 20, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 61, + "labelHeight": 36 + }, + { + "id": "products", + "type": "sql_table", + "pos": { + "x": 319, + "y": 18 + }, + "width": 290, + "height": 180, + "level": 1, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#FFFFFF", + "stroke": "#0A0F25", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "fields": null, + "methods": null, + "columns": [ + { + "name": "id", + "type": "int", + "constraint": "", + "reference": "orders.product_id" + }, + { + "name": "price", + "type": "decimal", + "constraint": "", + "reference": "" + }, + { + "name": "sku", + "type": "string", + "constraint": "", + "reference": "" + }, + { + "name": "name", + "type": "string", + "constraint": "", + "reference": "" + } + ], + "label": "products", + "fontSize": 20, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 99, + "labelHeight": 36 + }, + { + "id": "orders", + "type": "sql_table", + "pos": { + "x": 357, + "y": 316 + }, + "width": 215, + "height": 144, + "level": 1, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#FFFFFF", + "stroke": "#0A0F25", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "fields": null, + "methods": null, + "columns": [ + { + "name": "id", + "type": "int", + "constraint": "", + "reference": "" + }, + { + "name": "user_id", + "type": "int", + "constraint": "", + "reference": "" + }, + { + "name": "product_id", + "type": "int", + "constraint": "", + "reference": "" + } + ], + "label": "orders", + "fontSize": 20, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 74, + "labelHeight": 36 + }, + { + "id": "shipments", + "type": "sql_table", + "pos": { + "x": 669, + "y": 18 + }, + "width": 293, + "height": 180, + "level": 1, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#FFFFFF", + "stroke": "#0A0F25", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "fields": null, + "methods": null, + "columns": [ + { + "name": "id", + "type": "int", + "constraint": "", + "reference": "" + }, + { + "name": "order_id", + "type": "int", + "constraint": "", + "reference": "orders.id" + }, + { + "name": "tracking_number", + "type": "string", + "constraint": "", + "reference": "" + }, + { + "name": "status", + "type": "string", + "constraint": "", + "reference": "" + } + ], + "label": "shipments", + "fontSize": 20, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 116, + "labelHeight": 36 + } + ], + "connections": [ + { + "id": "(users <-> orders)[0]", + "src": "users", + "srcArrow": "triangle", + "srcLabel": "", + "dst": "orders", + "dstArrow": "triangle", + "dstLabel": "", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "#0D32B2", + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 129.5, + "y": 216 + }, + { + "x": 129.5, + "y": 256 + }, + { + "x": 174.9, + "y": 282.55844544095663 + }, + { + "x": 356.5, + "y": 348.7922272047833 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null + }, + { + "id": "(products <-> orders)[0]", + "src": "products", + "srcArrow": "triangle", + "srcLabel": "", + "dst": "orders", + "dstArrow": "triangle", + "dstLabel": "", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "#0D32B2", + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 464, + "y": 198 + }, + { + "x": 464, + "y": 252.4 + }, + { + "x": 464, + "y": 276 + }, + { + "x": 464, + "y": 316 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null + }, + { + "id": "(shipments <-> orders)[0]", + "src": "shipments", + "srcArrow": "triangle", + "srcLabel": "", + "dst": "orders", + "dstArrow": "triangle", + "dstLabel": "", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "#0D32B2", + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 815.5, + "y": 198 + }, + { + "x": 815.5, + "y": 252.4 + }, + { + "x": 766.7, + "y": 283 + }, + { + "x": 571.5, + "y": 351 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null + } + ] +} diff --git a/e2etests/testdata/stable/sql_tables/dagre/sketch.exp.svg b/e2etests/testdata/stable/sql_tables/dagre/sketch.exp.svg new file mode 100644 index 000000000..065687658 --- /dev/null +++ b/e2etests/testdata/stable/sql_tables/dagre/sketch.exp.svg @@ -0,0 +1,56 @@ + +usersid +int +name +string +email +string +password +string +last_login +datetime +productsid +int +price +decimal +sku +string +name +string +ordersid +int +user_id +int +product_id +int +shipmentsid +int +order_id +int +tracking_number +string +status +string + \ No newline at end of file diff --git a/e2etests/testdata/stable/sql_tables/elk/board.exp.json b/e2etests/testdata/stable/sql_tables/elk/board.exp.json new file mode 100644 index 000000000..abc5d00bf --- /dev/null +++ b/e2etests/testdata/stable/sql_tables/elk/board.exp.json @@ -0,0 +1,385 @@ +{ + "name": "", + "shapes": [ + { + "id": "users", + "type": "sql_table", + "pos": { + "x": 46, + "y": 412 + }, + "width": 259, + "height": 216, + "level": 1, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#FFFFFF", + "stroke": "#0A0F25", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "fields": null, + "methods": null, + "columns": [ + { + "name": "id", + "type": "int", + "constraint": "", + "reference": "orders.user_id" + }, + { + "name": "name", + "type": "string", + "constraint": "", + "reference": "" + }, + { + "name": "email", + "type": "string", + "constraint": "", + "reference": "" + }, + { + "name": "password", + "type": "string", + "constraint": "", + "reference": "" + }, + { + "name": "last_login", + "type": "datetime", + "constraint": "", + "reference": "" + } + ], + "label": "users", + "fontSize": 20, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 61, + "labelHeight": 36 + }, + { + "id": "products", + "type": "sql_table", + "pos": { + "x": 15, + "y": 212 + }, + "width": 290, + "height": 180, + "level": 1, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#FFFFFF", + "stroke": "#0A0F25", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "fields": null, + "methods": null, + "columns": [ + { + "name": "id", + "type": "int", + "constraint": "", + "reference": "orders.product_id" + }, + { + "name": "price", + "type": "decimal", + "constraint": "", + "reference": "" + }, + { + "name": "sku", + "type": "string", + "constraint": "", + "reference": "" + }, + { + "name": "name", + "type": "string", + "constraint": "", + "reference": "" + } + ], + "label": "products", + "fontSize": 20, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 99, + "labelHeight": 36 + }, + { + "id": "orders", + "type": "sql_table", + "pos": { + "x": 405, + "y": 230 + }, + "width": 215, + "height": 144, + "level": 1, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#FFFFFF", + "stroke": "#0A0F25", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "fields": null, + "methods": null, + "columns": [ + { + "name": "id", + "type": "int", + "constraint": "", + "reference": "" + }, + { + "name": "user_id", + "type": "int", + "constraint": "", + "reference": "" + }, + { + "name": "product_id", + "type": "int", + "constraint": "", + "reference": "" + } + ], + "label": "orders", + "fontSize": 20, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 74, + "labelHeight": 36 + }, + { + "id": "shipments", + "type": "sql_table", + "pos": { + "x": 12, + "y": 12 + }, + "width": 293, + "height": 180, + "level": 1, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#FFFFFF", + "stroke": "#0A0F25", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "fields": null, + "methods": null, + "columns": [ + { + "name": "id", + "type": "int", + "constraint": "", + "reference": "" + }, + { + "name": "order_id", + "type": "int", + "constraint": "", + "reference": "orders.id" + }, + { + "name": "tracking_number", + "type": "string", + "constraint": "", + "reference": "" + }, + { + "name": "status", + "type": "string", + "constraint": "", + "reference": "" + } + ], + "label": "shipments", + "fontSize": 20, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 116, + "labelHeight": 36 + } + ], + "connections": [ + { + "id": "(users <-> orders)[0]", + "src": "users", + "srcArrow": "triangle", + "srcLabel": "", + "dst": "orders", + "dstArrow": "triangle", + "dstLabel": "", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "#0D32B2", + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 305, + "y": 520 + }, + { + "x": 355, + "y": 520 + }, + { + "x": 355, + "y": 338 + }, + { + "x": 405, + "y": 338 + } + ], + "animated": false, + "tooltip": "", + "icon": null + }, + { + "id": "(products <-> orders)[0]", + "src": "products", + "srcArrow": "triangle", + "srcLabel": "", + "dst": "orders", + "dstArrow": "triangle", + "dstLabel": "", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "#0D32B2", + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 305, + "y": 302 + }, + { + "x": 405, + "y": 302 + } + ], + "animated": false, + "tooltip": "", + "icon": null + }, + { + "id": "(shipments <-> orders)[0]", + "src": "shipments", + "srcArrow": "triangle", + "srcLabel": "", + "dst": "orders", + "dstArrow": "triangle", + "dstLabel": "", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "#0D32B2", + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 305, + "y": 102 + }, + { + "x": 355, + "y": 102 + }, + { + "x": 355, + "y": 266 + }, + { + "x": 405, + "y": 266 + } + ], + "animated": false, + "tooltip": "", + "icon": null + } + ] +} diff --git a/e2etests/testdata/stable/sql_tables/elk/sketch.exp.svg b/e2etests/testdata/stable/sql_tables/elk/sketch.exp.svg new file mode 100644 index 000000000..e20e68fe8 --- /dev/null +++ b/e2etests/testdata/stable/sql_tables/elk/sketch.exp.svg @@ -0,0 +1,56 @@ + +usersid +int +name +string +email +string +password +string +last_login +datetime +productsid +int +price +decimal +sku +string +name +string +ordersid +int +user_id +int +product_id +int +shipmentsid +int +order_id +int +tracking_number +string +status +string + \ No newline at end of file diff --git a/testdata/d2compiler/TestCompile/edge.exp.json b/testdata/d2compiler/TestCompile/edge.exp.json index 124e16991..9ca4f6511 100644 --- a/testdata/d2compiler/TestCompile/edge.exp.json +++ b/testdata/d2compiler/TestCompile/edge.exp.json @@ -74,8 +74,6 @@ "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 3d094b9d3..3110298fc 100644 --- a/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json +++ b/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json @@ -253,8 +253,6 @@ "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 f64d999d9..fad3904ac 100644 --- a/testdata/d2compiler/TestCompile/edge_chain.exp.json +++ b/testdata/d2compiler/TestCompile/edge_chain.exp.json @@ -121,8 +121,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -150,8 +148,6 @@ "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 d065ea860..df003d462 100644 --- a/testdata/d2compiler/TestCompile/edge_chain_map.exp.json +++ b/testdata/d2compiler/TestCompile/edge_chain_map.exp.json @@ -150,8 +150,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -179,8 +177,6 @@ "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 0bac4d0e8..47a51ab19 100644 --- a/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json +++ b/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json @@ -119,8 +119,6 @@ "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 009e8e42d..5655158a5 100644 --- a/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json @@ -162,8 +162,6 @@ "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 7928b9a1d..cb91401f8 100644 --- a/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json @@ -130,8 +130,6 @@ "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 e166f550f..4ac3a630e 100644 --- a/testdata/d2compiler/TestCompile/edge_index.exp.json +++ b/testdata/d2compiler/TestCompile/edge_index.exp.json @@ -145,8 +145,6 @@ "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 dcb1cd57c..35a310c17 100644 --- a/testdata/d2compiler/TestCompile/edge_index_map.exp.json +++ b/testdata/d2compiler/TestCompile/edge_index_map.exp.json @@ -164,8 +164,6 @@ "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 8404305e7..b27801d49 100644 --- a/testdata/d2compiler/TestCompile/edge_index_nested.exp.json +++ b/testdata/d2compiler/TestCompile/edge_index_nested.exp.json @@ -174,8 +174,6 @@ "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 82dbf0c11..87518a63e 100644 --- a/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json +++ b/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json @@ -190,8 +190,6 @@ "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 a1717f2ad..169522086 100644 --- a/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.exp.json +++ b/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.exp.json @@ -203,8 +203,6 @@ "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 4da868821..6db8f6429 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,8 +209,6 @@ "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 e11003972..c85eccedc 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,8 +222,6 @@ "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 132968412..f689762ad 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,8 +240,6 @@ "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 3e8a6b6ba..e91142b98 100644 --- a/testdata/d2compiler/TestCompile/edge_label_map.exp.json +++ b/testdata/d2compiler/TestCompile/edge_label_map.exp.json @@ -130,8 +130,6 @@ "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 bfb703665..e1d436a20 100644 --- a/testdata/d2compiler/TestCompile/edge_map.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map.exp.json @@ -113,8 +113,6 @@ "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 90abaad35..9abaa0abc 100644 --- a/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json @@ -142,8 +142,6 @@ "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 ed7c148d5..77788e717 100644 --- a/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json @@ -158,8 +158,6 @@ "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 85ea1c5df..67b44e188 100644 --- a/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json @@ -176,8 +176,6 @@ "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 cf697dee2..44d73ca4d 100644 --- a/testdata/d2compiler/TestCompile/edge_map_nested.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_nested.exp.json @@ -138,8 +138,6 @@ "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 8e32b92a4..18161ea9f 100644 --- a/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json @@ -120,8 +120,6 @@ "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 3e4570240..40af4edf1 100644 --- a/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json @@ -230,8 +230,6 @@ "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 216975d17..0298cbd45 100644 --- a/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json @@ -124,8 +124,6 @@ "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 41f697c38..d55583d16 100644 --- a/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json @@ -180,8 +180,6 @@ "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 6ed409295..eb8834c51 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge.exp.json @@ -125,8 +125,6 @@ "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 288c99817..6d20bf30c 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json @@ -184,8 +184,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -213,8 +211,6 @@ "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 57572fb70..cdbb0e417 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json @@ -191,8 +191,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -220,8 +218,6 @@ "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 ddab4d207..9dc877365 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json @@ -196,8 +196,6 @@ "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 14ecfbd7f..f69c79872 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json @@ -165,8 +165,6 @@ "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 bf06c85fc..39697a995 100644 --- a/testdata/d2oracle/TestCreate/container_edge.exp.json +++ b/testdata/d2oracle/TestCreate/container_edge.exp.json @@ -103,8 +103,6 @@ "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 29ad7eef0..4804a6f1e 100644 --- a/testdata/d2oracle/TestCreate/container_edge_label.exp.json +++ b/testdata/d2oracle/TestCreate/container_edge_label.exp.json @@ -113,8 +113,6 @@ "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 fc60bae77..9b2014c1e 100644 --- a/testdata/d2oracle/TestCreate/edge.exp.json +++ b/testdata/d2oracle/TestCreate/edge.exp.json @@ -74,8 +74,6 @@ "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 1f464b526..149603016 100644 --- a/testdata/d2oracle/TestCreate/edge_nested.exp.json +++ b/testdata/d2oracle/TestCreate/edge_nested.exp.json @@ -90,8 +90,6 @@ "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 8e7821de1..ea6ae05e1 100644 --- a/testdata/d2oracle/TestCreate/edge_scope.exp.json +++ b/testdata/d2oracle/TestCreate/edge_scope.exp.json @@ -103,8 +103,6 @@ "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 6a3e4d579..dc5658e40 100644 --- a/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json +++ b/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json @@ -103,8 +103,6 @@ "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 b7af67bb8..ea215f9ed 100644 --- a/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json +++ b/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json @@ -114,8 +114,6 @@ "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 97da8095e..64946f4f7 100644 --- a/testdata/d2oracle/TestCreate/edge_unique.exp.json +++ b/testdata/d2oracle/TestCreate/edge_unique.exp.json @@ -260,8 +260,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -289,8 +287,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -318,8 +314,6 @@ "index": 1, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -347,8 +341,6 @@ "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 fc9a1b920..f0cfc7ed9 100644 --- a/testdata/d2oracle/TestDelete/children.exp.json +++ b/testdata/d2oracle/TestDelete/children.exp.json @@ -97,8 +97,6 @@ "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 31ce9deed..23512a8fa 100644 --- a/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json @@ -130,8 +130,6 @@ "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 a525711d8..87432da31 100644 --- a/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json @@ -223,8 +223,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -252,8 +250,6 @@ "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 24ceb61d5..7843427b7 100644 --- a/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json @@ -199,8 +199,6 @@ "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 dc2091ab8..13095ab3f 100644 --- a/testdata/d2oracle/TestDelete/children_scope.exp.json +++ b/testdata/d2oracle/TestDelete/children_scope.exp.json @@ -137,8 +137,6 @@ "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 54a921a7c..be9e9d472 100644 --- a/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json +++ b/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json @@ -107,8 +107,6 @@ "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 925d313c9..99941b391 100644 --- a/testdata/d2oracle/TestDelete/edge_common.exp.json +++ b/testdata/d2oracle/TestDelete/edge_common.exp.json @@ -74,8 +74,6 @@ "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 fb9787232..08de68293 100644 --- a/testdata/d2oracle/TestDelete/edge_common_2.exp.json +++ b/testdata/d2oracle/TestDelete/edge_common_2.exp.json @@ -74,8 +74,6 @@ "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 cfcd34319..7a272710b 100644 --- a/testdata/d2oracle/TestDelete/edge_conflict.exp.json +++ b/testdata/d2oracle/TestDelete/edge_conflict.exp.json @@ -119,8 +119,6 @@ "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 959b0037a..d1d9ef1ec 100644 --- a/testdata/d2oracle/TestDelete/edge_decrement.exp.json +++ b/testdata/d2oracle/TestDelete/edge_decrement.exp.json @@ -456,8 +456,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -488,8 +486,6 @@ "index": 1, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -520,8 +516,6 @@ "index": 2, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -552,8 +546,6 @@ "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 f0f488b58..53f981334 100644 --- a/testdata/d2oracle/TestDelete/edge_first.exp.json +++ b/testdata/d2oracle/TestDelete/edge_first.exp.json @@ -185,8 +185,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -214,8 +212,6 @@ "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 64696bc89..7cacbe9bb 100644 --- a/testdata/d2oracle/TestDelete/edge_identical_child.exp.json +++ b/testdata/d2oracle/TestDelete/edge_identical_child.exp.json @@ -107,8 +107,6 @@ "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 4198c6047..4f1b062c7 100644 --- a/testdata/d2oracle/TestDelete/edge_key_style.exp.json +++ b/testdata/d2oracle/TestDelete/edge_key_style.exp.json @@ -74,8 +74,6 @@ "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 d8c091987..33cd89cd6 100644 --- a/testdata/d2oracle/TestDelete/edge_last.exp.json +++ b/testdata/d2oracle/TestDelete/edge_last.exp.json @@ -222,8 +222,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -251,8 +249,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -280,8 +276,6 @@ "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 f53be47d0..9192eebd7 100644 --- a/testdata/d2oracle/TestDelete/edge_map_style.exp.json +++ b/testdata/d2oracle/TestDelete/edge_map_style.exp.json @@ -74,8 +74,6 @@ "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 b0d8a0883..ddb63fae2 100644 --- a/testdata/d2oracle/TestDelete/edge_middle.exp.json +++ b/testdata/d2oracle/TestDelete/edge_middle.exp.json @@ -208,8 +208,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -237,8 +235,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -266,8 +262,6 @@ "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 3fc782f09..d88534289 100644 --- a/testdata/d2oracle/TestDelete/flat_reserved.exp.json +++ b/testdata/d2oracle/TestDelete/flat_reserved.exp.json @@ -74,8 +74,6 @@ "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 cdc15ffc0..76fbfc09c 100644 --- a/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json +++ b/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json @@ -97,8 +97,6 @@ "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 5031509ac..81d77418a 100644 --- a/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json +++ b/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json @@ -103,8 +103,6 @@ "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 724743e33..3052f799d 100644 --- a/testdata/d2oracle/TestDelete/node_in_edge.exp.json +++ b/testdata/d2oracle/TestDelete/node_in_edge.exp.json @@ -172,8 +172,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -201,8 +199,6 @@ "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 39b79da16..45740d4b1 100644 --- a/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json +++ b/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json @@ -211,8 +211,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -240,8 +238,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -269,8 +265,6 @@ "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 e20ab37f8..30d5e1158 100644 --- a/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json +++ b/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json @@ -170,8 +170,6 @@ "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 49546f538..f46008172 100644 --- a/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json +++ b/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json @@ -170,8 +170,6 @@ "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 14d3b3449..7736e550d 100644 --- a/testdata/d2oracle/TestDelete/order_1.exp.json +++ b/testdata/d2oracle/TestDelete/order_1.exp.json @@ -97,8 +97,6 @@ "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 286378b3e..54f05a0dc 100644 --- a/testdata/d2oracle/TestDelete/order_5.exp.json +++ b/testdata/d2oracle/TestDelete/order_5.exp.json @@ -149,8 +149,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -178,8 +176,6 @@ "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 54e268dda..9fdb4cb6c 100644 --- a/testdata/d2oracle/TestDelete/shape_sql_table.exp.json +++ b/testdata/d2oracle/TestDelete/shape_sql_table.exp.json @@ -271,8 +271,6 @@ "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 406c74572..88abfd541 100644 --- a/testdata/d2oracle/TestDelete/underscore_remove.exp.json +++ b/testdata/d2oracle/TestDelete/underscore_remove.exp.json @@ -143,8 +143,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -172,8 +170,6 @@ "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 d9c93c103..16aed2451 100644 --- a/testdata/d2oracle/TestMove/chain_connected_nested.exp.json +++ b/testdata/d2oracle/TestMove/chain_connected_nested.exp.json @@ -134,8 +134,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -163,8 +161,6 @@ "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 c4c11a362..c97e6fdc1 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,8 +122,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -151,8 +149,6 @@ "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 23433b9a4..030919340 100644 --- a/testdata/d2oracle/TestMove/connected_nested.exp.json +++ b/testdata/d2oracle/TestMove/connected_nested.exp.json @@ -97,8 +97,6 @@ "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 49046296a..e16514bda 100644 --- a/testdata/d2oracle/TestMove/edge_across_containers.exp.json +++ b/testdata/d2oracle/TestMove/edge_across_containers.exp.json @@ -148,8 +148,6 @@ "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 e84230c97..b82200541 100644 --- a/testdata/d2oracle/TestMove/edge_basic.exp.json +++ b/testdata/d2oracle/TestMove/edge_basic.exp.json @@ -74,8 +74,6 @@ "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 aa2bcc9d4..fa6cea6af 100644 --- a/testdata/d2oracle/TestMove/edge_chain_basic.exp.json +++ b/testdata/d2oracle/TestMove/edge_chain_basic.exp.json @@ -111,8 +111,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -140,8 +138,6 @@ "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 f1b9b0a26..f190d1a29 100644 --- a/testdata/d2oracle/TestMove/edge_chain_circular.exp.json +++ b/testdata/d2oracle/TestMove/edge_chain_circular.exp.json @@ -162,8 +162,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -191,8 +189,6 @@ "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 375b91a64..a1227cd4b 100644 --- a/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json +++ b/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json @@ -145,8 +145,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -174,8 +172,6 @@ "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 28aba03a7..c4f8fe4ab 100644 --- a/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json +++ b/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json @@ -162,8 +162,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -191,8 +189,6 @@ "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 140ab2968..517ea0676 100644 --- a/testdata/d2oracle/TestMove/edge_conflict.exp.json +++ b/testdata/d2oracle/TestMove/edge_conflict.exp.json @@ -148,8 +148,6 @@ "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 181af1439..f2ab40dd1 100644 --- a/testdata/d2oracle/TestMove/edge_into_container.exp.json +++ b/testdata/d2oracle/TestMove/edge_into_container.exp.json @@ -137,8 +137,6 @@ "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 568dbebfb..f2658dc1a 100644 --- a/testdata/d2oracle/TestMove/edge_nested_basic.exp.json +++ b/testdata/d2oracle/TestMove/edge_nested_basic.exp.json @@ -103,8 +103,6 @@ "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 67b45ed26..13f4ebe2a 100644 --- a/testdata/d2oracle/TestMove/edge_out_of_container.exp.json +++ b/testdata/d2oracle/TestMove/edge_out_of_container.exp.json @@ -114,8 +114,6 @@ "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 f25008ec8..0d5875894 100644 --- a/testdata/d2oracle/TestMove/full_edge_slice.exp.json +++ b/testdata/d2oracle/TestMove/full_edge_slice.exp.json @@ -217,8 +217,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -246,8 +244,6 @@ "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 a6b80bf4d..dc97d0024 100644 --- a/testdata/d2oracle/TestMove/gnarly_1.exp.json +++ b/testdata/d2oracle/TestMove/gnarly_1.exp.json @@ -361,8 +361,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -390,8 +388,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -419,8 +415,6 @@ "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 a94526ac5..a74d2c5cd 100644 --- a/testdata/d2oracle/TestMove/move_out_of_edge.exp.json +++ b/testdata/d2oracle/TestMove/move_out_of_edge.exp.json @@ -130,8 +130,6 @@ "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 ed99f0a61..593084ee0 100644 --- a/testdata/d2oracle/TestMove/move_out_of_nested_edge.exp.json +++ b/testdata/d2oracle/TestMove/move_out_of_nested_edge.exp.json @@ -170,8 +170,6 @@ "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 2f0420e17..326f0c5d7 100644 --- a/testdata/d2oracle/TestMove/nhooyr_two.exp.json +++ b/testdata/d2oracle/TestMove/nhooyr_two.exp.json @@ -178,8 +178,6 @@ "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 8a3002281..81e26df25 100644 --- a/testdata/d2oracle/TestMove/parentheses.exp.json +++ b/testdata/d2oracle/TestMove/parentheses.exp.json @@ -113,8 +113,6 @@ "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 8856c1d3d..d4f638277 100644 --- a/testdata/d2oracle/TestMove/partial_edge_slice.exp.json +++ b/testdata/d2oracle/TestMove/partial_edge_slice.exp.json @@ -120,8 +120,6 @@ "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 d1883d2e0..c25fc70ca 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_children.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_children.exp.json @@ -137,8 +137,6 @@ "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 3a80fc825..1177bff53 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json @@ -103,8 +103,6 @@ "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 67f4256e2..aef075e64 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json @@ -114,8 +114,6 @@ "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 719a51f26..01d482296 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json @@ -114,8 +114,6 @@ "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 18bc1bb71..ac60f92d9 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json @@ -103,8 +103,6 @@ "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 dbe464ab5..6aa8777c1 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json @@ -136,8 +136,6 @@ "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 0c69b2044..6f2f331e9 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_split.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_split.exp.json @@ -166,8 +166,6 @@ "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 53671a1e7..60bf00ba9 100644 --- a/testdata/d2oracle/TestMove/unique_name_with_references.exp.json +++ b/testdata/d2oracle/TestMove/unique_name_with_references.exp.json @@ -183,8 +183,6 @@ "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 0059a0ee0..e83ff7555 100644 --- a/testdata/d2oracle/TestRename/arrows.exp.json +++ b/testdata/d2oracle/TestRename/arrows.exp.json @@ -74,8 +74,6 @@ "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 d2f0c684f..7838e805c 100644 --- a/testdata/d2oracle/TestRename/arrows_chain.exp.json +++ b/testdata/d2oracle/TestRename/arrows_chain.exp.json @@ -148,8 +148,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -177,8 +175,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -206,8 +202,6 @@ "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 2c23df4e9..8cfc0614e 100644 --- a/testdata/d2oracle/TestRename/arrows_complex.exp.json +++ b/testdata/d2oracle/TestRename/arrows_complex.exp.json @@ -128,8 +128,6 @@ "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 370c2dbd7..385ac743d 100644 --- a/testdata/d2oracle/TestRename/arrows_trim_common.exp.json +++ b/testdata/d2oracle/TestRename/arrows_trim_common.exp.json @@ -164,8 +164,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -193,8 +191,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -222,8 +218,6 @@ "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 6c590ee96..a05533059 100644 --- a/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json +++ b/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json @@ -214,8 +214,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -243,8 +241,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -272,8 +268,6 @@ "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 e043fe96b..43127797e 100644 --- a/testdata/d2oracle/TestRename/complex_edge_1.exp.json +++ b/testdata/d2oracle/TestRename/complex_edge_1.exp.json @@ -128,8 +128,6 @@ "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 8d4b5bcbb..a7920769a 100644 --- a/testdata/d2oracle/TestRename/complex_edge_2.exp.json +++ b/testdata/d2oracle/TestRename/complex_edge_2.exp.json @@ -128,8 +128,6 @@ "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 dfc7368c1..2b263f935 100644 --- a/testdata/d2oracle/TestRename/container.exp.json +++ b/testdata/d2oracle/TestRename/container.exp.json @@ -753,8 +753,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -785,8 +783,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -814,8 +810,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -843,8 +837,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -872,8 +864,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -901,8 +891,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -930,8 +918,6 @@ "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 05332edac..a67dce07d 100644 --- a/testdata/d2oracle/TestRename/edges.exp.json +++ b/testdata/d2oracle/TestRename/edges.exp.json @@ -418,8 +418,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -447,8 +445,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -476,8 +472,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -505,8 +499,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -534,8 +526,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -563,8 +553,6 @@ "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 84eaa0647..507949965 100644 --- a/testdata/d2oracle/TestSet/edge.exp.json +++ b/testdata/d2oracle/TestSet/edge.exp.json @@ -84,8 +84,6 @@ "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 5149efba5..8f0021f3f 100644 --- a/testdata/d2oracle/TestSet/edge_append_style.exp.json +++ b/testdata/d2oracle/TestSet/edge_append_style.exp.json @@ -119,8 +119,6 @@ "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 197fd7e8f..a4a3367d0 100644 --- a/testdata/d2oracle/TestSet/edge_chain.exp.json +++ b/testdata/d2oracle/TestSet/edge_chain.exp.json @@ -211,8 +211,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -243,8 +241,6 @@ "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 5aec0843b..9d923038f 100644 --- a/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json +++ b/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json @@ -194,8 +194,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -230,8 +228,6 @@ "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 b733a2aad..812c17710 100644 --- a/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json +++ b/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json @@ -278,8 +278,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -307,8 +305,6 @@ "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 4788f201e..8e321df40 100644 --- a/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json +++ b/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json @@ -234,8 +234,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -270,8 +268,6 @@ "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 ed7457e4a..6ab4ab7cb 100644 --- a/testdata/d2oracle/TestSet/edge_index_case.exp.json +++ b/testdata/d2oracle/TestSet/edge_index_case.exp.json @@ -188,8 +188,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -217,8 +215,6 @@ "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 eee99c486..375636762 100644 --- a/testdata/d2oracle/TestSet/edge_index_nested.exp.json +++ b/testdata/d2oracle/TestSet/edge_index_nested.exp.json @@ -113,8 +113,6 @@ "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 c2429d831..421bb7d40 100644 --- a/testdata/d2oracle/TestSet/edge_key_and_key.exp.json +++ b/testdata/d2oracle/TestSet/edge_key_and_key.exp.json @@ -164,8 +164,6 @@ "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 84ca3dd12..1f228e913 100644 --- a/testdata/d2oracle/TestSet/edge_label.exp.json +++ b/testdata/d2oracle/TestSet/edge_label.exp.json @@ -129,8 +129,6 @@ "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 02875c753..121ce1019 100644 --- a/testdata/d2oracle/TestSet/edge_merge_style.exp.json +++ b/testdata/d2oracle/TestSet/edge_merge_style.exp.json @@ -166,8 +166,6 @@ "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 f90a08042..5d36f0f28 100644 --- a/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json +++ b/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json @@ -113,8 +113,6 @@ "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 ea3e1858e..0b5d5025b 100644 --- a/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json +++ b/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json @@ -159,8 +159,6 @@ "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 fd5dae0fa..719f76e71 100644 --- a/testdata/d2oracle/TestSet/label_primary.exp.json +++ b/testdata/d2oracle/TestSet/label_primary.exp.json @@ -109,8 +109,6 @@ "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 6cb4cafa7..9253e09f0 100644 --- a/testdata/d2oracle/TestSet/map_key_missing.exp.json +++ b/testdata/d2oracle/TestSet/map_key_missing.exp.json @@ -107,8 +107,6 @@ "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 e69c81902..29e099bda 100644 --- a/testdata/d2oracle/TestSet/nested_alex.exp.json +++ b/testdata/d2oracle/TestSet/nested_alex.exp.json @@ -179,8 +179,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 From 28627ad3927c807bd1a434ab4979c26e70a9498d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BAlio=20C=C3=A9sar=20Batista?= Date: Wed, 16 Nov 2022 12:02:22 -0300 Subject: [PATCH 4/8] Update changelog --- ci/release/changelogs/next.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/release/changelogs/next.md b/ci/release/changelogs/next.md index 501bb82d7..b07e16c9e 100644 --- a/ci/release/changelogs/next.md +++ b/ci/release/changelogs/next.md @@ -6,7 +6,7 @@ For v0.0.99 we focused on X, Y and Z. Enjoy! #### Improvements 🔧 -- Improves something or the other #9999 +- Add table columns indices in edges between SQL Tables so that layout engines can route exactly between rows #### Bugfixes 🔴 From d395dac271ab6bb1136a3235d669d89c52966572 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BAlio=20C=C3=A9sar=20Batista?= Date: Wed, 16 Nov 2022 12:14:17 -0300 Subject: [PATCH 5/8] Update changelog --- ci/release/changelogs/next.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/release/changelogs/next.md b/ci/release/changelogs/next.md index b07e16c9e..ffd49ca9c 100644 --- a/ci/release/changelogs/next.md +++ b/ci/release/changelogs/next.md @@ -6,7 +6,7 @@ For v0.0.99 we focused on X, Y and Z. Enjoy! #### Improvements 🔧 -- Add table columns indices in edges between SQL Tables so that layout engines can route exactly between rows +- Add table columns indices in edges between SQL Tables so that layout engines can route exactly between them #### Bugfixes 🔴 From 505a4d38ce301a0db0fd3a67de7b42d256d5a478 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BAlio=20C=C3=A9sar=20Batista?= Date: Wed, 16 Nov 2022 14:58:06 -0300 Subject: [PATCH 6/8] Add test for edge column index --- d2compiler/compile_test.go | 26 + .../TestCompile/edge_column_index.exp.json | 559 ++++++++++++++++++ 2 files changed, 585 insertions(+) create mode 100644 testdata/d2compiler/TestCompile/edge_column_index.exp.json diff --git a/d2compiler/compile_test.go b/d2compiler/compile_test.go index 54f59d64c..34e262e69 100644 --- a/d2compiler/compile_test.go +++ b/d2compiler/compile_test.go @@ -1474,6 +1474,32 @@ b`, g.Objects[0].Attributes.Label.Value) SVP1.style.3d: true`, expErr: `d2/testdata/d2compiler/TestCompile/3d_oval.d2:2:1: key "3d" can only be applied to squares and rectangles `, + }, { + name: "edge_column_index", + text: `src: { + shape: sql_table + id: int + dst_id: int +} + +dst: { + shape: sql_table + id: int + name: string +} + +dst.id <-> src.dst_id +`, + assertions: func(t *testing.T, g *d2graph.Graph) { + fromIndex := g.Edges[0].FromTableColumnIndex + if fromIndex == nil || *fromIndex != 0 { + t.Fatalf("Expected FromTableColumnIndex to be 0, got %v", fromIndex) + } + toIndex := g.Edges[0].ToTableColumnIndex + if toIndex == nil || *toIndex != 1 { + t.Fatalf("Expected ToTableColumnIndex to be 1, got %v", toIndex) + } + }, }, } diff --git a/testdata/d2compiler/TestCompile/edge_column_index.exp.json b/testdata/d2compiler/TestCompile/edge_column_index.exp.json new file mode 100644 index 000000000..74cf487cd --- /dev/null +++ b/testdata/d2compiler/TestCompile/edge_column_index.exp.json @@ -0,0 +1,559 @@ +{ + "graph": { + "ast": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,0:0:0-13:0:123", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,0:0:0-4:1:48", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,0:0:0-0:3:3", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,0:0:0-0:3:3", + "value": [ + { + "string": "src", + "raw_string": "src" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,0:5:5-4:0:47", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,1:1:8-1:17:24", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,1:1:8-1:6:13", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,1:1:8-1:6:13", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,1:8:15-1:17:24", + "value": [ + { + "string": "sql_table", + "raw_string": "sql_table" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,2:1:26-2:8:33", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,2:1:26-2:3:28", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,2:1:26-2:3:28", + "value": [ + { + "string": "id", + "raw_string": "id" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,2:5:30-2:8:33", + "value": [ + { + "string": "int", + "raw_string": "int" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,3:1:35-3:12:46", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,3:1:35-3:7:41", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,3:1:35-3:7:41", + "value": [ + { + "string": "dst_id", + "raw_string": "dst_id" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,3:9:43-3:12:46", + "value": [ + { + "string": "int", + "raw_string": "int" + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,6:0:50-10:1:99", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,6:0:50-6:3:53", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,6:0:50-6:3:53", + "value": [ + { + "string": "dst", + "raw_string": "dst" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,6:5:55-10:0:98", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,7:1:58-7:17:74", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,7:1:58-7:6:63", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,7:1:58-7:6:63", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,7:8:65-7:17:74", + "value": [ + { + "string": "sql_table", + "raw_string": "sql_table" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,8:1:76-8:8:83", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,8:1:76-8:3:78", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,8:1:76-8:3:78", + "value": [ + { + "string": "id", + "raw_string": "id" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,8:5:80-8:8:83", + "value": [ + { + "string": "int", + "raw_string": "int" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,9:1:85-9:13:97", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,9:1:85-9:5:89", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,9:1:85-9:5:89", + "value": [ + { + "string": "name", + "raw_string": "name" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,9:7:91-9:13:97", + "value": [ + { + "string": "string", + "raw_string": "string" + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,12:0:101-12:21:122", + "edges": [ + { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,12:0:101-12:21:122", + "src": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,12:0:101-12:7:108", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,12:0:101-12:3:104", + "value": [ + { + "string": "dst", + "raw_string": "dst" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,12:4:105-12:6:107", + "value": [ + { + "string": "id", + "raw_string": "id" + } + ] + } + } + ] + }, + "src_arrow": "<", + "dst": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,12:10:111-12:21:122", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,12:11:112-12:14:115", + "value": [ + { + "string": "src", + "raw_string": "src" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,12:15:116-12:21:122", + "value": [ + { + "string": "dst_id", + "raw_string": "dst_id" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "label_dimensions": { + "width": 0, + "height": 0 + }, + "attributes": { + "label": { + "value": "" + }, + "style": {}, + "near_key": null, + "shape": { + "value": "" + } + } + }, + "edges": [ + { + "index": 0, + "minWidth": 0, + "minHeight": 0, + "fromTableColumnIndex": 0, + "toTableColumnIndex": 1, + "label_dimensions": { + "width": 0, + "height": 0 + }, + "isCurve": false, + "src_arrow": true, + "dst_arrow": true, + "references": [ + { + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "" + }, + "style": {}, + "near_key": null, + "shape": { + "value": "" + } + } + } + ], + "objects": [ + { + "id": "src", + "id_val": "src", + "label_dimensions": { + "width": 0, + "height": 0 + }, + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,0:0:0-0:3:3", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,0:0:0-0:3:3", + "value": [ + { + "string": "src", + "raw_string": "src" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,12:10:111-12:21:122", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,12:11:112-12:14:115", + "value": [ + { + "string": "src", + "raw_string": "src" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,12:15:116-12:21:122", + "value": [ + { + "string": "dst_id", + "raw_string": "dst_id" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + } + ], + "sql_table": { + "columns": [ + { + "name": "id", + "type": "int", + "constraint": "", + "reference": "" + }, + { + "name": "dst_id", + "type": "int", + "constraint": "", + "reference": "" + } + ] + }, + "attributes": { + "label": { + "value": "src" + }, + "style": {}, + "near_key": null, + "shape": { + "value": "sql_table" + } + } + }, + { + "id": "dst", + "id_val": "dst", + "label_dimensions": { + "width": 0, + "height": 0 + }, + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,6:0:50-6:3:53", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,6:0:50-6:3:53", + "value": [ + { + "string": "dst", + "raw_string": "dst" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,12:0:101-12:7:108", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,12:0:101-12:3:104", + "value": [ + { + "string": "dst", + "raw_string": "dst" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,12:4:105-12:6:107", + "value": [ + { + "string": "id", + "raw_string": "id" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + } + ], + "sql_table": { + "columns": [ + { + "name": "id", + "type": "int", + "constraint": "", + "reference": "src.dst_id" + }, + { + "name": "name", + "type": "string", + "constraint": "", + "reference": "" + } + ] + }, + "attributes": { + "label": { + "value": "dst" + }, + "style": {}, + "near_key": null, + "shape": { + "value": "sql_table" + } + } + } + ] + }, + "err": null +} From 06a30f78200ed4073f2d6d3f2300db688dc61b42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BAlio=20C=C3=A9sar=20Batista?= Date: Wed, 16 Nov 2022 15:54:34 -0300 Subject: [PATCH 7/8] Rename From/To to Src/Dst --- d2compiler/compile.go | 20 +++++++++---------- d2compiler/compile_test.go | 12 +++++------ d2graph/d2graph.go | 4 ++-- .../TestCompile/edge_column_index.exp.json | 4 ++-- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/d2compiler/compile.go b/d2compiler/compile.go index d2bd49d2e..0db0d62d4 100644 --- a/d2compiler/compile.go +++ b/d2compiler/compile.go @@ -681,11 +681,11 @@ func (c *compiler) compileSQLTable(obj *d2graph.Object) { } if srcID == absID { d2Col.Reference = strings.TrimPrefix(dstID, parentID+".") - e.FromTableColumnIndex = new(int) - *e.FromTableColumnIndex = len(obj.SQLTable.Columns) + e.SrcTableColumnIndex = new(int) + *e.SrcTableColumnIndex = len(obj.SQLTable.Columns) } else if dstID == absID { - e.ToTableColumnIndex = new(int) - *e.ToTableColumnIndex = len(obj.SQLTable.Columns) + e.DstTableColumnIndex = new(int) + *e.DstTableColumnIndex = len(obj.SQLTable.Columns) } } @@ -746,13 +746,13 @@ 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 - if e.FromTableColumnIndex != nil { - newEdge.FromTableColumnIndex = new(int) - *newEdge.FromTableColumnIndex = *e.FromTableColumnIndex + if e.SrcTableColumnIndex != nil { + newEdge.SrcTableColumnIndex = new(int) + *newEdge.SrcTableColumnIndex = *e.SrcTableColumnIndex } - if e.ToTableColumnIndex != nil { - newEdge.ToTableColumnIndex = new(int) - *newEdge.ToTableColumnIndex = *e.ToTableColumnIndex + if e.DstTableColumnIndex != nil { + newEdge.DstTableColumnIndex = new(int) + *newEdge.DstTableColumnIndex = *e.DstTableColumnIndex } newEdge.Attributes.Label = e.Attributes.Label newEdge.References = e.References diff --git a/d2compiler/compile_test.go b/d2compiler/compile_test.go index 34e262e69..51b546f08 100644 --- a/d2compiler/compile_test.go +++ b/d2compiler/compile_test.go @@ -1491,13 +1491,13 @@ dst: { dst.id <-> src.dst_id `, assertions: func(t *testing.T, g *d2graph.Graph) { - fromIndex := g.Edges[0].FromTableColumnIndex - if fromIndex == nil || *fromIndex != 0 { - t.Fatalf("Expected FromTableColumnIndex to be 0, got %v", fromIndex) + srcIndex := g.Edges[0].SrcTableColumnIndex + if srcIndex == nil || *srcIndex != 0 { + t.Fatalf("Expected SrcTableColumnIndex to be 0, got %v", srcIndex) } - toIndex := g.Edges[0].ToTableColumnIndex - if toIndex == nil || *toIndex != 1 { - t.Fatalf("Expected ToTableColumnIndex to be 1, got %v", toIndex) + dstIndex := g.Edges[0].DstTableColumnIndex + if dstIndex == nil || *dstIndex != 1 { + t.Fatalf("Expected DstTableColumnIndex to be 1, got %v", dstIndex) } }, }, diff --git a/d2graph/d2graph.go b/d2graph/d2graph.go index 170aad88d..5687608f1 100644 --- a/d2graph/d2graph.go +++ b/d2graph/d2graph.go @@ -607,8 +607,8 @@ type Edge struct { MinWidth int `json:"minWidth"` MinHeight int `json:"minHeight"` - FromTableColumnIndex *int `json:"fromTableColumnIndex,omitempty"` - ToTableColumnIndex *int `json:"toTableColumnIndex,omitempty"` + SrcTableColumnIndex *int `json:"srcTableColumnIndex,omitempty"` + DstTableColumnIndex *int `json:"dstTableColumnIndex,omitempty"` LabelDimensions d2target.TextDimensions `json:"label_dimensions"` LabelPosition *string `json:"labelPosition,omitempty"` diff --git a/testdata/d2compiler/TestCompile/edge_column_index.exp.json b/testdata/d2compiler/TestCompile/edge_column_index.exp.json index 74cf487cd..8a9fde6d3 100644 --- a/testdata/d2compiler/TestCompile/edge_column_index.exp.json +++ b/testdata/d2compiler/TestCompile/edge_column_index.exp.json @@ -352,8 +352,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableColumnIndex": 0, - "toTableColumnIndex": 1, + "srcTableColumnIndex": 0, + "dstTableColumnIndex": 1, "label_dimensions": { "width": 0, "height": 0 From af3477dffd3fc9e1eb05322ebd57a50b933aadea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BAlio=20C=C3=A9sar=20Batista?= Date: Wed, 16 Nov 2022 16:15:14 -0300 Subject: [PATCH 8/8] Minor adjustment --- d2compiler/compile_test.go | 4 +-- e2etests/stable_test.go | 63 +++++++++++++++++++------------------- 2 files changed, 33 insertions(+), 34 deletions(-) diff --git a/d2compiler/compile_test.go b/d2compiler/compile_test.go index 51b546f08..c43639cb8 100644 --- a/d2compiler/compile_test.go +++ b/d2compiler/compile_test.go @@ -1493,11 +1493,11 @@ dst.id <-> src.dst_id assertions: func(t *testing.T, g *d2graph.Graph) { srcIndex := g.Edges[0].SrcTableColumnIndex if srcIndex == nil || *srcIndex != 0 { - t.Fatalf("Expected SrcTableColumnIndex to be 0, got %v", srcIndex) + t.Fatalf("expected SrcTableColumnIndex to be 0, got %v", srcIndex) } dstIndex := g.Edges[0].DstTableColumnIndex if dstIndex == nil || *dstIndex != 1 { - t.Fatalf("Expected DstTableColumnIndex to be 1, got %v", dstIndex) + t.Fatalf("expected DstTableColumnIndex to be 1, got %v", dstIndex) } }, }, diff --git a/e2etests/stable_test.go b/e2etests/stable_test.go index 64d2403bb..ab7d770a9 100644 --- a/e2etests/stable_test.go +++ b/e2etests/stable_test.go @@ -833,42 +833,41 @@ a -> md -> b `, }, { name: "sql_tables", - script: ` - users: { - shape: sql_table - id: int - name: string - email: string - password: string - last_login: datetime - } + script: `users: { + shape: sql_table + id: int + name: string + email: string + password: string + last_login: datetime +} - products: { - shape: sql_table - id: int - price: decimal - sku: string - name: string - } +products: { + shape: sql_table + id: int + price: decimal + sku: string + name: string +} - orders: { - shape: sql_table - id: int - user_id: int - product_id: int - } +orders: { + shape: sql_table + id: int + user_id: int + product_id: int +} - shipments: { - shape: sql_table - id: int - order_id: int - tracking_number: string - status: string - } +shipments: { + shape: sql_table + id: int + order_id: int + tracking_number: string + status: string +} - users.id <-> orders.user_id - products.id <-> orders.product_id - shipments.order_id <-> orders.id`, +users.id <-> orders.user_id +products.id <-> orders.product_id +shipments.order_id <-> orders.id`, }, }