From af781f5e4d16316cd3bfa9be693621266a59e0c8 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Wed, 8 Jan 2025 16:52:26 -0700 Subject: [PATCH] ta --- d2compiler/compile_test.go | 8 +- d2ir/d2ir.go | 2 +- .../glob-connection-steps.exp.json | 6 +- .../TestCompile/import-link-layer-1.exp.json | 4 +- .../TestCompile/import-link-layer-2.exp.json | 2 +- .../TestCompile/import-link-layer-3.exp.json | 8 +- .../TestCompile/import-link-layer-4.exp.json | 12 +- .../import-link-underscore-1.exp.json | 16 +- .../import-link-underscore-2.exp.json | 16 +- .../import-link-underscore-3.exp.json | 8 +- .../TestCompile/import-nested-layers.exp.json | 12 +- .../layer-import-nested-layer.exp.json | 305 ++++++++++++++---- .../link-board-key-nested.exp.json | 2 +- .../TestCompile/link-board-mixed.exp.json | 4 +- .../TestCompile/link-board-nested.exp.json | 6 +- .../TestCompile/link-board-not-board.exp.json | 2 +- .../link-board-not-found-2.exp.json | 4 +- .../TestCompile/link-board-ok.exp.json | 2 +- .../link-board-underscore-not-found.exp.json | 6 +- .../link-board-underscore.exp.json | 6 +- .../TestCompile/link-file-underscore.exp.json | 10 +- .../multiple-import-nested-layers.exp.json | 6 +- .../TestCompile/no-self-link.exp.json | 4 +- .../TestCompile/spread-import-link.exp.json | 6 +- .../boards/board-label-primary.exp.json | 4 +- .../boards/isFolderOnly-shapes.exp.json | 2 +- .../TestCompile2/boards/isFolderOnly.exp.json | 12 +- .../boards/no-inherit-label.exp.json | 2 +- .../TestCompile2/boards/recursive.exp.json | 12 +- .../TestCompile2/boards/root.exp.json | 4 +- .../boards/scenarios_edge_index.exp.json | 2 +- .../boards/style-nested-boards.exp.json | 10 +- .../alixander-lazy-globs-review/1.exp.json | 2 +- .../alixander-lazy-globs-review/2.exp.json | 2 +- .../globs/reapply-scenario.exp.json | 2 +- .../globs/second-scenario.exp.json | 4 +- .../nulls/multiboard/scenario.exp.json | 2 +- .../TestCompile2/vars/boards/layer-2.exp.json | 2 +- .../TestCompile2/vars/boards/layer.exp.json | 2 +- .../TestCompile2/vars/boards/overlay.exp.json | 4 +- .../TestCompile2/vars/boards/replace.exp.json | 2 +- .../vars/boards/scenario.exp.json | 2 +- .../d2oracle/TestCreate/add_layer/2.exp.json | 2 +- .../d2oracle/TestCreate/add_layer/3.exp.json | 2 +- .../d2oracle/TestCreate/add_layer/4.exp.json | 2 +- .../d2oracle/TestCreate/add_layer/5.exp.json | 2 +- .../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 | 2 +- .../d2oracle/TestDelete/import/2.exp.json | 2 +- .../TestDelete/label-near-in-layer.exp.json | 2 +- .../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 | 2 +- .../d2oracle/TestMove/layers-basic.exp.json | 2 +- .../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 | 2 +- .../layers-unusable-ref-style.exp.json | 2 +- .../TestSet/layers-usable-ref-style.exp.json | 2 +- .../d2oracle/TestSet/scenario-child.exp.json | 2 +- .../TestSet/scenario-grandchild.exp.json | 6 +- .../TestSet/scenarios-arrowhead.exp.json | 2 +- .../TestSet/scenarios-edge-set.exp.json | 2 +- .../scenarios-existing-edge-set.exp.json | 2 +- .../scenarios-label-primary-missing.exp.json | 2 +- .../TestSet/scenarios-label-primary.exp.json | 2 +- .../TestSet/scenarios-multiple.exp.json | 2 +- ...scenarios-nested-usable-ref-style.exp.json | 2 +- .../scenarios-unusable-ref-style.exp.json | 2 +- .../scenarios-usable-ref-style.exp.json | 2 +- .../d2oracle/TestSet/step-connection.exp.json | 2 +- 88 files changed, 401 insertions(+), 224 deletions(-) diff --git a/d2compiler/compile_test.go b/d2compiler/compile_test.go index f51e723a2..35055cb56 100644 --- a/d2compiler/compile_test.go +++ b/d2compiler/compile_test.go @@ -3517,8 +3517,9 @@ svc_1.t2 -> b: do with B }, { name: "layer-import-nested-layer", - - text: `...@meow + text: `layers: { + ok: {...@meow} +} `, files: map[string]string{ "meow.d2": `layers: { @@ -3529,7 +3530,8 @@ svc_1.t2 -> b: do with B `, }, assertions: func(t *testing.T, g *d2graph.Graph) { - tassert.Equal(t, "d2/testdata/d2compiler/TestCompile/meow.d2", g.Layers[0].AST.Range.Path) + tassert.Equal(t, "d2/testdata/d2compiler/TestCompile/layer-import-nested-layer.d2", g.Layers[0].AST.Range.Path) + tassert.Equal(t, "d2/testdata/d2compiler/TestCompile/meow.d2", g.Layers[0].Layers[0].AST.Range.Path) }, }, } diff --git a/d2ir/d2ir.go b/d2ir/d2ir.go index 550269afa..80addbb62 100644 --- a/d2ir/d2ir.go +++ b/d2ir/d2ir.go @@ -1458,7 +1458,7 @@ func (m *Map) AST() d2ast.Node { astMap := &d2ast.Map{ Range: d2ast.MakeRange(",0:0:0-1:0:0"), } - if m.parent != nil { + if m.parent != nil && NodeBoardKind(m) != "" { f, ok := m.parent.(*Field) if ok { astMap.Range.Path = f.Name.GetRange().Path diff --git a/testdata/d2compiler/TestCompile/glob-connection-steps.exp.json b/testdata/d2compiler/TestCompile/glob-connection-steps.exp.json index 5f3ed3a92..5f482041b 100644 --- a/testdata/d2compiler/TestCompile/glob-connection-steps.exp.json +++ b/testdata/d2compiler/TestCompile/glob-connection-steps.exp.json @@ -191,7 +191,7 @@ "name": "ok", "isFolderOnly": true, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/glob-connection-steps.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -239,7 +239,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/ok.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -374,7 +374,7 @@ "name": "1", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/ok.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/import-link-layer-1.exp.json b/testdata/d2compiler/TestCompile/import-link-layer-1.exp.json index e636f947c..bca6df048 100644 --- a/testdata/d2compiler/TestCompile/import-link-layer-1.exp.json +++ b/testdata/d2compiler/TestCompile/import-link-layer-1.exp.json @@ -236,7 +236,7 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/import-link-layer-1.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -391,7 +391,7 @@ "name": "z", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/import-link-layer-1.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/import-link-layer-2.exp.json b/testdata/d2compiler/TestCompile/import-link-layer-2.exp.json index 8c78c1bc6..b1739dbbc 100644 --- a/testdata/d2compiler/TestCompile/import-link-layer-2.exp.json +++ b/testdata/d2compiler/TestCompile/import-link-layer-2.exp.json @@ -198,7 +198,7 @@ "name": "z", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/import-link-layer-2.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/import-link-layer-3.exp.json b/testdata/d2compiler/TestCompile/import-link-layer-3.exp.json index 00e472d24..899ee3631 100644 --- a/testdata/d2compiler/TestCompile/import-link-layer-3.exp.json +++ b/testdata/d2compiler/TestCompile/import-link-layer-3.exp.json @@ -236,7 +236,7 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/import-link-layer-3.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -307,7 +307,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/y.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -458,7 +458,7 @@ "name": "lol", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/y.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -615,7 +615,7 @@ "name": "z", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/import-link-layer-3.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/import-link-layer-4.exp.json b/testdata/d2compiler/TestCompile/import-link-layer-4.exp.json index 4fadbf599..cdbec2be9 100644 --- a/testdata/d2compiler/TestCompile/import-link-layer-4.exp.json +++ b/testdata/d2compiler/TestCompile/import-link-layer-4.exp.json @@ -254,7 +254,7 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/import-link-layer-4.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -325,7 +325,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/y.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -415,7 +415,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/y.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -528,7 +528,7 @@ "name": "lol", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/y.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -683,7 +683,7 @@ "name": "z", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/y.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -788,7 +788,7 @@ "name": "z", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/import-link-layer-4.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/import-link-underscore-1.exp.json b/testdata/d2compiler/TestCompile/import-link-underscore-1.exp.json index 3fa382ff5..9e6db3bfa 100644 --- a/testdata/d2compiler/TestCompile/import-link-underscore-1.exp.json +++ b/testdata/d2compiler/TestCompile/import-link-underscore-1.exp.json @@ -184,7 +184,7 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/import-link-underscore-1.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -255,7 +255,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -425,7 +425,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -647,7 +647,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -760,7 +760,7 @@ "name": "b", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -930,7 +930,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -1276,7 +1276,7 @@ "name": "c", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -1673,7 +1673,7 @@ "name": "k", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/import-link-underscore-2.exp.json b/testdata/d2compiler/TestCompile/import-link-underscore-2.exp.json index 7585b749d..96c40c999 100644 --- a/testdata/d2compiler/TestCompile/import-link-underscore-2.exp.json +++ b/testdata/d2compiler/TestCompile/import-link-underscore-2.exp.json @@ -202,7 +202,7 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/import-link-underscore-2.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -273,7 +273,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -443,7 +443,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -665,7 +665,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -778,7 +778,7 @@ "name": "b", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -948,7 +948,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -1294,7 +1294,7 @@ "name": "c", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -1691,7 +1691,7 @@ "name": "k", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/import-link-underscore-3.exp.json b/testdata/d2compiler/TestCompile/import-link-underscore-3.exp.json index 608150f0c..516d0cc9c 100644 --- a/testdata/d2compiler/TestCompile/import-link-underscore-3.exp.json +++ b/testdata/d2compiler/TestCompile/import-link-underscore-3.exp.json @@ -254,7 +254,7 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/import-link-underscore-3.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -325,7 +325,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -476,7 +476,7 @@ "name": "y", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -633,7 +633,7 @@ "name": "b", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/import-link-underscore-3.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/import-nested-layers.exp.json b/testdata/d2compiler/TestCompile/import-nested-layers.exp.json index 1d219d4c4..80065e97d 100644 --- a/testdata/d2compiler/TestCompile/import-nested-layers.exp.json +++ b/testdata/d2compiler/TestCompile/import-nested-layers.exp.json @@ -184,7 +184,7 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/import-nested-layers.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -255,7 +255,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -326,7 +326,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -449,7 +449,7 @@ "name": "b", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -520,7 +520,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -633,7 +633,7 @@ "name": "c", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/layer-import-nested-layer.exp.json b/testdata/d2compiler/TestCompile/layer-import-nested-layer.exp.json index 07506ea7a..88480c278 100644 --- a/testdata/d2compiler/TestCompile/layer-import-nested-layer.exp.json +++ b/testdata/d2compiler/TestCompile/layer-import-nested-layer.exp.json @@ -3,26 +3,84 @@ "name": "", "isFolderOnly": true, "ast": { - "range": "d2/testdata/d2compiler/TestCompile/layer-import-nested-layer.d2,0:0:0-1:0:9", + "range": "d2/testdata/d2compiler/TestCompile/layer-import-nested-layer.d2,0:0:0-3:0:28", "nodes": [ { - "import": { - "range": "d2/testdata/d2compiler/TestCompile/layer-import-nested-layer.d2,0:0:0-0:8:8", - "spread": true, - "pre": "", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/layer-import-nested-layer.d2,0:4:4-0:8:8", - "value": [ - { - "string": "meow", - "raw_string": "meow" - } - ] + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/layer-import-nested-layer.d2,0:0:0-2:1:27", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/layer-import-nested-layer.d2,0:0:0-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/layer-import-nested-layer.d2,0:0:0-0:6:6", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + } } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/layer-import-nested-layer.d2,0:8:8-2:1:27", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/layer-import-nested-layer.d2,1:1:11-1:15:25", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/layer-import-nested-layer.d2,1:1:11-1:3:13", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/layer-import-nested-layer.d2,1:1:11-1:3:13", + "value": [ + { + "string": "ok", + "raw_string": "ok" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/layer-import-nested-layer.d2,1:5:15-1:15:25", + "nodes": [ + { + "import": { + "range": "d2/testdata/d2compiler/TestCompile/layer-import-nested-layer.d2,1:6:16-1:14:24", + "spread": true, + "pre": "", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/layer-import-nested-layer.d2,1:10:20-1:14:24", + "value": [ + { + "string": "meow", + "raw_string": "meow" + } + ] + } + } + ] + } + } + ] + } + } + } + } + ] } - ] + } } } ] @@ -54,10 +112,10 @@ "objects": null, "layers": [ { - "name": "1", - "isFolderOnly": false, + "name": "ok", + "isFolderOnly": true, "ast": { - "range": "d2/testdata/d2compiler/TestCompile/meow.d2,0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/layer-import-nested-layer.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -67,11 +125,11 @@ "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/meow.d2,2:4:21-2:8:25", + "range": "d2/testdata/d2compiler/TestCompile/meow.d2,0:0:0-0:6:6", "value": [ { - "string": "asdf", - "raw_string": "asdf" + "string": "layers", + "raw_string": "layers" } ] } @@ -79,7 +137,65 @@ ] }, "primary": {}, - "value": {} + "value": { + "map": { + "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": "d2/testdata/d2compiler/TestCompile/meow.d2,1:2:12-1:3:13", + "value": [ + { + "string": "1", + "raw_string": "1" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/meow.d2,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": "d2/testdata/d2compiler/TestCompile/meow.d2,2:4:21-2:8:25", + "value": [ + { + "string": "asdf", + "raw_string": "asdf" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + ] + } + } + } + } + ] + } + } } } ] @@ -108,51 +224,110 @@ "zIndex": 0 }, "edges": null, - "objects": [ + "objects": null, + "layers": [ { - "id": "asdf", - "id_val": "asdf", - "references": [ - { - "key": { - "range": "d2/testdata/d2compiler/TestCompile/meow.d2,2:4:21-2:8:25", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/meow.d2,2:4:21-2:8:25", - "value": [ - { - "string": "asdf", - "raw_string": "asdf" + "name": "1", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile/meow.d2,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": "d2/testdata/d2compiler/TestCompile/meow.d2,2:4:21-2:8:25", + "value": [ + { + "string": "asdf", + "raw_string": "asdf" + } + ] } - ] - } - } - ] - }, - "key_path_index": 0, - "map_key_edge_index": -1 - } - ], - "attributes": { - "label": { - "value": "asdf" - }, - "labelDimensions": { - "width": 0, - "height": 0 - }, - "style": {}, - "near_key": null, - "shape": { - "value": "rectangle" - }, - "direction": { - "value": "" - }, - "constraint": null + } + ] + }, + "primary": {}, + "value": {} + } + } + ] }, - "zIndex": 0 + "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": "asdf", + "id_val": "asdf", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/meow.d2,2:4:21-2:8:25", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/meow.d2,2:4:21-2:8:25", + "value": [ + { + "string": "asdf", + "raw_string": "asdf" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "asdf" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] } ] } diff --git a/testdata/d2compiler/TestCompile/link-board-key-nested.exp.json b/testdata/d2compiler/TestCompile/link-board-key-nested.exp.json index 7fdd8b73d..f2bfcad8e 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": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,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 633529bb2..8326d4f7d 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": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -679,7 +679,7 @@ "name": "green", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,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 d6b03aa98..1c2d91af4 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": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -328,7 +328,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -395,7 +395,7 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/link-board-not-board.exp.json b/testdata/d2compiler/TestCompile/link-board-not-board.exp.json index b58894b26..d14f8da7d 100644 --- a/testdata/d2compiler/TestCompile/link-board-not-board.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-not-board.exp.json @@ -287,7 +287,7 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/link-board-not-board.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/link-board-not-found-2.exp.json b/testdata/d2compiler/TestCompile/link-board-not-found-2.exp.json index 9a25f3524..74010c766 100644 --- a/testdata/d2compiler/TestCompile/link-board-not-found-2.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-not-found-2.exp.json @@ -248,7 +248,7 @@ "name": "one", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/link-board-not-found-2.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -390,7 +390,7 @@ "name": "two", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/link-board-not-found-2.d2,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 cfbfb3de1..e633fd3ed 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": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/link-board-underscore-not-found.exp.json b/testdata/d2compiler/TestCompile/link-board-underscore-not-found.exp.json index 2832349b4..797a35dc3 100644 --- a/testdata/d2compiler/TestCompile/link-board-underscore-not-found.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-underscore-not-found.exp.json @@ -289,7 +289,7 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore-not-found.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -360,7 +360,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore-not-found.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -511,7 +511,7 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore-not-found.d2,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 1ecd27589..0e53e89c5 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": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -404,7 +404,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -616,7 +616,7 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/link-file-underscore.exp.json b/testdata/d2compiler/TestCompile/link-file-underscore.exp.json index 62dac5f83..6984336f2 100644 --- a/testdata/d2compiler/TestCompile/link-file-underscore.exp.json +++ b/testdata/d2compiler/TestCompile/link-file-underscore.exp.json @@ -103,7 +103,7 @@ "name": "a", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -206,7 +206,7 @@ "name": "b", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -361,7 +361,7 @@ "name": "e", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -432,7 +432,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -705,7 +705,7 @@ "name": "j", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/multiple-import-nested-layers.exp.json b/testdata/d2compiler/TestCompile/multiple-import-nested-layers.exp.json index e94babb51..d68339e7e 100644 --- a/testdata/d2compiler/TestCompile/multiple-import-nested-layers.exp.json +++ b/testdata/d2compiler/TestCompile/multiple-import-nested-layers.exp.json @@ -184,7 +184,7 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/multiple-import-nested-layers.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -322,7 +322,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/y/x.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -527,7 +527,7 @@ "name": "b", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/y/x.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/no-self-link.exp.json b/testdata/d2compiler/TestCompile/no-self-link.exp.json index 7ef33af11..88e628896 100644 --- a/testdata/d2compiler/TestCompile/no-self-link.exp.json +++ b/testdata/d2compiler/TestCompile/no-self-link.exp.json @@ -324,7 +324,7 @@ "name": "g", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/no-self-link.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -478,7 +478,7 @@ "name": "a", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/no-self-link.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/spread-import-link.exp.json b/testdata/d2compiler/TestCompile/spread-import-link.exp.json index 6344afd38..deb87dba8 100644 --- a/testdata/d2compiler/TestCompile/spread-import-link.exp.json +++ b/testdata/d2compiler/TestCompile/spread-import-link.exp.json @@ -184,7 +184,7 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/spread-import-link.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -293,7 +293,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -420,7 +420,7 @@ "name": "b", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile2/boards/board-label-primary.exp.json b/testdata/d2compiler/TestCompile2/boards/board-label-primary.exp.json index a779a2f70..ccc31d84b 100644 --- a/testdata/d2compiler/TestCompile2/boards/board-label-primary.exp.json +++ b/testdata/d2compiler/TestCompile2/boards/board-label-primary.exp.json @@ -282,7 +282,7 @@ "name": "1", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/board-label-primary.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -385,7 +385,7 @@ "name": "2", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/board-label-primary.d2,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 bd5884c85..6723de0c4 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": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly-shapes.d2,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 b83fbd95c..9622f8719 100644 --- a/testdata/d2compiler/TestCompile2/boards/isFolderOnly.exp.json +++ b/testdata/d2compiler/TestCompile2/boards/isFolderOnly.exp.json @@ -322,7 +322,7 @@ "name": "one", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -425,7 +425,7 @@ "name": "two", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -496,7 +496,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -548,7 +548,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -723,7 +723,7 @@ "name": "seinfeld", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -826,7 +826,7 @@ "name": "missoula", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,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 843612380..0069a24f4 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": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/no-inherit-label.d2,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 a15839583..ea75aef8a 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": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -475,7 +475,7 @@ "name": "two", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -546,7 +546,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -621,7 +621,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -780,7 +780,7 @@ "name": "seinfeld", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -951,7 +951,7 @@ "name": "missoula", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,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 9114f54fb..d7c7a2dc2 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": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -342,7 +342,7 @@ "name": "two", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,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 a8143b2ea..7f2233c53 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": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile2/boards/style-nested-boards.exp.json b/testdata/d2compiler/TestCompile2/boards/style-nested-boards.exp.json index 3cca1d32c..eb7b87111 100644 --- a/testdata/d2compiler/TestCompile2/boards/style-nested-boards.exp.json +++ b/testdata/d2compiler/TestCompile2/boards/style-nested-boards.exp.json @@ -444,7 +444,7 @@ "name": "e", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -549,7 +549,7 @@ "name": "a", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -724,7 +724,7 @@ "name": "b", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -901,7 +901,7 @@ "name": "c", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -1076,7 +1076,7 @@ "name": "d", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,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 ea7fc0a46..ceaf2797f 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": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/1.d2,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 f71559a58..9b1abb005 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": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/2.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile2/globs/reapply-scenario.exp.json b/testdata/d2compiler/TestCompile2/globs/reapply-scenario.exp.json index bd5af6c7a..0c1924323 100644 --- a/testdata/d2compiler/TestCompile2/globs/reapply-scenario.exp.json +++ b/testdata/d2compiler/TestCompile2/globs/reapply-scenario.exp.json @@ -352,7 +352,7 @@ "name": "k", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/globs/reapply-scenario.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile2/globs/second-scenario.exp.json b/testdata/d2compiler/TestCompile2/globs/second-scenario.exp.json index e03f20ba0..13512bf73 100644 --- a/testdata/d2compiler/TestCompile2/globs/second-scenario.exp.json +++ b/testdata/d2compiler/TestCompile2/globs/second-scenario.exp.json @@ -290,7 +290,7 @@ "name": "k", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/globs/second-scenario.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -506,7 +506,7 @@ "name": "z", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/globs/second-scenario.d2,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 4e804caff..c1c9acc54 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": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/nulls/multiboard/scenario.d2,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 6a49f19f5..4a479806d 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": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer-2.d2,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 6a99dab5b..b6637d17d 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": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer.d2,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 26fab8e09..caf5af2f0 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": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -786,7 +786,7 @@ "name": "l", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,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 4fdefffce..844ee1ef9 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": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,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 ed15fda22..75ad4bc2c 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": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/scenario.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestCreate/add_layer/2.exp.json b/testdata/d2oracle/TestCreate/add_layer/2.exp.json index bd411a1f2..373dd3fa7 100644 --- a/testdata/d2oracle/TestCreate/add_layer/2.exp.json +++ b/testdata/d2oracle/TestCreate/add_layer/2.exp.json @@ -215,7 +215,7 @@ "name": "c", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestCreate/add_layer/2.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestCreate/add_layer/3.exp.json b/testdata/d2oracle/TestCreate/add_layer/3.exp.json index acd0d3440..4652e028b 100644 --- a/testdata/d2oracle/TestCreate/add_layer/3.exp.json +++ b/testdata/d2oracle/TestCreate/add_layer/3.exp.json @@ -244,7 +244,7 @@ "name": "c", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestCreate/add_layer/3.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestCreate/add_layer/4.exp.json b/testdata/d2oracle/TestCreate/add_layer/4.exp.json index 9002f903d..4fb77218e 100644 --- a/testdata/d2oracle/TestCreate/add_layer/4.exp.json +++ b/testdata/d2oracle/TestCreate/add_layer/4.exp.json @@ -187,7 +187,7 @@ "name": "c", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestCreate/add_layer/4.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestCreate/add_layer/5.exp.json b/testdata/d2oracle/TestCreate/add_layer/5.exp.json index a5930bbd2..3defff0bd 100644 --- a/testdata/d2oracle/TestCreate/add_layer/5.exp.json +++ b/testdata/d2oracle/TestCreate/add_layer/5.exp.json @@ -289,7 +289,7 @@ "name": "c", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestCreate/add_layer/5.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestCreate/layers-basic.exp.json b/testdata/d2oracle/TestCreate/layers-basic.exp.json index 721b66eb3..00f2181e7 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": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestCreate/layers-basic.d2,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 610e0f54a..a07f6b053 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": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestCreate/layers-edge-duplicate.d2,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 d6b57544f..46d1857fa 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": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestCreate/layers-edge.d2,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 a3f613edd..dced51d93 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": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestCreate/scenarios-basic.d2,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 d400206de..f30872771 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": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge-inherited.d2,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 3954aedfa..f63bfeff7 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": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge.d2,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 a9e214f25..25c19f1ba 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": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestCreate/steps-basic.d2,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 50176089a..2527f158c 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": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestCreate/steps-conflict.d2,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 fbe757b84..7d4d07625 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": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestCreate/steps-edge.d2,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 108e9f705..5cbfa98a1 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": ",0:0:0-1:0:0", + "range": "index.d2,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 58a3a4bd5..d93ae8b29 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": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestDelete/delete-layer-style.d2,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 76a06f92c..4295b9b93 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": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestDelete/delete-not-layer-obj.d2,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 8839f5026..98e32f7d8 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": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestDelete/edge-in-layer.d2,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 79d2c4a66..9d135b166 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": ",0:0:0-1:0:0", + "range": "index.d2,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 index d2f5bee0c..b4f568a10 100644 --- a/testdata/d2oracle/TestDelete/label-near-in-layer.exp.json +++ b/testdata/d2oracle/TestDelete/label-near-in-layer.exp.json @@ -118,7 +118,7 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestDelete/label-near-in-layer.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestDelete/layers-basic.exp.json b/testdata/d2oracle/TestDelete/layers-basic.exp.json index 01354d3bd..7a8074dfd 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": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestDelete/layers-basic.d2,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 81557a95f..f529b7dfb 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": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestDelete/scenarios-basic.d2,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 8dcd684ac..02ee38f06 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": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestDelete/scenarios-edge-inherited.d2,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 500570aef..4e70a5547 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": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestDelete/scenarios-inherited.d2,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 index 42fcbcbd2..5513e9263 100644 --- a/testdata/d2oracle/TestDelete/update-near-in-layer.exp.json +++ b/testdata/d2oracle/TestDelete/update-near-in-layer.exp.json @@ -118,7 +118,7 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestDelete/update-near-in-layer.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/layers-basic.exp.json b/testdata/d2oracle/TestMove/layers-basic.exp.json index 26bf618a0..539a05902 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": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestMove/layers-basic.d2,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 6b6324715..13cd448fa 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": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestReconnectEdge/layers-basic.d2,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 829fa8f3d..c96d88434 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": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestReconnectEdge/scenarios-basic.d2,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 5aeba3378..d74975744 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": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestReconnectEdge/scenarios-outer-scope.d2,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 32bc3fc82..980088b24 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": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestRename/layers-basic.d2,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 ca3c52946..f29bd1b7e 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": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestRename/scenarios-basic.d2,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 0116d26b0..767e1b40c 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": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestRename/scenarios-conflict.d2,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 af3862f3c..e3b59cbbb 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": ",0:0:0-1:0:0", + "range": "index.d2,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 b7c8ba9b5..d3b8694d4 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": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestSet/layers-unusable-ref-style.d2,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 a2e059610..2ee351b2a 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": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestSet/layers-usable-ref-style.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestSet/scenario-child.exp.json b/testdata/d2oracle/TestSet/scenario-child.exp.json index c21d48e46..3918d3cc2 100644 --- a/testdata/d2oracle/TestSet/scenario-child.exp.json +++ b/testdata/d2oracle/TestSet/scenario-child.exp.json @@ -370,7 +370,7 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenario-child.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestSet/scenario-grandchild.exp.json b/testdata/d2oracle/TestSet/scenario-grandchild.exp.json index 15a6f6ac7..8ccf5dbdc 100644 --- a/testdata/d2oracle/TestSet/scenario-grandchild.exp.json +++ b/testdata/d2oracle/TestSet/scenario-grandchild.exp.json @@ -488,7 +488,7 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenario-grandchild.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -582,7 +582,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenario-grandchild.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -974,7 +974,7 @@ "name": "c", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenario-grandchild.d2,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 f2cc29ee0..dae3acbec 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": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-arrowhead.d2,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 656860ac7..a98982a01 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": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-edge-set.d2,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 82cae340c..bd4964a57 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": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-existing-edge-set.d2,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 2b40ff6a0..8ca30473b 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": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary-missing.d2,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 aad9656af..8ad7243ba 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": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary.d2,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 695d324ce..c3651eb18 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": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-multiple.d2,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 5fc07b8ca..5997d7ea0 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": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,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 d3f179e0b..da7b223b0 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": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.d2,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 ce99229ee..86b81facd 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": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-usable-ref-style.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestSet/step-connection.exp.json b/testdata/d2oracle/TestSet/step-connection.exp.json index 0526fa2b1..a8dfbe134 100644 --- a/testdata/d2oracle/TestSet/step-connection.exp.json +++ b/testdata/d2oracle/TestSet/step-connection.exp.json @@ -242,7 +242,7 @@ "name": "1", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestSet/step-connection.d2,0:0:0-1:0:0", "nodes": [ { "map_key": {