From dcf14353805f2bc6242d0d78e513490b12c8988d Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Wed, 29 May 2024 11:39:03 -0600 Subject: [PATCH 1/2] fix delete with near in layer --- d2ir/d2ir.go | 7 +- d2oracle/edit.go | 19 +- d2oracle/edit_test.go | 42 ++++ .../d2oracle/TestCreate/layers-basic.exp.json | 2 +- .../TestCreate/layers-edge-duplicate.exp.json | 2 +- .../d2oracle/TestCreate/layers-edge.exp.json | 2 +- .../TestCreate/scenarios-basic.exp.json | 2 +- .../scenarios-edge-inherited.exp.json | 2 +- .../TestCreate/scenarios-edge.exp.json | 2 +- .../d2oracle/TestCreate/steps-basic.exp.json | 2 +- .../TestCreate/steps-conflict.exp.json | 2 +- .../d2oracle/TestCreate/steps-edge.exp.json | 2 +- .../delete-imported-layer-obj.exp.json | 2 +- .../TestDelete/delete-layer-style.exp.json | 2 +- .../TestDelete/delete-not-layer-obj.exp.json | 2 +- .../TestDelete/edge-in-layer.exp.json | 4 +- .../d2oracle/TestDelete/import/2.exp.json | 2 +- .../TestDelete/label-near-in-layer.exp.json | 222 ++++++++++++++++++ .../d2oracle/TestDelete/layers-basic.exp.json | 2 +- .../TestDelete/scenarios-basic.exp.json | 2 +- .../scenarios-edge-inherited.exp.json | 2 +- .../TestDelete/scenarios-inherited.exp.json | 2 +- .../TestDelete/update-near-in-layer.exp.json | 222 ++++++++++++++++++ .../d2oracle/TestMove/layers-basic.exp.json | 4 +- .../TestReconnectEdge/layers-basic.exp.json | 2 +- .../scenarios-basic.exp.json | 2 +- .../scenarios-outer-scope.exp.json | 2 +- .../d2oracle/TestRename/layers-basic.exp.json | 2 +- .../TestRename/scenarios-basic.exp.json | 2 +- .../TestRename/scenarios-conflict.exp.json | 2 +- testdata/d2oracle/TestSet/import/8.exp.json | 6 +- .../layers-unusable-ref-style.exp.json | 6 +- .../TestSet/layers-usable-ref-style.exp.json | 6 +- .../TestSet/scenarios-arrowhead.exp.json | 6 +- .../TestSet/scenarios-edge-set.exp.json | 6 +- .../scenarios-existing-edge-set.exp.json | 6 +- .../scenarios-label-primary-missing.exp.json | 6 +- .../TestSet/scenarios-label-primary.exp.json | 6 +- .../TestSet/scenarios-multiple.exp.json | 6 +- ...scenarios-nested-usable-ref-style.exp.json | 8 +- .../scenarios-unusable-ref-style.exp.json | 6 +- .../scenarios-usable-ref-style.exp.json | 6 +- 42 files changed, 569 insertions(+), 71 deletions(-) create mode 100644 testdata/d2oracle/TestDelete/label-near-in-layer.exp.json create mode 100644 testdata/d2oracle/TestDelete/update-near-in-layer.exp.json diff --git a/d2ir/d2ir.go b/d2ir/d2ir.go index c742a48f0..1ab518acc 100644 --- a/d2ir/d2ir.go +++ b/d2ir/d2ir.go @@ -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))) diff --git a/d2oracle/edit.go b/d2oracle/edit.go index 93a5e9f68..ce2410349 100644 --- a/d2oracle/edit.go +++ b/d2oracle/edit.go @@ -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 { diff --git a/d2oracle/edit_test.go b/d2oracle/edit_test.go index ad9c8026a..cda153960 100644 --- a/d2oracle/edit_test.go +++ b/d2oracle/edit_test.go @@ -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 + } +} `, }, } diff --git a/testdata/d2oracle/TestCreate/layers-basic.exp.json b/testdata/d2oracle/TestCreate/layers-basic.exp.json index 202a1fdf8..fd96eec76 100644 --- a/testdata/d2oracle/TestCreate/layers-basic.exp.json +++ b/testdata/d2oracle/TestCreate/layers-basic.exp.json @@ -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": { diff --git a/testdata/d2oracle/TestCreate/layers-edge-duplicate.exp.json b/testdata/d2oracle/TestCreate/layers-edge-duplicate.exp.json index 6ed250186..3d0e35b9f 100644 --- a/testdata/d2oracle/TestCreate/layers-edge-duplicate.exp.json +++ b/testdata/d2oracle/TestCreate/layers-edge-duplicate.exp.json @@ -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": { diff --git a/testdata/d2oracle/TestCreate/layers-edge.exp.json b/testdata/d2oracle/TestCreate/layers-edge.exp.json index 71fd6031a..d21cbdf87 100644 --- a/testdata/d2oracle/TestCreate/layers-edge.exp.json +++ b/testdata/d2oracle/TestCreate/layers-edge.exp.json @@ -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": { diff --git a/testdata/d2oracle/TestCreate/scenarios-basic.exp.json b/testdata/d2oracle/TestCreate/scenarios-basic.exp.json index 44f44d42a..e6f6e4791 100644 --- a/testdata/d2oracle/TestCreate/scenarios-basic.exp.json +++ b/testdata/d2oracle/TestCreate/scenarios-basic.exp.json @@ -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": { diff --git a/testdata/d2oracle/TestCreate/scenarios-edge-inherited.exp.json b/testdata/d2oracle/TestCreate/scenarios-edge-inherited.exp.json index 7d4a47a62..bf7c7c758 100644 --- a/testdata/d2oracle/TestCreate/scenarios-edge-inherited.exp.json +++ b/testdata/d2oracle/TestCreate/scenarios-edge-inherited.exp.json @@ -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": { diff --git a/testdata/d2oracle/TestCreate/scenarios-edge.exp.json b/testdata/d2oracle/TestCreate/scenarios-edge.exp.json index ed4cf7c75..090920158 100644 --- a/testdata/d2oracle/TestCreate/scenarios-edge.exp.json +++ b/testdata/d2oracle/TestCreate/scenarios-edge.exp.json @@ -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": { diff --git a/testdata/d2oracle/TestCreate/steps-basic.exp.json b/testdata/d2oracle/TestCreate/steps-basic.exp.json index 1d1ef21ff..394b6c479 100644 --- a/testdata/d2oracle/TestCreate/steps-basic.exp.json +++ b/testdata/d2oracle/TestCreate/steps-basic.exp.json @@ -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": { diff --git a/testdata/d2oracle/TestCreate/steps-conflict.exp.json b/testdata/d2oracle/TestCreate/steps-conflict.exp.json index 5f561da19..faa16fc82 100644 --- a/testdata/d2oracle/TestCreate/steps-conflict.exp.json +++ b/testdata/d2oracle/TestCreate/steps-conflict.exp.json @@ -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": { diff --git a/testdata/d2oracle/TestCreate/steps-edge.exp.json b/testdata/d2oracle/TestCreate/steps-edge.exp.json index d97d8265a..3298522ab 100644 --- a/testdata/d2oracle/TestCreate/steps-edge.exp.json +++ b/testdata/d2oracle/TestCreate/steps-edge.exp.json @@ -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": { diff --git a/testdata/d2oracle/TestDelete/delete-imported-layer-obj.exp.json b/testdata/d2oracle/TestDelete/delete-imported-layer-obj.exp.json index 30afa7877..108e9f705 100644 --- a/testdata/d2oracle/TestDelete/delete-imported-layer-obj.exp.json +++ b/testdata/d2oracle/TestDelete/delete-imported-layer-obj.exp.json @@ -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": { diff --git a/testdata/d2oracle/TestDelete/delete-layer-style.exp.json b/testdata/d2oracle/TestDelete/delete-layer-style.exp.json index 20456afbb..4756b825d 100644 --- a/testdata/d2oracle/TestDelete/delete-layer-style.exp.json +++ b/testdata/d2oracle/TestDelete/delete-layer-style.exp.json @@ -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": { diff --git a/testdata/d2oracle/TestDelete/delete-not-layer-obj.exp.json b/testdata/d2oracle/TestDelete/delete-not-layer-obj.exp.json index 37074912a..6471d0958 100644 --- a/testdata/d2oracle/TestDelete/delete-not-layer-obj.exp.json +++ b/testdata/d2oracle/TestDelete/delete-not-layer-obj.exp.json @@ -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": { diff --git a/testdata/d2oracle/TestDelete/edge-in-layer.exp.json b/testdata/d2oracle/TestDelete/edge-in-layer.exp.json index 7ca8459d9..403548280 100644 --- a/testdata/d2oracle/TestDelete/edge-in-layer.exp.json +++ b/testdata/d2oracle/TestDelete/edge-in-layer.exp.json @@ -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": { diff --git a/testdata/d2oracle/TestDelete/import/2.exp.json b/testdata/d2oracle/TestDelete/import/2.exp.json index cb388a8be..03dae3eb1 100644 --- a/testdata/d2oracle/TestDelete/import/2.exp.json +++ b/testdata/d2oracle/TestDelete/import/2.exp.json @@ -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": { diff --git a/testdata/d2oracle/TestDelete/label-near-in-layer.exp.json b/testdata/d2oracle/TestDelete/label-near-in-layer.exp.json new file mode 100644 index 000000000..28bc88fa7 --- /dev/null +++ b/testdata/d2oracle/TestDelete/label-near-in-layer.exp.json @@ -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": "" +} diff --git a/testdata/d2oracle/TestDelete/layers-basic.exp.json b/testdata/d2oracle/TestDelete/layers-basic.exp.json index 9278c3367..b8f5f3fce 100644 --- a/testdata/d2oracle/TestDelete/layers-basic.exp.json +++ b/testdata/d2oracle/TestDelete/layers-basic.exp.json @@ -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": { diff --git a/testdata/d2oracle/TestDelete/scenarios-basic.exp.json b/testdata/d2oracle/TestDelete/scenarios-basic.exp.json index 987593d7c..40a69618b 100644 --- a/testdata/d2oracle/TestDelete/scenarios-basic.exp.json +++ b/testdata/d2oracle/TestDelete/scenarios-basic.exp.json @@ -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": { diff --git a/testdata/d2oracle/TestDelete/scenarios-edge-inherited.exp.json b/testdata/d2oracle/TestDelete/scenarios-edge-inherited.exp.json index 6672e7686..51771025c 100644 --- a/testdata/d2oracle/TestDelete/scenarios-edge-inherited.exp.json +++ b/testdata/d2oracle/TestDelete/scenarios-edge-inherited.exp.json @@ -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": { diff --git a/testdata/d2oracle/TestDelete/scenarios-inherited.exp.json b/testdata/d2oracle/TestDelete/scenarios-inherited.exp.json index 1ce389a36..26752dc82 100644 --- a/testdata/d2oracle/TestDelete/scenarios-inherited.exp.json +++ b/testdata/d2oracle/TestDelete/scenarios-inherited.exp.json @@ -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": { diff --git a/testdata/d2oracle/TestDelete/update-near-in-layer.exp.json b/testdata/d2oracle/TestDelete/update-near-in-layer.exp.json new file mode 100644 index 000000000..c30b0d330 --- /dev/null +++ b/testdata/d2oracle/TestDelete/update-near-in-layer.exp.json @@ -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": "" +} diff --git a/testdata/d2oracle/TestMove/layers-basic.exp.json b/testdata/d2oracle/TestMove/layers-basic.exp.json index bf5bea56b..1ebf31684 100644 --- a/testdata/d2oracle/TestMove/layers-basic.exp.json +++ b/testdata/d2oracle/TestMove/layers-basic.exp.json @@ -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": { diff --git a/testdata/d2oracle/TestReconnectEdge/layers-basic.exp.json b/testdata/d2oracle/TestReconnectEdge/layers-basic.exp.json index 6e537fb03..9a8fbf16b 100644 --- a/testdata/d2oracle/TestReconnectEdge/layers-basic.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/layers-basic.exp.json @@ -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": { diff --git a/testdata/d2oracle/TestReconnectEdge/scenarios-basic.exp.json b/testdata/d2oracle/TestReconnectEdge/scenarios-basic.exp.json index 983bd873c..9f986050c 100644 --- a/testdata/d2oracle/TestReconnectEdge/scenarios-basic.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/scenarios-basic.exp.json @@ -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": { diff --git a/testdata/d2oracle/TestReconnectEdge/scenarios-outer-scope.exp.json b/testdata/d2oracle/TestReconnectEdge/scenarios-outer-scope.exp.json index 0f368f97c..2e1e86126 100644 --- a/testdata/d2oracle/TestReconnectEdge/scenarios-outer-scope.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/scenarios-outer-scope.exp.json @@ -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": { diff --git a/testdata/d2oracle/TestRename/layers-basic.exp.json b/testdata/d2oracle/TestRename/layers-basic.exp.json index 043603d54..3ed3c1f79 100644 --- a/testdata/d2oracle/TestRename/layers-basic.exp.json +++ b/testdata/d2oracle/TestRename/layers-basic.exp.json @@ -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": { diff --git a/testdata/d2oracle/TestRename/scenarios-basic.exp.json b/testdata/d2oracle/TestRename/scenarios-basic.exp.json index 6e32f9fd3..3189b8434 100644 --- a/testdata/d2oracle/TestRename/scenarios-basic.exp.json +++ b/testdata/d2oracle/TestRename/scenarios-basic.exp.json @@ -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": { diff --git a/testdata/d2oracle/TestRename/scenarios-conflict.exp.json b/testdata/d2oracle/TestRename/scenarios-conflict.exp.json index 3d7328605..0a968b476 100644 --- a/testdata/d2oracle/TestRename/scenarios-conflict.exp.json +++ b/testdata/d2oracle/TestRename/scenarios-conflict.exp.json @@ -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": { diff --git a/testdata/d2oracle/TestSet/import/8.exp.json b/testdata/d2oracle/TestSet/import/8.exp.json index 6c3a722e8..c4e4373ba 100644 --- a/testdata/d2oracle/TestSet/import/8.exp.json +++ b/testdata/d2oracle/TestSet/import/8.exp.json @@ -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": { diff --git a/testdata/d2oracle/TestSet/layers-unusable-ref-style.exp.json b/testdata/d2oracle/TestSet/layers-unusable-ref-style.exp.json index b6e8eafa6..39dd972b0 100644 --- a/testdata/d2oracle/TestSet/layers-unusable-ref-style.exp.json +++ b/testdata/d2oracle/TestSet/layers-unusable-ref-style.exp.json @@ -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": { diff --git a/testdata/d2oracle/TestSet/layers-usable-ref-style.exp.json b/testdata/d2oracle/TestSet/layers-usable-ref-style.exp.json index fc68d6cdf..157eadec4 100644 --- a/testdata/d2oracle/TestSet/layers-usable-ref-style.exp.json +++ b/testdata/d2oracle/TestSet/layers-usable-ref-style.exp.json @@ -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": { diff --git a/testdata/d2oracle/TestSet/scenarios-arrowhead.exp.json b/testdata/d2oracle/TestSet/scenarios-arrowhead.exp.json index 168961d59..6227312a5 100644 --- a/testdata/d2oracle/TestSet/scenarios-arrowhead.exp.json +++ b/testdata/d2oracle/TestSet/scenarios-arrowhead.exp.json @@ -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": { diff --git a/testdata/d2oracle/TestSet/scenarios-edge-set.exp.json b/testdata/d2oracle/TestSet/scenarios-edge-set.exp.json index 8ea7ca279..681028ae3 100644 --- a/testdata/d2oracle/TestSet/scenarios-edge-set.exp.json +++ b/testdata/d2oracle/TestSet/scenarios-edge-set.exp.json @@ -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": { diff --git a/testdata/d2oracle/TestSet/scenarios-existing-edge-set.exp.json b/testdata/d2oracle/TestSet/scenarios-existing-edge-set.exp.json index 0294a412c..5f85a1b48 100644 --- a/testdata/d2oracle/TestSet/scenarios-existing-edge-set.exp.json +++ b/testdata/d2oracle/TestSet/scenarios-existing-edge-set.exp.json @@ -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": { diff --git a/testdata/d2oracle/TestSet/scenarios-label-primary-missing.exp.json b/testdata/d2oracle/TestSet/scenarios-label-primary-missing.exp.json index 9dd6fd8f1..cef4033e3 100644 --- a/testdata/d2oracle/TestSet/scenarios-label-primary-missing.exp.json +++ b/testdata/d2oracle/TestSet/scenarios-label-primary-missing.exp.json @@ -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": { diff --git a/testdata/d2oracle/TestSet/scenarios-label-primary.exp.json b/testdata/d2oracle/TestSet/scenarios-label-primary.exp.json index 8399c247e..532add34b 100644 --- a/testdata/d2oracle/TestSet/scenarios-label-primary.exp.json +++ b/testdata/d2oracle/TestSet/scenarios-label-primary.exp.json @@ -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": { diff --git a/testdata/d2oracle/TestSet/scenarios-multiple.exp.json b/testdata/d2oracle/TestSet/scenarios-multiple.exp.json index 66e45390d..f49af2dfc 100644 --- a/testdata/d2oracle/TestSet/scenarios-multiple.exp.json +++ b/testdata/d2oracle/TestSet/scenarios-multiple.exp.json @@ -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": { diff --git a/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.exp.json b/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.exp.json index 10d0c34ab..b201b16cc 100644 --- a/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.exp.json +++ b/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.exp.json @@ -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": { diff --git a/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.exp.json b/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.exp.json index 1b3c4bce4..8b8ef383c 100644 --- a/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.exp.json +++ b/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.exp.json @@ -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": { diff --git a/testdata/d2oracle/TestSet/scenarios-usable-ref-style.exp.json b/testdata/d2oracle/TestSet/scenarios-usable-ref-style.exp.json index 446504d3b..c99418180 100644 --- a/testdata/d2oracle/TestSet/scenarios-usable-ref-style.exp.json +++ b/testdata/d2oracle/TestSet/scenarios-usable-ref-style.exp.json @@ -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": { From 798182eb78581f307084df3c576779c88d0410e2 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Wed, 29 May 2024 11:49:50 -0600 Subject: [PATCH 2/2] ta=1 --- .../TestCompile/link-board-key-nested.exp.json | 2 +- .../TestCompile/link-board-mixed.exp.json | 8 ++++---- .../TestCompile/link-board-nested.exp.json | 8 ++++---- .../TestCompile/link-board-ok.exp.json | 2 +- .../TestCompile/link-board-underscore.exp.json | 16 ++++++++-------- .../boards/isFolderOnly-shapes.exp.json | 2 +- .../TestCompile2/boards/isFolderOnly.exp.json | 18 +++++++++--------- .../boards/no-inherit-label.exp.json | 2 +- .../TestCompile2/boards/recursive.exp.json | 14 +++++++------- .../TestCompile2/boards/root.exp.json | 4 ++-- .../boards/scenarios_edge_index.exp.json | 6 +++--- .../alixander-lazy-globs-review/1.exp.json | 6 +++--- .../alixander-lazy-globs-review/2.exp.json | 10 +++++----- .../nulls/multiboard/scenario.exp.json | 2 +- .../TestCompile2/vars/boards/layer-2.exp.json | 4 ++-- .../TestCompile2/vars/boards/layer.exp.json | 2 +- .../TestCompile2/vars/boards/overlay.exp.json | 8 ++++---- .../TestCompile2/vars/boards/replace.exp.json | 4 ++-- .../TestCompile2/vars/boards/scenario.exp.json | 4 ++-- 19 files changed, 61 insertions(+), 61 deletions(-) diff --git a/testdata/d2compiler/TestCompile/link-board-key-nested.exp.json b/testdata/d2compiler/TestCompile/link-board-key-nested.exp.json index 971dbe905..7b906e66c 100644 --- a/testdata/d2compiler/TestCompile/link-board-key-nested.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-key-nested.exp.json @@ -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": { diff --git a/testdata/d2compiler/TestCompile/link-board-mixed.exp.json b/testdata/d2compiler/TestCompile/link-board-mixed.exp.json index 04736c781..739e2f29f 100644 --- a/testdata/d2compiler/TestCompile/link-board-mixed.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-mixed.exp.json @@ -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": { diff --git a/testdata/d2compiler/TestCompile/link-board-nested.exp.json b/testdata/d2compiler/TestCompile/link-board-nested.exp.json index 54bf396b1..1107c09ff 100644 --- a/testdata/d2compiler/TestCompile/link-board-nested.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-nested.exp.json @@ -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": { diff --git a/testdata/d2compiler/TestCompile/link-board-ok.exp.json b/testdata/d2compiler/TestCompile/link-board-ok.exp.json index f092c5be6..4548844ea 100644 --- a/testdata/d2compiler/TestCompile/link-board-ok.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-ok.exp.json @@ -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": { diff --git a/testdata/d2compiler/TestCompile/link-board-underscore.exp.json b/testdata/d2compiler/TestCompile/link-board-underscore.exp.json index 58829cf3d..fb21164d4 100644 --- a/testdata/d2compiler/TestCompile/link-board-underscore.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-underscore.exp.json @@ -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": { diff --git a/testdata/d2compiler/TestCompile2/boards/isFolderOnly-shapes.exp.json b/testdata/d2compiler/TestCompile2/boards/isFolderOnly-shapes.exp.json index 3205a49da..cd20cadf7 100644 --- a/testdata/d2compiler/TestCompile2/boards/isFolderOnly-shapes.exp.json +++ b/testdata/d2compiler/TestCompile2/boards/isFolderOnly-shapes.exp.json @@ -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": { diff --git a/testdata/d2compiler/TestCompile2/boards/isFolderOnly.exp.json b/testdata/d2compiler/TestCompile2/boards/isFolderOnly.exp.json index 75999c067..f62edd25b 100644 --- a/testdata/d2compiler/TestCompile2/boards/isFolderOnly.exp.json +++ b/testdata/d2compiler/TestCompile2/boards/isFolderOnly.exp.json @@ -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": { diff --git a/testdata/d2compiler/TestCompile2/boards/no-inherit-label.exp.json b/testdata/d2compiler/TestCompile2/boards/no-inherit-label.exp.json index bfffea2c7..54890fce4 100644 --- a/testdata/d2compiler/TestCompile2/boards/no-inherit-label.exp.json +++ b/testdata/d2compiler/TestCompile2/boards/no-inherit-label.exp.json @@ -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": { diff --git a/testdata/d2compiler/TestCompile2/boards/recursive.exp.json b/testdata/d2compiler/TestCompile2/boards/recursive.exp.json index 7d087020c..8324c327d 100644 --- a/testdata/d2compiler/TestCompile2/boards/recursive.exp.json +++ b/testdata/d2compiler/TestCompile2/boards/recursive.exp.json @@ -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": { diff --git a/testdata/d2compiler/TestCompile2/boards/root.exp.json b/testdata/d2compiler/TestCompile2/boards/root.exp.json index ae5deb1ec..d610fe2e0 100644 --- a/testdata/d2compiler/TestCompile2/boards/root.exp.json +++ b/testdata/d2compiler/TestCompile2/boards/root.exp.json @@ -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": { diff --git a/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.exp.json b/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.exp.json index 1310e7d72..4fa49ab8b 100644 --- a/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.exp.json +++ b/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.exp.json @@ -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": { diff --git a/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/1.exp.json b/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/1.exp.json index c3895ff2c..9d857a0fc 100644 --- a/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/1.exp.json +++ b/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/1.exp.json @@ -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": { diff --git a/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/2.exp.json b/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/2.exp.json index a2f7e9adc..24f29b12f 100644 --- a/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/2.exp.json +++ b/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/2.exp.json @@ -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": { diff --git a/testdata/d2compiler/TestCompile2/nulls/multiboard/scenario.exp.json b/testdata/d2compiler/TestCompile2/nulls/multiboard/scenario.exp.json index 821e51b86..4e804caff 100644 --- a/testdata/d2compiler/TestCompile2/nulls/multiboard/scenario.exp.json +++ b/testdata/d2compiler/TestCompile2/nulls/multiboard/scenario.exp.json @@ -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": { diff --git a/testdata/d2compiler/TestCompile2/vars/boards/layer-2.exp.json b/testdata/d2compiler/TestCompile2/vars/boards/layer-2.exp.json index 7f72e74ba..deafde506 100644 --- a/testdata/d2compiler/TestCompile2/vars/boards/layer-2.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/boards/layer-2.exp.json @@ -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": { diff --git a/testdata/d2compiler/TestCompile2/vars/boards/layer.exp.json b/testdata/d2compiler/TestCompile2/vars/boards/layer.exp.json index 4306c2469..651a8f2ec 100644 --- a/testdata/d2compiler/TestCompile2/vars/boards/layer.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/boards/layer.exp.json @@ -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": { diff --git a/testdata/d2compiler/TestCompile2/vars/boards/overlay.exp.json b/testdata/d2compiler/TestCompile2/vars/boards/overlay.exp.json index 6dcdda361..0344bf673 100644 --- a/testdata/d2compiler/TestCompile2/vars/boards/overlay.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/boards/overlay.exp.json @@ -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": { diff --git a/testdata/d2compiler/TestCompile2/vars/boards/replace.exp.json b/testdata/d2compiler/TestCompile2/vars/boards/replace.exp.json index 1ade3446e..a43035991 100644 --- a/testdata/d2compiler/TestCompile2/vars/boards/replace.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/boards/replace.exp.json @@ -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": { diff --git a/testdata/d2compiler/TestCompile2/vars/boards/scenario.exp.json b/testdata/d2compiler/TestCompile2/vars/boards/scenario.exp.json index b529b2127..3e7cfeca1 100644 --- a/testdata/d2compiler/TestCompile2/vars/boards/scenario.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/boards/scenario.exp.json @@ -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": {