luciano/d2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename From/To to Src/Dst

Browse source
This commit is contained in:
Júlio César Batista 2022-11-16 15:54:34 -03:00
parent 505a4d38ce
commit 06a30f7820
No known key found for this signature in database
GPG key ID: 10C4B861BF314878
4 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
d2compiler/compile.go
View file

@ -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

12
d2compiler/compile_test.go
View file

@ -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)
}
},
},

4
d2graph/d2graph.go
View file

@ -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"`

4
testdata/d2compiler/TestCompile/edge_column_index.exp.json vendored
View file

@ -352,8 +352,8 @@
"index": 0,
"minWidth": 0,
"minHeight": 0,
"fromTableColumnIndex": 0,
"toTableColumnIndex": 1,
"srcTableColumnIndex": 0,
"dstTableColumnIndex": 1,
"label_dimensions": {
"width": 0,
"height": 0