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

Merge pull request #2174 from alixander/create-board-api-2

Browse source 
better detection of empty boards
This commit is contained in:
Alexander Wang 2024-10-23 17:55:25 -06:00 committed by GitHub
commit efd401a2e1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 518 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
d2compiler/compile.go
View file

@ -114,8 +114,9 @@ func (c *compiler) compileBoardsField(g *d2graph.Graph, ir *d2ir.Map, fieldName
return return
} }
for _, f := range boards.Map().Fields { for _, f := range boards.Map().Fields {
m := f.Map()
if f.Map() == nil { if f.Map() == nil {
continue m = &d2ir.Map{}
} }
if g.GetBoard(f.Name) != nil { if g.GetBoard(f.Name) != nil {
c.errorf(f.References[0].AST(), "board name %v already used by another board", f.Name) c.errorf(f.References[0].AST(), "board name %v already used by another board", f.Name)
@ -123,11 +124,11 @@ func (c *compiler) compileBoardsField(g *d2graph.Graph, ir *d2ir.Map, fieldName
} }
g2 := d2graph.NewGraph() g2 := d2graph.NewGraph()
g2.Parent = g g2.Parent = g
g2.AST = f.Map().AST().(*d2ast.Map) g2.AST = m.AST().(*d2ast.Map)
if g.BaseAST != nil { if g.BaseAST != nil {
g2.BaseAST = findFieldAST(g.BaseAST, f) g2.BaseAST = findFieldAST(g.BaseAST, f)
} }
c.compileBoard(g2, f.Map()) c.compileBoard(g2, m)
g2.Name = f.Name g2.Name = f.Name
switch fieldName { switch fieldName {
case "layers": case "layers":

21
d2oracle/edit_test.go
View file

@ -543,6 +543,27 @@ layers: {
} }
} }
} }
`,
},
{
name: "add_layer/4",
text: `b
layers: {
c
}
`,
key: `d`,
boardPath: []string{"c"},
expKey: `d`,
exp: `b
layers: {
c: {
d
}
}
`, `,
}, },
{ {

39
testdata/d2compiler/TestCompile2/boards/isFolderOnly.exp.json generated vendored
View file

@ -257,6 +257,10 @@
"raw_string": "one two three" "raw_string": "one two three"
} }
] ]
},
"map": {
"range": ",1:0:0-1:0:0",
"nodes": null
} }
} }
} }
@ -968,6 +972,41 @@
}, },
"zIndex": 0 "zIndex": 0
} }
],
"steps": [
{
"name": "missus",
"isFolderOnly": true,
"ast": {
"range": ",0:0:0-1:0:0",
"nodes": null
},
"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
}
] ]
} }
] ]

42
testdata/d2oracle/TestCreate/add_layer/1.exp.json generated vendored
View file

@ -72,7 +72,12 @@
] ]
}, },
"primary": {}, "primary": {},
"value": {} "value": {
"map": {
"range": ",1:0:0-1:0:0",
"nodes": null
}
}
} }
} }
] ]
@ -152,6 +157,41 @@
}, },
"zIndex": 0 "zIndex": 0
} }
],
"layers": [
{
"name": "c",
"isFolderOnly": true,
"ast": {
"range": ",0:0:0-1:0:0",
"nodes": null
},
"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
}
] ]
}, },
"err": "<nil>" "err": "<nil>"

40
testdata/d2oracle/TestCreate/add_layer/2.exp.json generated vendored
View file

@ -124,7 +124,12 @@
] ]
}, },
"primary": {}, "primary": {},
"value": {} "value": {
"map": {
"range": ",1:0:0-1:0:0",
"nodes": null
}
}
} }
} }
] ]
@ -307,6 +312,39 @@
"zIndex": 0 "zIndex": 0
} }
] ]
},
{
"name": "b",
"isFolderOnly": true,
"ast": {
"range": ",0:0:0-1:0:0",
"nodes": null
},
"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
} }
] ]
}, },

42
testdata/d2oracle/TestCreate/add_layer/3.exp.json generated vendored
View file

@ -143,7 +143,12 @@
] ]
}, },
"primary": {}, "primary": {},
"value": {} "value": {
"map": {
"range": ",1:0:0-1:0:0",
"nodes": null
}
}
} }
} }
] ]
@ -385,6 +390,41 @@
}, },
"zIndex": 0 "zIndex": 0
} }
],
"layers": [
{
"name": "c",
"isFolderOnly": true,
"ast": {
"range": ",0:0:0-1:0:0",
"nodes": null
},
"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
}
] ]
} }
] ]

