d2oracle:fix nested scenario

This commit is contained in:
Alexander Wang 2024-06-02 20:31:42 -07:00
parent abc03ae616
commit 613980ef69
No known key found for this signature in database
GPG key ID: BE3937D0D52D8927
4 changed files with 2219 additions and 7 deletions

View file

@ -69,6 +69,7 @@ func compileIR(ast *d2ast.Map, m *d2ir.Map) (*d2graph.Graph, error) {
g := d2graph.NewGraph()
g.AST = ast
g.BaseAST = ast
c.compileBoard(g, m)
if len(c.err.Errors) > 0 {
return nil, c.err
@ -122,7 +123,7 @@ func (c *compiler) compileBoardsField(g *d2graph.Graph, ir *d2ir.Map, fieldName
g2 := d2graph.NewGraph()
g2.Parent = g
g2.AST = f.Map().AST().(*d2ast.Map)
g2.BaseAST = findFieldAST(g.AST, f)
g2.BaseAST = findFieldAST(g.BaseAST, f)
c.compileBoard(g2, f.Map())
g2.Name = f.Name
switch fieldName {

View file

@ -2521,20 +2521,44 @@ x -> a.b -> a.b.c
`,
},
{
name: "scenario-grandchild",
name: "scenario-child",
text: `a -> b
scenarios: {
x: {
scenarios: {
c: {
(a -> b)[0].style.bold: true
}
}
hi
}
}
`,
key: `(a -> b)[0].style.stroke-width`,
value: go2.Pointer(`3`),
boardPath: []string{"x"},
exp: `a -> b
scenarios: {
x: {
hi
(a -> b)[0].style.stroke-width: 3
}
}
`,
},
{
name: "scenario-grandchild",
text: `a -> b
scenarios: {
x: {
scenarios: {
c: {
(a -> b)[0].style.bold: true
}
}
}
}
`,
key: `(a -> b)[0].style.stroke-width`,
value: go2.Pointer(`3`),
boardPath: []string{"x", "c"},

792
testdata/d2oracle/TestSet/scenario-child.exp.json generated vendored Normal file
View file

@ -0,0 +1,792 @@
{
"graph": {
"name": "",
"isFolderOnly": false,
"ast": {
"range": "d2/testdata/d2oracle/TestSet/scenario-child.d2,0:0:0-8:0:79",
"nodes": [
{
"map_key": {
"range": "d2/testdata/d2oracle/TestSet/scenario-child.d2,0:0:0-0:6:6",
"edges": [
{
"range": "d2/testdata/d2oracle/TestSet/scenario-child.d2,0:0:0-0:6:6",
"src": {
"range": "d2/testdata/d2oracle/TestSet/scenario-child.d2,0:0:0-0:1:1",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestSet/scenario-child.d2,0:0:0-0:1:1",
"value": [
{
"string": "a",
"raw_string": "a"
}
]
}
}
]
},
"src_arrow": "",
"dst": {
"range": "d2/testdata/d2oracle/TestSet/scenario-child.d2,0:5:5-0:6:6",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestSet/scenario-child.d2,0:5:5-0:6:6",
"value": [
{
"string": "b",
"raw_string": "b"
}
]
}
}
]
},
"dst_arrow": ">"
}
],
"primary": {},
"value": {}
}
},
{
"map_key": {
"range": "d2/testdata/d2oracle/TestSet/scenario-child.d2,2:0:8-7:1:78",
"key": {
"range": "d2/testdata/d2oracle/TestSet/scenario-child.d2,2:0:8-2:9:17",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestSet/scenario-child.d2,2:0:8-2:9:17",
"value": [
{
"string": "scenarios",
"raw_string": "scenarios"
}
]
}
}
]
},
"primary": {},
"value": {
"map": {
"range": "d2/testdata/d2oracle/TestSet/scenario-child.d2,2:11:19-7:1:78",
"nodes": [
{
"map_key": {
"range": "d2/testdata/d2oracle/TestSet/scenario-child.d2,3:2:23-6:3:76",
"key": {
"range": "d2/testdata/d2oracle/TestSet/scenario-child.d2,3:2:23-3:3:24",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestSet/scenario-child.d2,3:2:23-3:3:24",
"value": [
{
"string": "x",
"raw_string": "x"
}
]
}
}
]
},
"primary": {},
"value": {
"map": {
"range": "d2/testdata/d2oracle/TestSet/scenario-child.d2,3:5:26-6:3:76",
"nodes": [
{
"map_key": {
"range": "d2/testdata/d2oracle/TestSet/scenario-child.d2,4:4:32-4:6:34",
"key": {
"range": "d2/testdata/d2oracle/TestSet/scenario-child.d2,4:4:32-4:6:34",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestSet/scenario-child.d2,4:4:32-4:6:34",
"value": [
{
"string": "hi",
"raw_string": "hi"
}
]
}
}
]
},
"primary": {},
"value": {}
}
},
{
"map_key": {
"range": "d2/testdata/d2oracle/TestSet/scenario-child.d2,5:4:39-5:37:72",
"edges": [
{
"range": "d2/testdata/d2oracle/TestSet/scenario-child.d2,5:5:40-5:11:46",
"src": {
"range": "d2/testdata/d2oracle/TestSet/scenario-child.d2,5:5:40-5:6:41",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestSet/scenario-child.d2,5:5:40-5:6:41",
"value": [
{
"string": "a",
"raw_string": "a"
}
]
}
}
]
},
"src_arrow": "",
"dst": {
"range": "d2/testdata/d2oracle/TestSet/scenario-child.d2,5:10:45-5:11:46",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestSet/scenario-child.d2,5:10:45-5:11:46",
"value": [
{
"string": "b",
"raw_string": "b"
}
]
}
}
]
},
"dst_arrow": ">"
}
],
"edge_index": {
"range": "d2/testdata/d2oracle/TestSet/scenario-child.d2,5:12:47-5:15:50",
"int": 0,
"glob": false
},
"edge_key": {
"range": "d2/testdata/d2oracle/TestSet/scenario-child.d2,5:16:51-5:34:69",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestSet/scenario-child.d2,5:16:51-5:21:56",
"value": [
{
"string": "style",
"raw_string": "style"
}
]
}
},
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestSet/scenario-child.d2,5:22:57-5:34:69",
"value": [
{
"string": "stroke-width",
"raw_string": "stroke-width"
}
]
}
}
]
},
"primary": {},
"value": {
"number": {
"range": "d2/testdata/d2oracle/TestSet/scenario-child.d2,5:36:71-5:37:72",
"raw": "3",
"value": "3"
}
}
}
}
]
}
}
}
}
]
}
}
}
}
]
},
"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": "a",
"id_val": "a",
"references": [
{
"key": {
"range": "d2/testdata/d2oracle/TestSet/scenario-child.d2,0:0:0-0:1:1",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestSet/scenario-child.d2,0:0:0-0:1:1",
"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/TestSet/scenario-child.d2,0:5:5-0:6:6",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestSet/scenario-child.d2,0:5:5-0:6:6",
"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
}
],
"scenarios": [
{
"name": "x",
"isFolderOnly": false,
"ast": {
"range": ",0:0:0-1: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",
"key": {
"range": ",0:0:0-0:0:0",
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"value": [
{
"string": "hi"
}
]
}
}
]
},
"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": {
"map": {
"range": ",0:0:0-1: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": "style"
}
]
}
}
]
},
"primary": {},
"value": {
"map": {
"range": ",0:0:0-1: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": "stroke-width"
}
]
}
}
]
},
"primary": {
"number": {
"range": "d2/testdata/d2oracle/TestSet/scenario-child.d2,5:36:71-5:37:72",
"raw": "3",
"value": "3"
}
},
"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
},
{
"map_key_edge_index": 0
}
],
"attributes": {
"label": {
"value": ""
},
"labelDimensions": {
"width": 0,
"height": 0
},
"style": {
"strokeWidth": {
"value": "3"
}
},
"near_key": null,
"shape": {
"value": ""
},
"direction": {
"value": ""
},
"constraint": null
},
"zIndex": 0
}
],
"objects": [
{
"id": "a",
"id_val": "a",
"references": [
{
"key": {
"range": "d2/testdata/d2oracle/TestSet/scenario-child.d2,0:0:0-0:1:1",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestSet/scenario-child.d2,0:0:0-0:1:1",
"value": [
{
"string": "a",
"raw_string": "a"
}
]
}
}
]
},
"key_path_index": 0,
"map_key_edge_index": 0
},
{
"key": {
"range": "d2/testdata/d2oracle/TestSet/scenario-child.d2,5:5:40-5:6:41",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestSet/scenario-child.d2,5:5:40-5:6:41",
"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/TestSet/scenario-child.d2,0:5:5-0:6:6",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestSet/scenario-child.d2,0:5:5-0:6:6",
"value": [
{
"string": "b",
"raw_string": "b"
}
]
}
}
]
},
"key_path_index": 0,
"map_key_edge_index": 0
},
{
"key": {
"range": "d2/testdata/d2oracle/TestSet/scenario-child.d2,5:10:45-5:11:46",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestSet/scenario-child.d2,5:10:45-5:11:46",
"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
},
{
"id": "hi",
"id_val": "hi",
"references": [
{
"key": {
"range": "d2/testdata/d2oracle/TestSet/scenario-child.d2,4:4:32-4:6:34",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestSet/scenario-child.d2,4:4:32-4:6:34",
"value": [
{
"string": "hi",
"raw_string": "hi"
}
]
}
}
]
},
"key_path_index": 0,
"map_key_edge_index": -1
}
],
"attributes": {
"label": {
"value": "hi"
},
"labelDimensions": {
"width": 0,
"height": 0
},
"style": {},
"near_key": null,
"shape": {
"value": "rectangle"
},
"direction": {
"value": ""
},
"constraint": null
},
"zIndex": 0
}
]
}
]
},
"err": "<nil>"
}

1395
testdata/d2oracle/TestSet/scenario-grandchild.exp.json generated vendored Normal file

File diff suppressed because it is too large Load diff