From 06a30f78200ed4073f2d6d3f2300db688dc61b42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BAlio=20C=C3=A9sar=20Batista?= <julio@terrastruct.com>
Date: Wed, 16 Nov 2022 15:54:34 -0300
Subject: [PATCH] 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