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

d2oracle fix imports

Browse source
This commit is contained in:
Alexander Wang 2023-08-05 13:25:30 -07:00
parent 31bf8d7b66
commit e7a6a356ce
No known key found for this signature in database
GPG key ID: D89FA31966BDBECE
5 changed files with 586 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
d2oracle/edit.go
View file

@ -559,6 +559,12 @@ func _set(g *d2graph.Graph, baseAST *d2ast.Map, key string, tag, value *string)
if reserved {
inlined := func(s *d2graph.Scalar) bool {
if s != nil && s.MapKey != nil {
// The value was set outside of what's writeable
if s.MapKey.Range.Path != baseAST.Range.Path {
return false
}
}
return s != nil && s.MapKey != nil && !ir.InClass(s.MapKey)
}
reservedIndex := toSkip - 1

47
d2oracle/edit_test.go
View file

@ -2011,6 +2011,53 @@ scenarios: {
y
style.stroke: red
}
`,
},
{
name: "import/2",
text: `x: {
...@meow.x
y
}
`,
fsTexts: map[string]string{
"meow": `x: {
style.fill: blue
}
`,
},
key: `x.style.fill`,
value: go2.Pointer(`red`),
exp: `x: {
...@meow.x
y
style.fill: red
}
`,
},
{
name: "import/3",
text: `x: {
...@meow.x
y
style.fill: red
}
`,
fsTexts: map[string]string{
"meow": `x: {
style.fill: blue
}
`,
},
key: `x.style.fill`,
value: go2.Pointer(`yellow`),
exp: `x: {
...@meow.x
y
style.fill: yellow
}
`,
},
}

18
d2oracle/get.go
View file

@ -15,17 +15,29 @@ func GetBoardGraph(g *d2graph.Graph, boardPath []string) *d2graph.Graph {
}
for i, b := range g.Layers {
if b.Name == boardPath[0] {
return GetBoardGraph(g.Layers[i], boardPath[1:])
g2 := GetBoardGraph(g.Layers[i], boardPath[1:])
if g2 != nil {
g2.FS = g.FS
}
return g2
}
}
for i, b := range g.Scenarios {
if b.Name == boardPath[0] {
return GetBoardGraph(g.Scenarios[i], boardPath[1:])
g2 := GetBoardGraph(g.Scenarios[i], boardPath[1:])
if g2 != nil {
g2.FS = g.FS
}
return g2
}
}
for i, b := range g.Steps {
if b.Name == boardPath[0] {
return GetBoardGraph(g.Steps[i], boardPath[1:])
g2 := GetBoardGraph(g.Steps[i], boardPath[1:])
if g2 != nil {
g2.FS = g.FS
}
return g2
}
}
return nil

259
testdata/d2oracle/TestSet/import/2.exp.json generated vendored Normal file
View file

@ -0,0 +1,259 @@
{
"graph": {
"name": "",
"isFolderOnly": false,
"ast": {
"range": "d2/testdata/d2oracle/TestSet/import/2.d2,0:0:0-5:0:42",
"nodes": [
{
"map_key": {
"range": "d2/testdata/d2oracle/TestSet/import/2.d2,0:0:0-4:1:41",
"key": {
"range": "d2/testdata/d2oracle/TestSet/import/2.d2,0:0:0-0:1:1",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestSet/import/2.d2,0:0:0-0:1:1",
"value": [
{
"string": "x",
"raw_string": "x"
}
]
}
}
]
},
"primary": {},
"value": {
"map": {
"range": "d2/testdata/d2oracle/TestSet/import/2.d2,0:3:3-4:1:41",
"nodes": [
{
"import": {
"range": "d2/testdata/d2oracle/TestSet/import/2.d2,1:2:7-1:12:17",
"spread": true,
"pre": "",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestSet/import/2.d2,1:6:11-1:10:15",
"value": [
{
"string": "meow",
"raw_string": "meow"
}
]
}
},
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestSet/import/2.d2,1:11:16-1:12:17",
"value": [
{
"string": "x",
"raw_string": "x"
}
]
}
}
]
}
},
{
"map_key": {
"range": "d2/testdata/d2oracle/TestSet/import/2.d2,2:2:20-2:3:21",
"key": {
"range": "d2/testdata/d2oracle/TestSet/import/2.d2,2:2:20-2:3:21",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestSet/import/2.d2,2:2:20-2:3:21",
"value": [
{
"string": "y",
"raw_string": "y"
}
]
}
}
]
},
"primary": {},
"value": {}
}
},
{
"map_key": {
"range": "d2/testdata/d2oracle/TestSet/import/2.d2,3:2:24-3:17:39",
"key": {
"range": "d2/testdata/d2oracle/TestSet/import/2.d2,3:2:24-3:12:34",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestSet/import/2.d2,3:2:24-3:7:29",
"value": [
{
"string": "style",
"raw_string": "style"
}
]
}
},
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestSet/import/2.d2,3:8:30-3:12:34",
"value": [
{
"string": "fill",
"raw_string": "fill"
}
]
}
}
]
},
"primary": {},
"value": {
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestSet/import/2.d2,3:14:36-3:17:39",
"value": [
{
"string": "red",
"raw_string": "red"
}
]
}
}
}
}
]
}
}
}
}
]
},
"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/TestSet/import/2.d2,0:0:0-0:1:1",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestSet/import/2.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": {
"fill": {
"value": "red"
}
},
"near_key": null,
"shape": {
"value": "rectangle"
},
"direction": {
"value": ""
},
"constraint": null
},
"zIndex": 0
},
{
"id": "y",
"id_val": "y",
"references": [
{
"key": {
"range": "d2/testdata/d2oracle/TestSet/import/2.d2,2:2:20-2:3:21",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestSet/import/2.d2,2:2:20-2:3:21",
"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>"
}

259
testdata/d2oracle/TestSet/import/3.exp.json generated vendored Normal file
View file

@ -0,0 +1,259 @@
{
"graph": {
"name": "",
"isFolderOnly": false,
"ast": {
"range": "d2/testdata/d2oracle/TestSet/import/3.d2,0:0:0-5:0:45",
"nodes": [
{
"map_key": {
"range": "d2/testdata/d2oracle/TestSet/import/3.d2,0:0:0-4:1:44",
"key": {
"range": "d2/testdata/d2oracle/TestSet/import/3.d2,0:0:0-0:1:1",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestSet/import/3.d2,0:0:0-0:1:1",
"value": [
{
"string": "x",
"raw_string": "x"
}
]
}
}
]
},
"primary": {},
"value": {
"map": {
"range": "d2/testdata/d2oracle/TestSet/import/3.d2,0:3:3-4:1:44",
"nodes": [
{
"import": {
"range": "d2/testdata/d2oracle/TestSet/import/3.d2,1:2:7-1:12:17",
"spread": true,
"pre": "",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestSet/import/3.d2,1:6:11-1:10:15",
"value": [
{
"string": "meow",
"raw_string": "meow"
}
]
}
},
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestSet/import/3.d2,1:11:16-1:12:17",
"value": [
{
"string": "x",
"raw_string": "x"
}
]
}
}
]
}
},
{
"map_key": {
"range": "d2/testdata/d2oracle/TestSet/import/3.d2,2:2:20-2:3:21",
"key": {
"range": "d2/testdata/d2oracle/TestSet/import/3.d2,2:2:20-2:3:21",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestSet/import/3.d2,2:2:20-2:3:21",
"value": [
{
"string": "y",
"raw_string": "y"
}
]
}
}
]
},
"primary": {},
"value": {}
}
},
{
"map_key": {
"range": "d2/testdata/d2oracle/TestSet/import/3.d2,3:2:24-3:20:42",
"key": {
"range": "d2/testdata/d2oracle/TestSet/import/3.d2,3:2:24-3:12:34",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestSet/import/3.d2,3:2:24-3:7:29",
"value": [
{
"string": "style",
"raw_string": "style"
}
]
}
},
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestSet/import/3.d2,3:8:30-3:12:34",
"value": [
{
"string": "fill",
"raw_string": "fill"
}
]
}
}
]
},
"primary": {},
"value": {
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestSet/import/3.d2,3:14:36-3:20:42",
"value": [
{
"string": "yellow",
"raw_string": "yellow"
}
]
}
}
}
}
]
}
}
}
}
]
},
"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/TestSet/import/3.d2,0:0:0-0:1:1",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestSet/import/3.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": {
"fill": {
"value": "yellow"
}
},
"near_key": null,
"shape": {
"value": "rectangle"
},
"direction": {
"value": ""
},
"constraint": null
},
"zIndex": 0
},
{
"id": "y",
"id_val": "y",
"references": [
{
"key": {
"range": "d2/testdata/d2oracle/TestSet/import/3.d2,2:2:20-2:3:21",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestSet/import/3.d2,2:2:20-2:3:21",
"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>"
}