fix edge delete reserve in layer

This commit is contained in:
Alexander Wang 2024-05-26 09:31:22 -06:00
parent 881652956a
commit d285ef8db9
No known key found for this signature in database
GPG key ID: BE3937D0D52D8927
4 changed files with 804 additions and 1 deletions

View file

@ -1265,7 +1265,7 @@ func deleteReserved(g *d2graph.Graph, boardPath []string, baseAST *d2ast.Map, mk
if len(mk.Edges) == 1 {
if mk.Key != nil {
var ok bool
obj, ok = g.Root.HasChild(d2graph.Key(mk.Key))
obj, ok = obj.HasChild(d2graph.Key(mk.Key))
if !ok {
return g, nil
}

View file

@ -7759,6 +7759,41 @@ layers: {
a
}
}
`,
},
{
name: "edge-out-layer",
text: `x: {
a -> b
}
`,
key: `x.(a -> b)[0].style.stroke`,
exp: `x: {
a -> b
}
`,
},
{
name: "edge-in-layer",
text: `layers: {
test: {
x: {
a -> b
}
}
}
`,
boardPath: []string{"test"},
key: `x.(a -> b)[0].style.stroke`,
exp: `layers: {
test: {
x: {
a -> b
}
}
}
`,
},
}

489
testdata/d2oracle/TestDelete/edge-in-layer.exp.json generated vendored Normal file
View file

@ -0,0 +1,489 @@
{
"graph": {
"name": "",
"isFolderOnly": true,
"ast": {
"range": "d2/testdata/d2oracle/TestDelete/edge-in-layer.d2,0:0:0-7:0:54",
"nodes": [
{
"map_key": {
"range": "d2/testdata/d2oracle/TestDelete/edge-in-layer.d2,0:0:0-6:1:53",
"key": {
"range": "d2/testdata/d2oracle/TestDelete/edge-in-layer.d2,0:0:0-0:6:6",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestDelete/edge-in-layer.d2,0:0:0-0:6:6",
"value": [
{
"string": "layers",
"raw_string": "layers"
}
]
}
}
]
},
"primary": {},
"value": {
"map": {
"range": "d2/testdata/d2oracle/TestDelete/edge-in-layer.d2,0:8:8-6:1:53",
"nodes": [
{
"map_key": {
"range": "d2/testdata/d2oracle/TestDelete/edge-in-layer.d2,1:2:12-5:3:51",
"key": {
"range": "d2/testdata/d2oracle/TestDelete/edge-in-layer.d2,1:2:12-1:6:16",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestDelete/edge-in-layer.d2,1:2:12-1:6:16",
"value": [
{
"string": "test",
"raw_string": "test"
}
]
}
}
]
},
"primary": {},
"value": {
"map": {
"range": "d2/testdata/d2oracle/TestDelete/edge-in-layer.d2,1:8:18-5:3:51",
"nodes": [
{
"map_key": {
"range": "d2/testdata/d2oracle/TestDelete/edge-in-layer.d2,2:4:24-4:5:47",
"key": {
"range": "d2/testdata/d2oracle/TestDelete/edge-in-layer.d2,2:4:24-2:5:25",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestDelete/edge-in-layer.d2,2:4:24-2:5:25",
"value": [
{
"string": "x",
"raw_string": "x"
}
]
}
}
]
},
"primary": {},
"value": {
"map": {
"range": "d2/testdata/d2oracle/TestDelete/edge-in-layer.d2,2:7:27-4:5:47",
"nodes": [
{
"map_key": {
"range": "d2/testdata/d2oracle/TestDelete/edge-in-layer.d2,3:6:35-3:12:41",
"edges": [
{
"range": "d2/testdata/d2oracle/TestDelete/edge-in-layer.d2,3:6:35-3:12:41",
"src": {
"range": "d2/testdata/d2oracle/TestDelete/edge-in-layer.d2,3:6:35-3:7:36",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestDelete/edge-in-layer.d2,3:6:35-3:7:36",
"value": [
{
"string": "a",
"raw_string": "a"
}
]
}
}
]
},
"src_arrow": "",
"dst": {
"range": "d2/testdata/d2oracle/TestDelete/edge-in-layer.d2,3:11:40-3:12:41",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestDelete/edge-in-layer.d2,3:11:40-3:12:41",
"value": [
{
"string": "b",
"raw_string": "b"
}
]
}
}
]
},
"dst_arrow": ">"
}
],
"primary": {},
"value": {}
}
}
]
}
}
}
}
]
}
}
}
}
]
}
}
}
}
]
},
"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": null,
"layers": [
{
"name": "test",
"isFolderOnly": false,
"ast": {
"range": ",1:0:0-2:0:0",
"nodes": [
{
"map_key": {
"range": ",0:0:0-0:0:0",
"key": {
"range": ",0:0:0-0:0:0",
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"value": [
{
"string": "x"
}
]
}
}
]
},
"primary": {},
"value": {
"map": {
"range": ",1:0:0-2:0:0",
"nodes": [
{
"map_key": {
"range": ",0:0:0-0:0:0",
"key": {
"range": ",0:0:0-0:0:0",
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"value": [
{
"string": "a"
}
]
}
}
]
},
"primary": {},
"value": {}
}
},
{
"map_key": {
"range": ",0:0:0-0:0:0",
"key": {
"range": ",0:0:0-0:0:0",
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"value": [
{
"string": "b"
}
]
}
}
]
},
"primary": {},
"value": {}
}
},
{
"map_key": {
"range": ",0:0:0-0:0:0",
"edges": [
{
"range": ",0:0:0-0:0:0",
"src": {
"range": ",0:0:0-0:0:0",
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"value": [
{
"string": "a"
}
]
}
}
]
},
"src_arrow": "",
"dst": {
"range": ",0:0:0-0:0:0",
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"value": [
{
"string": "b"
}
]
}
}
]
},
"dst_arrow": ">"
}
],
"primary": {},
"value": {}
}
}
]
}
}
}
}
]
},
"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": [
{
"index": 0,
"isCurve": false,
"src_arrow": false,
"dst_arrow": true,
"references": [
{
"map_key_edge_index": 0
}
],
"attributes": {
"label": {
"value": ""
},
"labelDimensions": {
"width": 0,
"height": 0
},
"style": {},
"near_key": null,
"shape": {
"value": ""
},
"direction": {
"value": ""
},
"constraint": null
},
"zIndex": 0
}
],
"objects": [
{
"id": "x",
"id_val": "x",
"references": [
{
"key": {
"range": "d2/testdata/d2oracle/TestDelete/edge-in-layer.d2,2:4:24-2:5:25",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestDelete/edge-in-layer.d2,2:4:24-2:5:25",
"value": [
{
"string": "x",
"raw_string": "x"
}
]
}
}
]
},
"key_path_index": 0,
"map_key_edge_index": -1
}
],
"attributes": {
"label": {
"value": "x"
},
"labelDimensions": {
"width": 0,
"height": 0
},
"style": {},
"near_key": null,
"shape": {
"value": "rectangle"
},
"direction": {
"value": ""
},
"constraint": null
},
"zIndex": 0
},
{
"id": "a",
"id_val": "a",
"references": [
{
"key": {
"range": "d2/testdata/d2oracle/TestDelete/edge-in-layer.d2,3:6:35-3:7:36",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestDelete/edge-in-layer.d2,3:6:35-3:7:36",
"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/d2oracle/TestDelete/edge-in-layer.d2,3:11:40-3:12:41",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestDelete/edge-in-layer.d2,3:11:40-3:12:41",
"value": [
{
"string": "b",
"raw_string": "b"
}
]
}
}
]
},
"key_path_index": 0,
"map_key_edge_index": 0
}
],
"attributes": {
"label": {
"value": "b"
},
"labelDimensions": {
"width": 0,
"height": 0
},
"style": {},
"near_key": null,
"shape": {
"value": "rectangle"
},
"direction": {
"value": ""
},
"constraint": null
},
"zIndex": 0
}
]
}
]
},
"err": "<nil>"
}

279
testdata/d2oracle/TestDelete/edge-out-layer.exp.json generated vendored Normal file
View file

@ -0,0 +1,279 @@
{
"graph": {
"name": "",
"isFolderOnly": false,
"ast": {
"range": "d2/testdata/d2oracle/TestDelete/edge-out-layer.d2,0:0:0-3:0:16",
"nodes": [
{
"map_key": {
"range": "d2/testdata/d2oracle/TestDelete/edge-out-layer.d2,0:0:0-2:1:15",
"key": {
"range": "d2/testdata/d2oracle/TestDelete/edge-out-layer.d2,0:0:0-0:1:1",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestDelete/edge-out-layer.d2,0:0:0-0:1:1",
"value": [
{
"string": "x",
"raw_string": "x"
}
]
}
}
]
},
"primary": {},
"value": {
"map": {
"range": "d2/testdata/d2oracle/TestDelete/edge-out-layer.d2,0:3:3-2:1:15",
"nodes": [
{
"map_key": {
"range": "d2/testdata/d2oracle/TestDelete/edge-out-layer.d2,1:2:7-1:8:13",
"edges": [
{
"range": "d2/testdata/d2oracle/TestDelete/edge-out-layer.d2,1:2:7-1:8:13",
"src": {
"range": "d2/testdata/d2oracle/TestDelete/edge-out-layer.d2,1:2:7-1:3:8",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestDelete/edge-out-layer.d2,1:2:7-1:3:8",
"value": [
{
"string": "a",
"raw_string": "a"
}
]
}
}
]
},
"src_arrow": "",
"dst": {
"range": "d2/testdata/d2oracle/TestDelete/edge-out-layer.d2,1:7:12-1:8:13",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestDelete/edge-out-layer.d2,1:7:12-1:8:13",
"value": [
{
"string": "b",
"raw_string": "b"
}
]
}
}
]
},
"dst_arrow": ">"
}
],
"primary": {},
"value": {}
}
}
]
}
}
}
}
]
},
"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": [
{
"index": 0,
"isCurve": false,
"src_arrow": false,
"dst_arrow": true,
"references": [
{
"map_key_edge_index": 0
}
],
"attributes": {
"label": {
"value": ""
},
"labelDimensions": {
"width": 0,
"height": 0
},
"style": {},
"near_key": null,
"shape": {
"value": ""
},
"direction": {
"value": ""
},
"constraint": null
},
"zIndex": 0
}
],
"objects": [
{
"id": "x",
"id_val": "x",
"references": [
{
"key": {
"range": "d2/testdata/d2oracle/TestDelete/edge-out-layer.d2,0:0:0-0:1:1",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestDelete/edge-out-layer.d2,0:0:0-0:1:1",
"value": [
{
"string": "x",
"raw_string": "x"
}
]
}
}
]
},
"key_path_index": 0,
"map_key_edge_index": -1
}
],
"attributes": {
"label": {
"value": "x"
},
"labelDimensions": {
"width": 0,
"height": 0
},
"style": {},
"near_key": null,
"shape": {
"value": "rectangle"
},
"direction": {
"value": ""
},
"constraint": null
},
"zIndex": 0
},
{
"id": "a",
"id_val": "a",
"references": [
{
"key": {
"range": "d2/testdata/d2oracle/TestDelete/edge-out-layer.d2,1:2:7-1:3:8",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestDelete/edge-out-layer.d2,1:2:7-1:3:8",
"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/d2oracle/TestDelete/edge-out-layer.d2,1:7:12-1:8:13",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestDelete/edge-out-layer.d2,1:7:12-1:8:13",
"value": [
{
"string": "b",
"raw_string": "b"
}
]
}
}
]
},
"key_path_index": 0,
"map_key_edge_index": 0
}
],
"attributes": {
"label": {
"value": "b"
},
"labelDimensions": {
"width": 0,
"height": 0
},
"style": {},
"near_key": null,
"shape": {
"value": "rectangle"
},
"direction": {
"value": ""
},
"constraint": null
},
"zIndex": 0
}
]
},
"err": "<nil>"
}