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

fix nested connection implicit delete

Browse source
This commit is contained in:
Alexander Wang 2024-02-08 22:21:56 -08:00
parent defdde0e24
commit 0d9328b9e5
No known key found for this signature in database
GPG key ID: 6A82C36A56162F42
4 changed files with 289 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ci/release/changelogs/next.md
View file

@ -4,4 +4,5 @@
#### Bugfixes ⛑️
- Fixes `null` being set on a nested shape not working in certain cases when connections also pointed to that shape [1830](https://github.com/terrastruct/d2/pull/1830)
- Fixes edge case of bad import syntax crashing using d2 as a library [1829](https://github.com/terrastruct/d2/pull/1829)

11
d2compiler/compile_test.go
View file

@ -3239,6 +3239,17 @@ y: null
assert.Equal(t, 0, len(g.Edges))
},
},
{
name: "delete-nested-connection",
run: func(t *testing.T) {
g, _ := assertCompile(t, `
a -> b.c
b.c: null
`, "")
assert.Equal(t, 2, len(g.Objects))
assert.Equal(t, 0, len(g.Edges))
},
},
{
name: "delete-multiple-connections",
run: func(t *testing.T) {

17
d2ir/d2ir.go
View file

@ -950,13 +950,20 @@ func (m *Map) DeleteField(ida ...string) *Field {
}
if len(rest) == 0 {
for _, fr := range f.References {
for _, e := range m.Edges {
for _, er := range e.References {
if er.Context_ == fr.Context_ {
m.DeleteEdge(e.ID)
break
currM := m
for currM != nil {
for _, e := range currM.Edges {
for _, er := range e.References {
if er.Context_ == fr.Context_ {
currM.DeleteEdge(e.ID)
break
}
}
}
if NodeBoardKind(currM) != "" {
break
}
currM = ParentMap(currM)
}
}
m.Fields = append(m.Fields[:i], m.Fields[i+1:]...)

265
testdata/d2compiler/TestCompile2/nulls/implicit/delete-nested-connection.exp.json generated vendored Normal file
View file

@ -0,0 +1,265 @@
{
"graph": {
"name": "",
"isFolderOnly": false,
"ast": {
"range": "d2/testdata/d2compiler/TestCompile2/nulls/implicit/delete-nested-connection.d2,0:0:0-3:0:20",
"nodes": [
{
"map_key": {
"range": "d2/testdata/d2compiler/TestCompile2/nulls/implicit/delete-nested-connection.d2,1:0:1-1:8:9",
"edges": [
{
"range": "d2/testdata/d2compiler/TestCompile2/nulls/implicit/delete-nested-connection.d2,1:0:1-1:8:9",
"src": {
"range": "d2/testdata/d2compiler/TestCompile2/nulls/implicit/delete-nested-connection.d2,1:0:1-1:1:2",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2compiler/TestCompile2/nulls/implicit/delete-nested-connection.d2,1:0:1-1:1:2",
"value": [
{
"string": "a",
"raw_string": "a"
}
]
}
}
]
},
"src_arrow": "",
"dst": {
"range": "d2/testdata/d2compiler/TestCompile2/nulls/implicit/delete-nested-connection.d2,1:5:6-1:8:9",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2compiler/TestCompile2/nulls/implicit/delete-nested-connection.d2,1:5:6-1:6:7",
"value": [
{
"string": "b",
"raw_string": "b"
}
]
}
},
{
"unquoted_string": {
"range": "d2/testdata/d2compiler/TestCompile2/nulls/implicit/delete-nested-connection.d2,1:7:8-1:8:9",
"value": [
{
"string": "c",
"raw_string": "c"
}
]
}
}
]
},
"dst_arrow": ">"
}
],
"primary": {},
"value": {}
}
},
{
"map_key": {
"range": "d2/testdata/d2compiler/TestCompile2/nulls/implicit/delete-nested-connection.d2,2:0:10-2:9:19",
"key": {
"range": "d2/testdata/d2compiler/TestCompile2/nulls/implicit/delete-nested-connection.d2,2:0:10-2:3:13",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2compiler/TestCompile2/nulls/implicit/delete-nested-connection.d2,2:0:10-2:1:11",
"value": [
{
"string": "b",
"raw_string": "b"
}
]
}
},
{
"unquoted_string": {
"range": "d2/testdata/d2compiler/TestCompile2/nulls/implicit/delete-nested-connection.d2,2:2:12-2:3:13",
"value": [
{
"string": "c",
"raw_string": "c"
}
]
}
}
]
},
"primary": {},
"value": {
"null": {
"range": "d2/testdata/d2compiler/TestCompile2/nulls/implicit/delete-nested-connection.d2,2:5:15-2:9:19"
}
}
}
}
]
},
"root": {
"id": "",
"id_val": "",
"attributes": {
"label": {
"value": ""
},
"labelDimensions": {
"width": 0,
"height": 0
},
"style": {},
"near_key": null,
"shape": {
"value": ""
},
"direction": {
"value": ""
},
"constraint": null
},
"zIndex": 0
},
"edges": null,
"objects": [
{
"id": "a",
"id_val": "a",
"references": [
{
"key": {
"range": "d2/testdata/d2compiler/TestCompile2/nulls/implicit/delete-nested-connection.d2,1:0:1-1:1:2",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2compiler/TestCompile2/nulls/implicit/delete-nested-connection.d2,1:0:1-1:1:2",
"value": [
{
"string": "a",
"raw_string": "a"
}
]
}
}
]
},
"key_path_index": 0,
"map_key_edge_index": 0
}
],
"attributes": {
"label": {
"value": "a"
},
"labelDimensions": {
"width": 0,
"height": 0
},
"style": {},
"near_key": null,
"shape": {
"value": "rectangle"
},
"direction": {
"value": ""
},
"constraint": null
},
"zIndex": 0
},
{
"id": "b",
"id_val": "b",
"references": [
{
"key": {
"range": "d2/testdata/d2compiler/TestCompile2/nulls/implicit/delete-nested-connection.d2,1:5:6-1:8:9",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2compiler/TestCompile2/nulls/implicit/delete-nested-connection.d2,1:5:6-1:6:7",
"value": [
{
"string": "b",
"raw_string": "b"
}
]
}
},
{
"unquoted_string": {
"range": "d2/testdata/d2compiler/TestCompile2/nulls/implicit/delete-nested-connection.d2,1:7:8-1:8:9",
"value": [
{
"string": "c",
"raw_string": "c"
}
]
}
}
]
},
"key_path_index": 0,
"map_key_edge_index": 0
},
{
"key": {
"range": "d2/testdata/d2compiler/TestCompile2/nulls/implicit/delete-nested-connection.d2,2:0:10-2:3:13",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2compiler/TestCompile2/nulls/implicit/delete-nested-connection.d2,2:0:10-2:1:11",
"value": [
{
"string": "b",
"raw_string": "b"
}
]
}
},
{
"unquoted_string": {
"range": "d2/testdata/d2compiler/TestCompile2/nulls/implicit/delete-nested-connection.d2,2:2:12-2:3:13",
"value": [
{
"string": "c",
"raw_string": "c"
}
]
}
}
]
},
"key_path_index": 0,
"map_key_edge_index": -1
}
],
"attributes": {
"label": {
"value": "b"
},
"labelDimensions": {
"width": 0,
"height": 0
},
"style": {},
"near_key": null,
"shape": {
"value": "rectangle"
},
"direction": {
"value": ""
},
"constraint": null
},
"zIndex": 0
}
]
},
"err": null
}