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

fix idval edge case

Browse source
This commit is contained in:
Alexander Wang 2023-06-12 11:26:51 -07:00
parent 90297e1b42
commit 8b8afb2638
No known key found for this signature in database
GPG key ID: D89FA31966BDBECE
4 changed files with 359 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
d2compiler/compile.go
View file

@ -282,8 +282,8 @@ func (c *compiler) compileField(obj *d2graph.Object, f *d2ir.Field) {
Scope: fr.Context.Scope,
}
if fr.Context.ScopeMap != nil {
scopeObjIDA := d2ir.BoardIDA(fr.Context.ScopeMap)
r.ScopeObj = obj.Graph.Root.EnsureChildIDVal(scopeObjIDA)
scopeObjIDA := d2graphIDA(d2ir.BoardIDA(fr.Context.ScopeMap))
r.ScopeObj = obj.Graph.Root.EnsureChild(scopeObjIDA)
}
obj.References = append(obj.References, r)
}
@ -635,8 +635,8 @@ func (c *compiler) compileEdge(obj *d2graph.Object, e *d2ir.Edge) {
Scope: er.Context.Scope,
}
if er.Context.ScopeMap != nil {
scopeObjIDA := d2ir.BoardIDA(er.Context.ScopeMap)
r.ScopeObj = edge.Src.Graph.Root.EnsureChildIDVal(scopeObjIDA)
scopeObjIDA := d2graphIDA(d2ir.BoardIDA(er.Context.ScopeMap))
r.ScopeObj = edge.Src.Graph.Root.EnsureChild(scopeObjIDA)
}
edge.References = append(edge.References, r)
}

14
d2compiler/compile_test.go
View file

