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

Merge pull request #1956 from alixander/delete-in-layer

Browse source 
d2oracle: fix delete with near in layer
This commit is contained in:
Alexander Wang 2024-05-29 12:08:26 -06:00 committed by GitHub
commit 94d5ab5d2e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
61 changed files with 630 additions and 132 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
d2ir/d2ir.go
View file

@ -1355,11 +1355,8 @@ func (m *Map) AST() d2ast.Node {
if m == nil {
return nil
}
astMap := &d2ast.Map{}
if m.Root() {
astMap.Range = d2ast.MakeRange(",0:0:0-1:0:0")
} else {
astMap.Range = d2ast.MakeRange(",1:0:0-2:0:0")
astMap := &d2ast.Map{
Range: d2ast.MakeRange(",0:0:0-1:0:0"),
}
for _, f := range m.Fields {
astMap.Nodes = append(astMap.Nodes, d2ast.MakeMapNodeBox(f.AST().(d2ast.MapNode)))

19
d2oracle/edit.go
View file

@ -981,7 +981,10 @@ func Delete(g *d2graph.Graph, boardPath []string, key string) (_ *d2graph.Graph,
return recompile(boardG)
}
prevG, _ := recompile(boardG)
prevG, err := recompile(boardG)
if err != nil {
return nil, err
}
obj, ok := boardG.Root.HasChild(d2graph.Key(mk.Key))
if !ok {
@ -1758,7 +1761,10 @@ func move(g *d2graph.Graph, boardPath []string, key, newKey string, includeDesce
return recompile(g)
}
prevG, _ := recompile(boardG)
prevG, err := recompile(boardG)
if err != nil {
return nil, err
}
ak := d2graph.Key(mk.Key)
ak2 := d2graph.Key(mk2.Key)
@ -2282,8 +2288,17 @@ func updateNear(prevG, g *d2graph.Graph, from, to *string, includeDescendants bo
if len(n.MapKey.Key.Path) == 0 {
continue
}
if len(n.MapKey.Key.Path) > 1 {
if n.MapKey.Key.Path[len(n.MapKey.Key.Path)-2].Unbox().ScalarString() == "label" ||
n.MapKey.Key.Path[len(n.MapKey.Key.Path)-2].Unbox().ScalarString() == "icon" {
continue
}
}
if n.MapKey.Key.Path[len(n.MapKey.Key.Path)-1].Unbox().ScalarString() == "near" {
k := n.MapKey.Value.ScalarBox().Unbox().ScalarString()
if _, ok := d2graph.NearConstants[k]; ok {
continue
}
if strings.EqualFold(k, *from) && to == nil {
deleteFromMap(obj.Map, n.MapKey)
} else {

42
d2oracle/edit_test.go
View file

@ -7794,6 +7794,48 @@ layers: {
}
}
}
`,
},
{
name: "label-near-in-layer",
text: `layers: {
x: {
y: {
label.near: center-center
}
a
}
}
`,
boardPath: []string{"x"},
key: `y`,
exp: `layers: {
x: {
a
}
}
`,
},
{
name: "update-near-in-layer",
text: `layers: {
x: {
y: {
near: a
}
a
}
}
`,
boardPath: []string{"x"},
key: `y`,
exp: `layers: {
x: {
a
}
}
`,
},
}

2
testdata/d2compiler/TestCompile/link-board-key-nested.exp.json generated vendored
View file

@ -296,7 +296,7 @@
"name": "x",
"isFolderOnly": false,
"ast": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {

8
testdata/d2compiler/TestCompile/link-board-mixed.exp.json generated vendored
View file

@ -421,7 +421,7 @@
"name": "cat",
"isFolderOnly": false,
"ast": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {
@ -677,7 +677,7 @@
"name": "green",
"isFolderOnly": false,
"ast": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {
@ -710,7 +710,7 @@
},
"value": {
"map": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {
@ -764,7 +764,7 @@
"primary": {},
"value": {
"map": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {

8
testdata/d2compiler/TestCompile/link-board-nested.exp.json generated vendored
View file

@ -280,7 +280,7 @@
"name": "x",
"isFolderOnly": true,
"ast": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {
@ -303,7 +303,7 @@
"primary": {},
"value": {
"map": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {
@ -326,7 +326,7 @@
"primary": {},
"value": {
"map": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {
@ -392,7 +392,7 @@
"name": "x",
"isFolderOnly": false,
"ast": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {

2
testdata/d2compiler/TestCompile/link-board-ok.exp.json generated vendored
View file

@ -222,7 +222,7 @@
"name": "x",
"isFolderOnly": false,
"ast": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {

16
testdata/d2compiler/TestCompile/link-board-underscore.exp.json generated vendored
View file

@ -333,7 +333,7 @@
"name": "x",
"isFolderOnly": false,
"ast": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {
@ -378,7 +378,7 @@
"primary": {},
"value": {
"map": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {
@ -401,7 +401,7 @@
"primary": {},
"value": {
"map": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {
@ -424,7 +424,7 @@
"primary": {},
"value": {
"map": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {
@ -483,7 +483,7 @@
"primary": {},
"value": {
"map": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {
@ -609,7 +609,7 @@
"name": "x",
"isFolderOnly": false,
"ast": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {
@ -632,7 +632,7 @@
"primary": {},
"value": {
"map": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {
@ -691,7 +691,7 @@
"primary": {},
"value": {
"map": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {

2
testdata/d2compiler/TestCompile2/boards/isFolderOnly-shapes.exp.json generated vendored
View file

@ -151,7 +151,7 @@
"name": "1",
"isFolderOnly": false,
"ast": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {

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

@ -318,7 +318,7 @@
"name": "one",
"isFolderOnly": false,
"ast": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {
@ -420,7 +420,7 @@
"name": "two",
"isFolderOnly": false,
"ast": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {
@ -465,7 +465,7 @@
"primary": {},
"value": {
"map": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {
@ -488,7 +488,7 @@
"primary": {},
"value": {
"map": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {
@ -538,7 +538,7 @@
"primary": {},
"value": {
"map": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {
@ -583,7 +583,7 @@
"primary": {},
"value": {
"map": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {
@ -710,7 +710,7 @@
"name": "seinfeld",
"isFolderOnly": false,
"ast": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {
@ -812,7 +812,7 @@
"name": "missoula",
"isFolderOnly": false,
"ast": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {
@ -857,7 +857,7 @@
"primary": {},
"value": {
"map": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {

2
testdata/d2compiler/TestCompile2/boards/no-inherit-label.exp.json generated vendored
View file

@ -151,7 +151,7 @@
"name": "1",
"isFolderOnly": false,
"ast": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {

14
testdata/d2compiler/TestCompile2/boards/recursive.exp.json generated vendored
View file

@ -372,7 +372,7 @@
"name": "one",
"isFolderOnly": false,
"ast": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {
@ -474,7 +474,7 @@
"name": "two",
"isFolderOnly": false,
"ast": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {
@ -519,7 +519,7 @@
"primary": {},
"value": {
"map": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {
@ -542,7 +542,7 @@
"primary": {},
"value": {
"map": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {
@ -614,7 +614,7 @@
"primary": {},
"value": {
"map": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {
@ -770,7 +770,7 @@
"name": "seinfeld",
"isFolderOnly": false,
"ast": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {
@ -939,7 +939,7 @@
"name": "missoula",
"isFolderOnly": false,
"ast": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {

4
testdata/d2compiler/TestCompile2/boards/root.exp.json generated vendored
View file

@ -239,7 +239,7 @@
"name": "one",
"isFolderOnly": false,
"ast": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {
@ -341,7 +341,7 @@
"name": "two",
"isFolderOnly": false,
"ast": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {

6
testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.exp.json generated vendored
View file

@ -347,7 +347,7 @@
"name": "1",
"isFolderOnly": false,
"ast": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {
@ -436,7 +436,7 @@
"primary": {},
"value": {
"map": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {
@ -459,7 +459,7 @@
"primary": {},
"value": {
"map": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {

6
testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/1.exp.json generated vendored
View file

@ -436,7 +436,7 @@
"name": "next",
"isFolderOnly": false,
"ast": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {
@ -459,7 +459,7 @@
"primary": {},
"value": {
"map": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {
@ -482,7 +482,7 @@
"primary": {},
"value": {
"map": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {

10
testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/2.exp.json generated vendored
View file

@ -201,7 +201,7 @@
"name": "b",
"isFolderOnly": false,
"ast": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {
@ -224,7 +224,7 @@
"primary": {},
"value": {
"map": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {
@ -247,7 +247,7 @@
"primary": {},
"value": {
"map": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {
@ -312,7 +312,7 @@
"primary": {},
"value": {
"map": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {
@ -335,7 +335,7 @@
"primary": {},
"value": {
"map": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {

2
testdata/d2compiler/TestCompile2/nulls/multiboard/scenario.exp.json generated vendored
View file

@ -191,7 +191,7 @@
"name": "a",
"isFolderOnly": true,
"ast": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": null
},
"root": {

4
testdata/d2compiler/TestCompile2/vars/boards/layer-2.exp.json generated vendored
View file

@ -348,7 +348,7 @@
"name": "l",
"isFolderOnly": false,
"ast": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {
@ -371,7 +371,7 @@
"primary": {},
"value": {
"map": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {

2
testdata/d2compiler/TestCompile2/vars/boards/layer.exp.json generated vendored
View file

@ -205,7 +205,7 @@
"name": "l",
"isFolderOnly": false,
"ast": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {

8
testdata/d2compiler/TestCompile2/vars/boards/overlay.exp.json generated vendored
View file

@ -531,7 +531,7 @@
"name": "l2",
"isFolderOnly": false,
"ast": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {
@ -554,7 +554,7 @@
"primary": {},
"value": {
"map": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {
@ -782,7 +782,7 @@
"name": "l",
"isFolderOnly": false,
"ast": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {
@ -805,7 +805,7 @@
"primary": {},
"value": {
"map": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {

4
testdata/d2compiler/TestCompile2/vars/boards/replace.exp.json generated vendored
View file

@ -267,7 +267,7 @@
"name": "l",
"isFolderOnly": false,
"ast": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {
@ -290,7 +290,7 @@
"primary": {},
"value": {
"map": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {

4
testdata/d2compiler/TestCompile2/vars/boards/scenario.exp.json generated vendored
View file

@ -205,7 +205,7 @@
"name": "l",
"isFolderOnly": false,
"ast": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {
@ -228,7 +228,7 @@
"primary": {},
"value": {
"map": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {

2
testdata/d2oracle/TestCreate/layers-basic.exp.json generated vendored
View file

@ -210,7 +210,7 @@
"name": "x",
"isFolderOnly": false,
"ast": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {

2
testdata/d2oracle/TestCreate/layers-edge-duplicate.exp.json generated vendored
View file

@ -355,7 +355,7 @@
"name": "x",
"isFolderOnly": false,
"ast": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {

2
testdata/d2oracle/TestCreate/layers-edge.exp.json generated vendored
View file

@ -233,7 +233,7 @@
"name": "x",
"isFolderOnly": false,
"ast": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {

2
testdata/d2oracle/TestCreate/scenarios-basic.exp.json generated vendored
View file

@ -278,7 +278,7 @@
"name": "x",
"isFolderOnly": false,
"ast": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {

2
testdata/d2oracle/TestCreate/scenarios-edge-inherited.exp.json generated vendored
View file

@ -332,7 +332,7 @@
"name": "x",
"isFolderOnly": false,
"ast": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {

2
testdata/d2oracle/TestCreate/scenarios-edge.exp.json generated vendored
View file

@ -301,7 +301,7 @@
"name": "x",
"isFolderOnly": false,
"ast": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {

2
testdata/d2oracle/TestCreate/steps-basic.exp.json generated vendored
View file

@ -278,7 +278,7 @@
"name": "x",
"isFolderOnly": false,
"ast": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {

2
testdata/d2oracle/TestCreate/steps-conflict.exp.json generated vendored
View file

@ -278,7 +278,7 @@
"name": "x",
"isFolderOnly": false,
"ast": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {

2
testdata/d2oracle/TestCreate/steps-edge.exp.json generated vendored
View file

@ -301,7 +301,7 @@
"name": "x",
"isFolderOnly": false,
"ast": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {

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

@ -142,7 +142,7 @@
"name": "x",
"isFolderOnly": true,
"ast": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": null
},
"root": {

2
testdata/d2oracle/TestDelete/delete-layer-style.exp.json generated vendored
View file

@ -118,7 +118,7 @@
"name": "x",
"isFolderOnly": false,
"ast": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {

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

@ -187,7 +187,7 @@
"name": "x",
"isFolderOnly": false,
"ast": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {

4
testdata/d2oracle/TestDelete/edge-in-layer.exp.json generated vendored
View file

@ -170,7 +170,7 @@
"name": "test",
"isFolderOnly": false,
"ast": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {
@ -193,7 +193,7 @@
"primary": {},
"value": {
"map": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {

2
testdata/d2oracle/TestDelete/import/2.exp.json generated vendored
View file

@ -256,7 +256,7 @@
"name": "y",
"isFolderOnly": false,
"ast": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {

222
testdata/d2oracle/TestDelete/label-near-in-layer.exp.json generated vendored Normal file
View file

@ -0,0 +1,222 @@
{
"graph": {
"name": "",
"isFolderOnly": true,
"ast": {
"range": "d2/testdata/d2oracle/TestDelete/label-near-in-layer.d2,0:0:0-5:0:29",
"nodes": [
{
"map_key": {
"range": "d2/testdata/d2oracle/TestDelete/label-near-in-layer.d2,0:0:0-4:1:28",
"key": {
"range": "d2/testdata/d2oracle/TestDelete/label-near-in-layer.d2,0:0:0-0:6:6",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestDelete/label-near-in-layer.d2,0:0:0-0:6:6",
"value": [
{
"string": "layers",
"raw_string": "layers"
}
]
}
}
]
},
"primary": {},
"value": {
"map": {
"range": "d2/testdata/d2oracle/TestDelete/label-near-in-layer.d2,0:8:8-4:1:28",
"nodes": [
{
"map_key": {
"range": "d2/testdata/d2oracle/TestDelete/label-near-in-layer.d2,1:2:12-3:3:26",
"key": {
"range": "d2/testdata/d2oracle/TestDelete/label-near-in-layer.d2,1:2:12-1:3:13",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestDelete/label-near-in-layer.d2,1:2:12-1:3:13",
"value": [
{
"string": "x",
"raw_string": "x"
}
]
}
}
]
},
"primary": {},
"value": {
"map": {
"range": "d2/testdata/d2oracle/TestDelete/label-near-in-layer.d2,1:5:15-3:3:26",
"nodes": [
{
"map_key": {
"range": "d2/testdata/d2oracle/TestDelete/label-near-in-layer.d2,2:4:21-2:5:22",
"key": {
"range": "d2/testdata/d2oracle/TestDelete/label-near-in-layer.d2,2:4:21-2:5:22",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestDelete/label-near-in-layer.d2,2:4:21-2:5:22",
"value": [
{
"string": "a",
"raw_string": "a"
}
]
}
}
]
},
"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": null,
"layers": [
{
"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": {}
}
}
]
},
"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/d2oracle/TestDelete/label-near-in-layer.d2,2:4:21-2:5:22",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestDelete/label-near-in-layer.d2,2:4:21-2:5:22",
"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
}
]
}
]
},
"err": "<nil>"
}

2
testdata/d2oracle/TestDelete/layers-basic.exp.json generated vendored
View file

@ -187,7 +187,7 @@
"name": "x",
"isFolderOnly": false,
"ast": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {

2
testdata/d2oracle/TestDelete/scenarios-basic.exp.json generated vendored
View file

@ -187,7 +187,7 @@
"name": "x",
"isFolderOnly": false,
"ast": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {

2
testdata/d2oracle/TestDelete/scenarios-edge-inherited.exp.json generated vendored
View file

@ -364,7 +364,7 @@
"name": "x",
"isFolderOnly": false,
"ast": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {

2
testdata/d2oracle/TestDelete/scenarios-inherited.exp.json generated vendored
View file

@ -237,7 +237,7 @@
"name": "x",
"isFolderOnly": false,
"ast": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {

222
testdata/d2oracle/TestDelete/update-near-in-layer.exp.json generated vendored Normal file
View file

@ -0,0 +1,222 @@
{
"graph": {
"name": "",
"isFolderOnly": true,
"ast": {
"range": "d2/testdata/d2oracle/TestDelete/update-near-in-layer.d2,0:0:0-5:0:29",
"nodes": [
{
"map_key": {
"range": "d2/testdata/d2oracle/TestDelete/update-near-in-layer.d2,0:0:0-4:1:28",
"key": {
"range": "d2/testdata/d2oracle/TestDelete/update-near-in-layer.d2,0:0:0-0:6:6",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestDelete/update-near-in-layer.d2,0:0:0-0:6:6",
"value": [
{
"string": "layers",
"raw_string": "layers"
}
]
}
}
]
},
"primary": {},
"value": {
"map": {
"range": "d2/testdata/d2oracle/TestDelete/update-near-in-layer.d2,0:8:8-4:1:28",
"nodes": [
{
"map_key": {
"range": "d2/testdata/d2oracle/TestDelete/update-near-in-layer.d2,1:2:12-3:3:26",
"key": {
"range": "d2/testdata/d2oracle/TestDelete/update-near-in-layer.d2,1:2:12-1:3:13",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestDelete/update-near-in-layer.d2,1:2:12-1:3:13",
"value": [
{
"string": "x",
"raw_string": "x"
}
]
}
}
]
},
"primary": {},
"value": {
"map": {
"range": "d2/testdata/d2oracle/TestDelete/update-near-in-layer.d2,1:5:15-3:3:26",
"nodes": [
{
"map_key": {
"range": "d2/testdata/d2oracle/TestDelete/update-near-in-layer.d2,2:4:21-2:5:22",
"key": {
"range": "d2/testdata/d2oracle/TestDelete/update-near-in-layer.d2,2:4:21-2:5:22",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestDelete/update-near-in-layer.d2,2:4:21-2:5:22",
"value": [
{
"string": "a",
"raw_string": "a"
}
]
}
}
]
},
"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": null,
"layers": [
{
"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": {}
}
}
]
},
"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/d2oracle/TestDelete/update-near-in-layer.d2,2:4:21-2:5:22",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestDelete/update-near-in-layer.d2,2:4:21-2:5:22",
"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
}
]
}
]
},
"err": "<nil>"
}

4
testdata/d2oracle/TestMove/layers-basic.exp.json generated vendored
View file

@ -216,7 +216,7 @@
"name": "x",
"isFolderOnly": false,
"ast": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {
@ -239,7 +239,7 @@
"primary": {},
"value": {
"map": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {

2
testdata/d2oracle/TestReconnectEdge/layers-basic.exp.json generated vendored
View file

@ -256,7 +256,7 @@
"name": "x",
"isFolderOnly": false,
"ast": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {

2
testdata/d2oracle/TestReconnectEdge/scenarios-basic.exp.json generated vendored
View file

@ -256,7 +256,7 @@
"name": "x",
"isFolderOnly": false,
"ast": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {

2
testdata/d2oracle/TestReconnectEdge/scenarios-outer-scope.exp.json generated vendored
View file

@ -233,7 +233,7 @@
"name": "x",
"isFolderOnly": false,
"ast": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {

2
testdata/d2oracle/TestRename/layers-basic.exp.json generated vendored
View file

@ -187,7 +187,7 @@
"name": "y",
"isFolderOnly": false,
"ast": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {

2
testdata/d2oracle/TestRename/scenarios-basic.exp.json generated vendored
View file

@ -187,7 +187,7 @@
"name": "y",
"isFolderOnly": false,
"ast": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {

2
testdata/d2oracle/TestRename/scenarios-conflict.exp.json generated vendored
View file

@ -187,7 +187,7 @@
"name": "y",
"isFolderOnly": false,
"ast": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {

6
testdata/d2oracle/TestSet/import/8.exp.json generated vendored
View file

@ -239,7 +239,7 @@
"name": "x",
"isFolderOnly": false,
"ast": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {
@ -262,7 +262,7 @@
"primary": {},
"value": {
"map": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {
@ -285,7 +285,7 @@
"primary": {},
"value": {
"map": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {

6
testdata/d2oracle/TestSet/layers-unusable-ref-style.exp.json generated vendored
View file

@ -238,7 +238,7 @@
"name": "x",
"isFolderOnly": false,
"ast": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {
@ -283,7 +283,7 @@
"primary": {},
"value": {
"map": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {
@ -306,7 +306,7 @@
"primary": {},
"value": {
"map": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {

6
testdata/d2oracle/TestSet/layers-usable-ref-style.exp.json generated vendored
View file

@ -233,7 +233,7 @@
"name": "x",
"isFolderOnly": false,
"ast": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {
@ -256,7 +256,7 @@
"primary": {},
"value": {
"map": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {
@ -279,7 +279,7 @@
"primary": {},
"value": {
"map": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {

6
testdata/d2oracle/TestSet/scenarios-arrowhead.exp.json generated vendored
View file

@ -644,7 +644,7 @@
"name": "x",
"isFolderOnly": false,
"ast": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {
@ -821,7 +821,7 @@
"primary": {},
"value": {
"map": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {
@ -844,7 +844,7 @@
"primary": {},
"value": {
"map": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {

6
testdata/d2oracle/TestSet/scenarios-edge-set.exp.json generated vendored
View file

@ -370,7 +370,7 @@
"name": "x",
"isFolderOnly": false,
"ast": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {
@ -481,7 +481,7 @@
"primary": {},
"value": {
"map": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {
@ -504,7 +504,7 @@
"primary": {},
"value": {
"map": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {

6
testdata/d2oracle/TestSet/scenarios-existing-edge-set.exp.json generated vendored
View file

@ -378,7 +378,7 @@
"name": "x",
"isFolderOnly": false,
"ast": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {
@ -533,7 +533,7 @@
"primary": {},
"value": {
"map": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {
@ -556,7 +556,7 @@
"primary": {},
"value": {
"map": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {

6
testdata/d2oracle/TestSet/scenarios-label-primary-missing.exp.json generated vendored
View file

@ -270,7 +270,7 @@
"name": "x",
"isFolderOnly": false,
"ast": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {
@ -303,7 +303,7 @@
},
"value": {
"map": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {
@ -326,7 +326,7 @@
"primary": {},
"value": {
"map": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {

6
testdata/d2oracle/TestSet/scenarios-label-primary.exp.json generated vendored
View file

@ -293,7 +293,7 @@
"name": "x",
"isFolderOnly": false,
"ast": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {
@ -326,7 +326,7 @@
},
"value": {
"map": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {
@ -349,7 +349,7 @@
"primary": {},
"value": {
"map": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {

6
testdata/d2oracle/TestSet/scenarios-multiple.exp.json generated vendored
View file

@ -293,7 +293,7 @@
"name": "x",
"isFolderOnly": false,
"ast": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {
@ -316,7 +316,7 @@
"primary": {},
"value": {
"map": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {
@ -339,7 +339,7 @@
"primary": {},
"value": {
"map": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {

8
testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.exp.json generated vendored
View file

@ -356,7 +356,7 @@
"name": "x",
"isFolderOnly": false,
"ast": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {
@ -379,7 +379,7 @@
"primary": {},
"value": {
"map": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {
@ -412,7 +412,7 @@
},
"value": {
"map": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {
@ -435,7 +435,7 @@
"primary": {},
"value": {
"map": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {

6
testdata/d2oracle/TestSet/scenarios-unusable-ref-style.exp.json generated vendored
View file

@ -238,7 +238,7 @@
"name": "x",
"isFolderOnly": false,
"ast": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {
@ -261,7 +261,7 @@
"primary": {},
"value": {
"map": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {
@ -284,7 +284,7 @@
"primary": {},
"value": {
"map": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {

6
testdata/d2oracle/TestSet/scenarios-usable-ref-style.exp.json generated vendored
View file

@ -253,7 +253,7 @@
"name": "x",
"isFolderOnly": false,
"ast": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {
@ -286,7 +286,7 @@
},
"value": {
"map": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {
@ -309,7 +309,7 @@
"primary": {},
"value": {
"map": {
"range": ",1:0:0-2:0:0",
"range": ",0:0:0-1:0:0",
"nodes": [
{
"map_key": {