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

d2oracle.Delete: do not null non-glob-created edges

Browse source
This commit is contained in:
Alexander Wang 2024-06-05 12:59:21 -06:00
parent f639f6f87f
commit bd7a3d572a
No known key found for this signature in database
GPG key ID: BE3937D0D52D8927
4 changed files with 286 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
d2oracle/edit.go
View file

@ -949,7 +949,10 @@ func Delete(g *d2graph.Graph, boardPath []string, key string) (_ *d2graph.Graph,
for i := len(e.References) - 1; i >= 0; i-- { for i := len(e.References) - 1; i >= 0; i-- {
ref := e.References[i] ref := e.References[i]
deleteEdge(g, ref.Scope, ref.MapKey, ref.MapKeyEdgeIndex) // Leave glob setters alone
if !(ref.MapKey.EdgeIndex != nil && ref.MapKey.EdgeIndex.Glob) {
deleteEdge(g, ref.Scope, ref.MapKey, ref.MapKeyEdgeIndex)
}
} }
edges, ok := obj.FindEdges(mk) edges, ok := obj.FindEdges(mk)

15
d2oracle/edit_test.go
View file

@ -7892,6 +7892,21 @@ layers: {
a a
} }
} }
`,
},
{
name: "edge-with-glob",
text: `x -> y
y
(* -> *)[*].style.opacity: 0.8
`,
key: `(x -> y)[0]`,
exp: `x
y
(* -> *)[*].style.opacity: 0.8
`, `,
}, },
} }

5
d2oracle/get.go
View file

@ -153,11 +153,12 @@ func IsImportedObj(ast *d2ast.Map, obj *d2graph.Object) bool {
return false return false
} }
// Globs count as imported for now // Glob creations count as imported for now
// TODO Probably rename later // TODO Probably rename later
func IsImportedEdge(ast *d2ast.Map, edge *d2graph.Edge) bool { func IsImportedEdge(ast *d2ast.Map, edge *d2graph.Edge) bool {
for _, ref := range edge.References { for _, ref := range edge.References {
if ref.Edge.Src.HasGlob() || ref.Edge.Dst.HasGlob() { // If edge index, the glob is just setting something, not responsible for creating the edge
if (ref.Edge.Src.HasGlob() || ref.Edge.Dst.HasGlob()) && ref.MapKey.EdgeIndex == nil {
return true return true
} }
if ref.Edge.Range.Path != ast.Range.Path { if ref.Edge.Range.Path != ast.Range.Path {

264
testdata/d2oracle/TestDelete/edge-with-glob.exp.json generated vendored Normal file
View file

@ -0,0 +1,264 @@
{
"graph": {
"name": "",
"isFolderOnly": false,
"ast": {
"range": "d2/testdata/d2oracle/TestDelete/edge-with-glob.d2,0:0:0-4:0:36",
"nodes": [
{
"map_key": {
"range": "d2/testdata/d2oracle/TestDelete/edge-with-glob.d2,0:0:0-0:1:1",
"key": {
"range": "d2/testdata/d2oracle/TestDelete/edge-with-glob.d2,0:0:0-0:1:1",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestDelete/edge-with-glob.d2,0:0:0-0:1:1",
"value": [
{
"string": "x",
"raw_string": "x"
}
]
}
}
]
},
"primary": {},
"value": {}
}
},
{
"map_key": {
"range": "d2/testdata/d2oracle/TestDelete/edge-with-glob.d2,1:0:2-1:1:3",
"key": {
"range": "d2/testdata/d2oracle/TestDelete/edge-with-glob.d2,1:0:2-1:1:3",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestDelete/edge-with-glob.d2,1:0:2-1:1:3",
"value": [
{
"string": "y",
"raw_string": "y"
}
]
}
}
]
},
"primary": {},
"value": {}
}
},
{
"map_key": {
"range": "d2/testdata/d2oracle/TestDelete/edge-with-glob.d2,3:0:5-3:30:35",
"edges": [
{
"range": "d2/testdata/d2oracle/TestDelete/edge-with-glob.d2,3:1:6-3:7:12",
"src": {
"range": "d2/testdata/d2oracle/TestDelete/edge-with-glob.d2,3:1:6-3:2:7",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestDelete/edge-with-glob.d2,3:1:6-3:2:7",
"value": [
{
"string": "*",
"raw_string": "*"
}
],
"pattern": [
"*"
]
}
}
]
},
"src_arrow": "",
"dst": {
"range": "d2/testdata/d2oracle/TestDelete/edge-with-glob.d2,3:6:11-3:7:12",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestDelete/edge-with-glob.d2,3:6:11-3:7:12",
"value": [
{
"string": "*",
"raw_string": "*"
}
],
"pattern": [
"*"
]
}
}
]
},
"dst_arrow": ">"
}
],
"edge_index": {
"range": "d2/testdata/d2oracle/TestDelete/edge-with-glob.d2,3:8:13-3:11:16",
"int": null,
"glob": true
},
"edge_key": {
"range": "d2/testdata/d2oracle/TestDelete/edge-with-glob.d2,3:12:17-3:25:30",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestDelete/edge-with-glob.d2,3:12:17-3:17:22",
"value": [
{
"string": "style",
"raw_string": "style"
}
]
}
},
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestDelete/edge-with-glob.d2,3:18:23-3:25:30",
"value": [
{
"string": "opacity",
"raw_string": "opacity"
}
]
}
}
]
},
"primary": {},
"value": {
"number": {
"range": "d2/testdata/d2oracle/TestDelete/edge-with-glob.d2,3:27:32-3:30:35",
"raw": "0.8",
"value": "4/5"
}
}
}
}
]
},
"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": "x",
"id_val": "x",
"references": [
{
"key": {
"range": "d2/testdata/d2oracle/TestDelete/edge-with-glob.d2,0:0:0-0:1:1",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestDelete/edge-with-glob.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": "y",
"id_val": "y",
"references": [
{
"key": {
"range": "d2/testdata/d2oracle/TestDelete/edge-with-glob.d2,1:0:2-1:1:3",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestDelete/edge-with-glob.d2,1:0:2-1:1:3",
"value": [
{
"string": "y",
"raw_string": "y"
}
]
}
}
]
},
"key_path_index": 0,
"map_key_edge_index": -1
}
],
"attributes": {
"label": {
"value": "y"
},
"labelDimensions": {
"width": 0,
"height": 0
},
"style": {},
"near_key": null,
"shape": {
"value": "rectangle"
},
"direction": {
"value": ""
},
"constraint": null
},
"zIndex": 0
}
]
},
"err": "<nil>"
}