@ -315,6 +315,20 @@ containers: {
`,
expErr: `d2/testdata/d2compiler/TestCompile/image_children_Steps.d2:4:3: steps is only allowed at a board root`,
},
{
name: "name-with-dot-underscore",
text: `A: {
_.C
}
"D.E": {
_.C
}
`,
assertions: func(t *testing.T, g *d2graph.Graph) {
tassert.Equal(t, 3, len(g.Objects))
},
},
{
name: "stroke-width",

32
d2graph/d2graph.go
View file

@ -671,38 +671,6 @@ func (obj *Object) HasChild(ids []string) (*Object, bool) {
return child, true
}
// Keep in sync with EnsureChild.
func (obj *Object) EnsureChildIDVal(ids []string) *Object {
if len(ids) == 0 {
return obj
}
if len(ids) == 1 && ids[0] != "style" {
_, ok := ReservedKeywords[ids[0]]
if ok {
return obj
}
}
id := ids[0]
ids = ids[1:]
var child *Object
for _, ch2 := range obj.ChildrenArray {
if ch2.IDVal == id {
child = ch2
break
}
}
if child == nil {
child = obj.newObject(id)
}
if len(ids) >= 1 {
return child.EnsureChildIDVal(ids)
}
return child
}
func (obj *Object) HasEdge(mk *d2ast.Key) (*Edge, bool) {
ea, ok := obj.FindEdges(mk)
if !ok {

341
testdata/d2compiler/TestCompile/name-with-dot-underscore.exp.json generated vendored Normal file
View file

@ -0,0 +1,341 @@
{
"graph": {
"name": "",
"isFolderOnly": false,
"ast": {
"range": "d2/testdata/d2compiler/TestCompile/name-with-dot-underscore.d2,0:0:0-7:0:31",
"nodes": [
{
"map_key": {
"range": "d2/testdata/d2compiler/TestCompile/name-with-dot-underscore.d2,0:0:0-2:1:12",
"key": {
"range": "d2/testdata/d2compiler/TestCompile/name-with-dot-underscore.d2,0:0:0-0:1:1",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2compiler/TestCompile/name-with-dot-underscore.d2,0:0:0-0:1:1",
"value": [
{
"string": "A",
"raw_string": "A"
}
]
}
}
]
},
"primary": {},
"value": {
"map": {
"range": "d2/testdata/d2compiler/TestCompile/name-with-dot-underscore.d2,0:3:3-2:1:12",
"nodes": [
{
"map_key": {
"range": "d2/testdata/d2compiler/TestCompile/name-with-dot-underscore.d2,1:2:7-1:5:10",
"key": {
"range": "d2/testdata/d2compiler/TestCompile/name-with-dot-underscore.d2,1:2:7-1:5:10",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2compiler/TestCompile/name-with-dot-underscore.d2,1:2:7-1:3:8",
"value": [
{
"string": "_",
"raw_string": "_"
}
]
}
},
{
"unquoted_string": {
"range": "d2/testdata/d2compiler/TestCompile/name-with-dot-underscore.d2,1:4:9-1:5:10",
"value": [
{
"string": "C",
"raw_string": "C"
}
]
}
}
]
},
"primary": {},
"value": {}
}
}
]
}
}
}
},
{
"map_key": {
"range": "d2/testdata/d2compiler/TestCompile/name-with-dot-underscore.d2,4:0:14-6:1:30",
"key": {
"range": "d2/testdata/d2compiler/TestCompile/name-with-dot-underscore.d2,4:0:14-4:5:19",
"path": [
{
"double_quoted_string": {
"range": "d2/testdata/d2compiler/TestCompile/name-with-dot-underscore.d2,4:0:14-4:5:19",
"value": [
{
"string": "D.E",
"raw_string": "D.E"
}
]
}
}
]
},
"primary": {},
"value": {
"map": {
"range": "d2/testdata/d2compiler/TestCompile/name-with-dot-underscore.d2,4:7:21-6:1:30",
"nodes": [
{
"map_key": {
"range": "d2/testdata/d2compiler/TestCompile/name-with-dot-underscore.d2,5:2:25-5:5:28",
"key": {
"range": "d2/testdata/d2compiler/TestCompile/name-with-dot-underscore.d2,5:2:25-5:5:28",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2compiler/TestCompile/name-with-dot-underscore.d2,5:2:25-5:3:26",
"value": [
{
"string": "_",
"raw_string": "_"
}
]
}
},
{
"unquoted_string": {
"range": "d2/testdata/d2compiler/TestCompile/name-with-dot-underscore.d2,5:4:27-5:5:28",
"value": [
{
"string": "C",
"raw_string": "C"
}
]
}
}
]
},
"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": "A",
"id_val": "A",
"references": [
{
"key": {
"range": "d2/testdata/d2compiler/TestCompile/name-with-dot-underscore.d2,0:0:0-0:1:1",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2compiler/TestCompile/name-with-dot-underscore.d2,0:0:0-0:1:1",
"value": [
{
"string": "A",
"raw_string": "A"
}
]
}
}
]
},
"key_path_index": 0,
"map_key_edge_index": -1
}
],
"attributes": {
"label": {
"value": "A"
},
"labelDimensions": {
"width": 0,
"height": 0
},
"style": {},
"near_key": null,
"shape": {
"value": "rectangle"
},
"direction": {
"value": ""
},
"constraint": null
},
"zIndex": 0
},
{
"id": "C",
"id_val": "C",
"references": [
{
"key": {
"range": "d2/testdata/d2compiler/TestCompile/name-with-dot-underscore.d2,1:2:7-1:5:10",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2compiler/TestCompile/name-with-dot-underscore.d2,1:2:7-1:3:8",
"value": [
{
"string": "_",
"raw_string": "_"
}
]
}
},
{
"unquoted_string": {
"range": "d2/testdata/d2compiler/TestCompile/name-with-dot-underscore.d2,1:4:9-1:5:10",
"value": [
{
"string": "C",
"raw_string": "C"
}
]
}
}
]
},
"key_path_index": 1,
"map_key_edge_index": -1
},
{
"key": {
"range": "d2/testdata/d2compiler/TestCompile/name-with-dot-underscore.d2,5:2:25-5:5:28",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2compiler/TestCompile/name-with-dot-underscore.d2,5:2:25-5:3:26",
"value": [
{
"string": "_",
"raw_string": "_"
}
]
}
},
{
"unquoted_string": {
"range": "d2/testdata/d2compiler/TestCompile/name-with-dot-underscore.d2,5:4:27-5:5:28",
"value": [
{
"string": "C",
"raw_string": "C"
}
]
}
}
]
},
"key_path_index": 1,
"map_key_edge_index": -1
}
],
"attributes": {
"label": {
"value": "C"
},
"labelDimensions": {
"width": 0,
"height": 0
},
"style": {},
"near_key": null,
"shape": {
"value": "rectangle"
},
"direction": {
"value": ""
},
"constraint": null
},
"zIndex": 0
},
{
"id": "\"D.E\"",
"id_val": "D.E",
"references": [
{
"key": {
"range": "d2/testdata/d2compiler/TestCompile/name-with-dot-underscore.d2,4:0:14-4:5:19",
"path": [
{
"double_quoted_string": {
"range": "d2/testdata/d2compiler/TestCompile/name-with-dot-underscore.d2,4:0:14-4:5:19",
"value": [
{
"string": "D.E",
"raw_string": "D.E"
}
]
}
}
]
},
"key_path_index": 0,
"map_key_edge_index": -1
}
],
"attributes": {
"label": {
"value": "D.E"
},
"labelDimensions": {
"width": 0,
"height": 0
},
"style": {},
"near_key": null,
"shape": {
"value": "rectangle"
},
"direction": {
"value": ""
},
"constraint": null
},
"zIndex": 0
}
]
},
"err": null
}