291
testdata/d2oracle/TestCreate/add_layer/4.exp.json generated vendored Normal file
View file

@ -0,0 +1,291 @@
{
"graph": {
"name": "",
"isFolderOnly": false,
"ast": {
"range": "d2/testdata/d2oracle/TestCreate/add_layer/4.d2,0:0:0-7:0:32",
"nodes": [
{
"map_key": {
"range": "d2/testdata/d2oracle/TestCreate/add_layer/4.d2,0:0:0-0:1:1",
"key": {
"range": "d2/testdata/d2oracle/TestCreate/add_layer/4.d2,0:0:0-0:1:1",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestCreate/add_layer/4.d2,0:0:0-0:1:1",
"value": [
{
"string": "b",
"raw_string": "b"
}
]
}
}
]
},
"primary": {},
"value": {}
}
},
{
"map_key": {
"range": "d2/testdata/d2oracle/TestCreate/add_layer/4.d2,2:0:3-6:1:31",
"key": {
"range": "d2/testdata/d2oracle/TestCreate/add_layer/4.d2,2:0:3-2:6:9",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestCreate/add_layer/4.d2,2:0:3-2:6:9",
"value": [
{
"string": "layers",
"raw_string": "layers"
}
]
}
}
]
},
"primary": {},
"value": {
"map": {
"range": "d2/testdata/d2oracle/TestCreate/add_layer/4.d2,2:8:11-6:1:31",
"nodes": [
{
"map_key": {
"range": "d2/testdata/d2oracle/TestCreate/add_layer/4.d2,3:2:15-5:3:29",
"key": {
"range": "d2/testdata/d2oracle/TestCreate/add_layer/4.d2,3:2:15-3:3:16",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestCreate/add_layer/4.d2,3:2:15-3:3:16",
"value": [
{
"string": "c",
"raw_string": "c"
}
]
}
}
]
},
"primary": {},
"value": {
"map": {
"range": "d2/testdata/d2oracle/TestCreate/add_layer/4.d2,3:5:18-5:3:29",
"nodes": [
{
"map_key": {
"range": "d2/testdata/d2oracle/TestCreate/add_layer/4.d2,4:4:24-4:5:25",
"key": {
"range": "d2/testdata/d2oracle/TestCreate/add_layer/4.d2,4:4:24-4:5:25",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestCreate/add_layer/4.d2,4:4:24-4:5:25",
"value": [
{
"string": "d",
"raw_string": "d"
}
]
}
}
]
},
"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": [
{
"id": "b",
"id_val": "b",
"references": [
{
"key": {
"range": "d2/testdata/d2oracle/TestCreate/add_layer/4.d2,0:0:0-0:1:1",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestCreate/add_layer/4.d2,0:0:0-0:1:1",
"value": [
{
"string": "b",
"raw_string": "b"
}
]
}
}
]
},
"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
}
],
"layers": [
{
"name": "c",
"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": "d"
}
]
}
}
]
},
"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": [
{
"id": "d",
"id_val": "d",
"references": [
{
"key": {
"range": "d2/testdata/d2oracle/TestCreate/add_layer/4.d2,4:4:24-4:5:25",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestCreate/add_layer/4.d2,4:4:24-4:5:25",
"value": [
{
"string": "d",
"raw_string": "d"
}
]
}
}
]
},
"key_path_index": 0,
"map_key_edge_index": -1
}
],
"attributes": {
"label": {
"value": "d"
},
"labelDimensions": {
"width": 0,
"height": 0
},
"style": {},
"near_key": null,
"shape": {
"value": "rectangle"
},
"direction": {
"value": ""
},
"constraint": null
},
"zIndex": 0
}
]
}
]
},
"err": "<nil>"
}

44
testdata/d2oracle/TestDelete/delete-layer-obj.exp.json generated vendored
View file

@ -49,7 +49,12 @@
] ]
}, },
"primary": {}, "primary": {},
"value": {} "value": {
"map": {
"range": ",1:0:0-1:0:0",
"nodes": null
}
}
} }
} }
] ]
@ -83,7 +88,42 @@
"zIndex": 0 "zIndex": 0
}, },
"edges": null, "edges": null,
"objects": null "objects": null,
"layers": [
{
"name": "x",
"isFolderOnly": true,
"ast": {
"range": ",0:0:0-1:0:0",
"nodes": null
},
"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
}
]
}, },
"err": "<nil>" "err": "<nil>"
} }