From c790ddd172d246ab45943eb217ce02210f855adb Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Sun, 18 Jun 2023 11:19:37 -0700 Subject: [PATCH] fix --- d2compiler/compile.go | 2 +- .../TestCLI_E2E/internal_linked_pdf.exp.pdf | Bin 79993 -> 79993 bytes .../link-board-key-nested.exp.json | 149 +-- .../TestCompile/link-board-mixed.exp.json | 749 ++---------- .../TestCompile/link-board-nested.exp.json | 183 +-- .../TestCompile/link-board-ok.exp.json | 121 +- .../link-board-underscore.exp.json | 430 +++---- .../TestCompile2/boards/isFolderOnly.exp.json | 816 +------------ .../TestCompile2/boards/recursive.exp.json | 1026 ++--------------- .../TestCompile2/boards/root.exp.json | 264 +---- .../boards/scenarios_edge_index.exp.json | 272 +---- 11 files changed, 475 insertions(+), 3537 deletions(-) diff --git a/d2compiler/compile.go b/d2compiler/compile.go index 3d5619785..b8579ffe3 100644 --- a/d2compiler/compile.go +++ b/d2compiler/compile.go @@ -110,7 +110,7 @@ func (c *compiler) compileBoardsField(g *d2graph.Graph, ir *d2ir.Map, fieldName } g2 := d2graph.NewGraph() g2.Parent = g - g2.AST = ir.AST().(*d2ast.Map) + g2.AST = f.Map().AST().(*d2ast.Map) c.compileBoard(g2, f.Map()) g2.Name = f.Name switch fieldName { diff --git a/e2etests-cli/testdata/TestCLI_E2E/internal_linked_pdf.exp.pdf b/e2etests-cli/testdata/TestCLI_E2E/internal_linked_pdf.exp.pdf index 2e67523116650f56d70d5431b6583fcf304a4b05..87b6e616ebd993c5764f71d54757f39e0f941759 100644 GIT binary patch delta 180 zcmezQf#v51mJLtjCzs4xJh@GQf3w=`)5(($78(ErR5rW*-)l12WtPF@C-RFXi_hlY zJXJv_aPr50AOYpcuK$ZRw-xPEpUz~$c%RXD`XduYLq@~tBBqS#$`*!(h86~vnq2z6 z`6(`mC8-J;E>=bcM#ctahETcf^Gq2{nRJbfEi5b)3_w63Pk{@}FflhVH%1dPvoJBY Jm}bFP2>`j8JKO*O delta 181 zcmezQf#v51mJLtjr?2N`RG!SCP&nCa7vJP|1^&&!yL194C$<=D2g(F%OfK4KF!_o6 zVn&nA9SS#-r`K~cg7_+%x3=sxna*Uwc%RX5`XduYLq_B2BBqS#%4UXUM#jd*nq2z6 z`6(`mC8-J;E>=bcM#cs}8Hn8Wd8Uk}Ou9yvhDHVo1|Xo2r@#ef7+acH8ls7rnHrgy JOtWCD1OVXbHogD= diff --git a/testdata/d2compiler/TestCompile/link-board-key-nested.exp.json b/testdata/d2compiler/TestCompile/link-board-key-nested.exp.json index b7e2cdcfc..66fe44602 100644 --- a/testdata/d2compiler/TestCompile/link-board-key-nested.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-key-nested.exp.json @@ -295,7 +295,7 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -308,7 +308,7 @@ "range": ",0:0:0-0:0:0", "value": [ { - "string": "x" + "string": "yo" } ] } @@ -316,150 +316,7 @@ ] }, "primary": {}, - "value": { - "map": { - "range": ",1:0:0-2: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": "y" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": ",1:0:0-2: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": "link" - } - ] - } - } - ] - }, - "primary": { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "root.layers.x" - } - ] - } - }, - "value": {} - } - } - ] - } - } - } - } - ] - } - } - } - }, - { - "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": "layers" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": ",1:0:0-2: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": "x" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": ",1:0:0-2: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": "yo" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - } - ] - } - } - } - } - ] - } - } + "value": {} } } ] diff --git a/testdata/d2compiler/TestCompile/link-board-mixed.exp.json b/testdata/d2compiler/TestCompile/link-board-mixed.exp.json index 9243134fa..974fc5fbc 100644 --- a/testdata/d2compiler/TestCompile/link-board-mixed.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-mixed.exp.json @@ -420,7 +420,7 @@ "name": "cat", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -433,401 +433,91 @@ "range": ",0:0:0-0:0:0", "value": [ { - "string": "question" + "string": "the cat" } ] } } ] }, + "primary": {}, + "value": {} + } + }, + { + "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": "meeeowwww" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": ",0:0:0-0:0:0", + "edges": [ + { + "range": ",0:0:0-0:0:0", + "src": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "the cat" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "meeeowwww" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], "primary": { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,0:10:10-0:30:30", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:26:103-5:30:107", "value": [ { - "string": "How does the cat go?", - "raw_string": "How does the cat go?" + "string": "goes", + "raw_string": "goes" } ] } }, - "value": { - "map": { - "range": ",1:0:0-2: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": "link" - } - ] - } - } - ] - }, - "primary": { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "root.layers.cat" - } - ] - } - }, - "value": {} - } - } - ] - } - } - } - }, - { - "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": "layers" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": ",1:0:0-2: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": "cat" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": ",1:0:0-2: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": "the cat" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - }, - { - "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": "meeeowwww" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - }, - { - "map_key": { - "range": ",0:0:0-0:0:0", - "edges": [ - { - "range": ",0:0:0-0:0:0", - "src": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "the cat" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "meeeowwww" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:26:103-5:30:107", - "value": [ - { - "string": "goes", - "raw_string": "goes" - } - ] - } - }, - "value": {} - } - } - ] - } - } - } - } - ] - } - } - } - }, - { - "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": "scenarios" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": ",1:0:0-2: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": "green" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": ",1:0:0-2: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": "question" - } - ] - } - } - ] - }, - "primary": { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,0:10:10-0:30:30", - "value": [ - { - "string": "How does the cat go?", - "raw_string": "How does the cat go?" - } - ] - } - }, - "value": { - "map": { - "range": ",1:0:0-2: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": "link" - } - ] - } - } - ] - }, - "primary": { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "root.layers.cat" - } - ] - } - }, - "value": {} - } - }, - { - "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": "style" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": ",1:0:0-2: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": "fill" - } - ] - } - } - ] - }, - "primary": { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:25:164-11:30:169", - "value": [ - { - "string": "green", - "raw_string": "green" - } - ] - } - }, - "value": {} - } - } - ] - } - } - } - } - ] - } - } - } - } - ] - } - } - } - } - ] - } - } + "value": {} } } ] @@ -986,7 +676,7 @@ "name": "green", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -1051,35 +741,7 @@ }, "value": {} } - } - ] - } - } - } - }, - { - "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": "layers" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": ",1:0:0-2:0:0", - "nodes": [ + }, { "map_key": { "range": ",0:0:0-0:0:0", @@ -1091,7 +753,7 @@ "range": ",0:0:0-0:0:0", "value": [ { - "string": "cat" + "string": "style" } ] } @@ -1114,161 +776,7 @@ "range": ",0:0:0-0:0:0", "value": [ { - "string": "the cat" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - }, - { - "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": "meeeowwww" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - }, - { - "map_key": { - "range": ",0:0:0-0:0:0", - "edges": [ - { - "range": ",0:0:0-0:0:0", - "src": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "the cat" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "meeeowwww" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:26:103-5:30:107", - "value": [ - { - "string": "goes", - "raw_string": "goes" - } - ] - } - }, - "value": {} - } - } - ] - } - } - } - } - ] - } - } - } - }, - { - "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": "scenarios" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": ",1:0:0-2: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": "green" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": ",1:0:0-2: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": "question" + "string": "fill" } ] } @@ -1277,113 +785,16 @@ }, "primary": { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,0:10:10-0:30:30", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:25:164-11:30:169", "value": [ { - "string": "How does the cat go?", - "raw_string": "How does the cat go?" + "string": "green", + "raw_string": "green" } ] } }, - "value": { - "map": { - "range": ",1:0:0-2: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": "link" - } - ] - } - } - ] - }, - "primary": { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "root.layers.cat" - } - ] - } - }, - "value": {} - } - }, - { - "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": "style" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": ",1:0:0-2: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": "fill" - } - ] - } - } - ] - }, - "primary": { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:25:164-11:30:169", - "value": [ - { - "string": "green", - "raw_string": "green" - } - ] - } - }, - "value": {} - } - } - ] - } - } - } - } - ] - } - } + "value": {} } } ] diff --git a/testdata/d2compiler/TestCompile/link-board-nested.exp.json b/testdata/d2compiler/TestCompile/link-board-nested.exp.json index 94422bd7d..e1ba86106 100644 --- a/testdata/d2compiler/TestCompile/link-board-nested.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-nested.exp.json @@ -279,67 +279,8 @@ "name": "x", "isFolderOnly": true, "ast": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2: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": "x" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": ",1:0:0-2: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": "link" - } - ] - } - } - ] - }, - "primary": { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "root.layers.x.layers.x" - } - ] - } - }, - "value": {} - } - } - ] - } - } - } - }, { "map_key": { "range": ",0:0:0-0:0:0", @@ -397,7 +338,7 @@ "range": ",0:0:0-0:0:0", "value": [ { - "string": "layers" + "string": "hello" } ] } @@ -405,63 +346,7 @@ ] }, "primary": {}, - "value": { - "map": { - "range": ",1:0:0-2: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": "x" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": ",1:0:0-2: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": "hello" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - } - ] - } - } - } - } - ] - } - } + "value": {} } } ] @@ -506,7 +391,7 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -519,7 +404,7 @@ "range": ",0:0:0-0:0:0", "value": [ { - "string": "layers" + "string": "hello" } ] } @@ -527,63 +412,7 @@ ] }, "primary": {}, - "value": { - "map": { - "range": ",1:0:0-2: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": "x" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": ",1:0:0-2: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": "hello" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - } - ] - } - } - } - } - ] - } - } + "value": {} } } ] diff --git a/testdata/d2compiler/TestCompile/link-board-ok.exp.json b/testdata/d2compiler/TestCompile/link-board-ok.exp.json index 39fc98f06..1f8db4193 100644 --- a/testdata/d2compiler/TestCompile/link-board-ok.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-ok.exp.json @@ -221,7 +221,7 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -234,7 +234,7 @@ "range": ",0:0:0-0:0:0", "value": [ { - "string": "x" + "string": "y" } ] } @@ -242,122 +242,7 @@ ] }, "primary": {}, - "value": { - "map": { - "range": ",1:0:0-2: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": "link" - } - ] - } - } - ] - }, - "primary": { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "root.layers.x" - } - ] - } - }, - "value": {} - } - } - ] - } - } - } - }, - { - "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": "layers" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": ",1:0:0-2: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": "x" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": ",1:0:0-2: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": "y" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - } - ] - } - } - } - } - ] - } - } + "value": {} } } ] diff --git a/testdata/d2compiler/TestCompile/link-board-underscore.exp.json b/testdata/d2compiler/TestCompile/link-board-underscore.exp.json index a4c160eda..a8ba7e509 100644 --- a/testdata/d2compiler/TestCompile/link-board-underscore.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-underscore.exp.json @@ -331,7 +331,7 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -344,7 +344,7 @@ "range": ",0:0:0-0:0:0", "value": [ { - "string": "x" + "string": "yo" } ] } @@ -412,29 +412,7 @@ "range": ",0:0:0-0:0:0", "value": [ { - "string": "yo" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - }, - { - "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": "layers" + "string": "hello" } ] } @@ -457,139 +435,83 @@ "range": ",0:0:0-0:0:0", "value": [ { - "string": "x" + "string": "link" } ] } } ] }, - "primary": {}, - "value": { - "map": { - "range": ",1:0:0-2:0:0", - "nodes": [ + "primary": { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ { - "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": "hello" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": ",1:0:0-2: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": "link" - } - ] - } - } - ] - }, - "primary": { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "root.layers.x" - } - ] - } - }, - "value": {} - } - } - ] - } - } - } - }, - { - "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": "hey" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": ",1:0:0-2: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": "link" - } - ] - } - } - ] - }, - "primary": { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "root.layers.x" - } - ] - } - }, - "value": {} - } - } - ] - } - } - } + "string": "root.layers.x" } ] } + }, + "value": {} + } + } + ] + } + } + } + }, + { + "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": "hey" } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": ",1:0:0-2: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": "link" + } + ] + } + } + ] + }, + "primary": { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "root.layers.x" + } + ] + } + }, + "value": {} } } ] @@ -685,7 +607,7 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -698,29 +620,7 @@ "range": ",0:0:0-0:0:0", "value": [ { - "string": "yo" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - }, - { - "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": "layers" + "string": "hello" } ] } @@ -743,139 +643,83 @@ "range": ",0:0:0-0:0:0", "value": [ { - "string": "x" + "string": "link" } ] } } ] }, - "primary": {}, - "value": { - "map": { - "range": ",1:0:0-2:0:0", - "nodes": [ + "primary": { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ { - "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": "hello" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": ",1:0:0-2: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": "link" - } - ] - } - } - ] - }, - "primary": { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "root.layers.x" - } - ] - } - }, - "value": {} - } - } - ] - } - } - } - }, - { - "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": "hey" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": ",1:0:0-2: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": "link" - } - ] - } - } - ] - }, - "primary": { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "root.layers.x" - } - ] - } - }, - "value": {} - } - } - ] - } - } - } + "string": "root.layers.x" } ] } + }, + "value": {} + } + } + ] + } + } + } + }, + { + "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": "hey" } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": ",1:0:0-2: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": "link" + } + ] + } + } + ] + }, + "primary": { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "root.layers.x" + } + ] + } + }, + "value": {} } } ] diff --git a/testdata/d2compiler/TestCompile2/boards/isFolderOnly.exp.json b/testdata/d2compiler/TestCompile2/boards/isFolderOnly.exp.json index b7be79f41..75999c067 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": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -331,7 +331,7 @@ "range": ",0:0:0-0:0:0", "value": [ { - "string": "layers" + "string": "santa" } ] } @@ -339,301 +339,7 @@ ] }, "primary": {}, - "value": { - "map": { - "range": ",1:0:0-2: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": "one" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": ",1:0:0-2: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": "santa" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - } - ] - } - } - } - }, - { - "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": "two" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": ",1:0:0-2: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": "clause" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - }, - { - "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": "scenarios" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": ",1:0:0-2: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": "seinfeld" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": ",1:0:0-2: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": "clause" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - } - ] - } - } - } - }, - { - "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": "missoula" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": ",1:0:0-2: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": "clause" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - }, - { - "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": "steps" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": ",1:0:0-2: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": "missus" - } - ] - } - } - ] - }, - "primary": { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,12:13:130-12:26:143", - "value": [ - { - "string": "one two three", - "raw_string": "one two three" - } - ] - } - }, - "value": {} - } - } - ] - } - } - } - } - ] - } - } - } - } - ] - } - } - } - } - ] - } - } - } - } - ] - } - } + "value": {} } } ] @@ -714,7 +420,7 @@ "name": "two", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -727,7 +433,29 @@ "range": ",0:0:0-0:0:0", "value": [ { - "string": "layers" + "string": "clause" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "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": "scenarios" } ] } @@ -750,7 +478,7 @@ "range": ",0:0:0-0:0:0", "value": [ { - "string": "one" + "string": "seinfeld" } ] } @@ -773,7 +501,7 @@ "range": ",0:0:0-0:0:0", "value": [ { - "string": "santa" + "string": "clause" } ] } @@ -800,7 +528,7 @@ "range": ",0:0:0-0:0:0", "value": [ { - "string": "two" + "string": "missoula" } ] } @@ -845,7 +573,7 @@ "range": ",0:0:0-0:0:0", "value": [ { - "string": "scenarios" + "string": "steps" } ] } @@ -868,153 +596,25 @@ "range": ",0:0:0-0:0:0", "value": [ { - "string": "seinfeld" + "string": "missus" } ] } } ] }, - "primary": {}, - "value": { - "map": { - "range": ",1:0:0-2:0:0", - "nodes": [ + "primary": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,12:13:130-12:26:143", + "value": [ { - "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": "clause" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } + "string": "one two three", + "raw_string": "one two three" } ] } - } - } - }, - { - "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": "missoula" - } - ] - } - } - ] }, - "primary": {}, - "value": { - "map": { - "range": ",1:0:0-2: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": "clause" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - }, - { - "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": "steps" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": ",1:0:0-2: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": "missus" - } - ] - } - } - ] - }, - "primary": { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,12:13:130-12:26:143", - "value": [ - { - "string": "one two three", - "raw_string": "one two three" - } - ] - } - }, - "value": {} - } - } - ] - } - } - } - } - ] - } - } + "value": {} } } ] @@ -1110,7 +710,7 @@ "name": "seinfeld", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -1133,194 +733,6 @@ "primary": {}, "value": {} } - }, - { - "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": "scenarios" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": ",1:0:0-2: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": "seinfeld" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": ",1:0:0-2: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": "clause" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - } - ] - } - } - } - }, - { - "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": "missoula" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": ",1:0:0-2: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": "clause" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - }, - { - "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": "steps" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": ",1:0:0-2: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": "missus" - } - ] - } - } - ] - }, - "primary": { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,12:13:130-12:26:143", - "value": [ - { - "string": "one two three", - "raw_string": "one two three" - } - ] - } - }, - "value": {} - } - } - ] - } - } - } - } - ] - } - } - } - } - ] - } - } - } } ] }, @@ -1400,7 +812,7 @@ "name": "missoula", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -1435,7 +847,7 @@ "range": ",0:0:0-0:0:0", "value": [ { - "string": "scenarios" + "string": "steps" } ] } @@ -1458,153 +870,25 @@ "range": ",0:0:0-0:0:0", "value": [ { - "string": "seinfeld" + "string": "missus" } ] } } ] }, - "primary": {}, - "value": { - "map": { - "range": ",1:0:0-2:0:0", - "nodes": [ + "primary": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,12:13:130-12:26:143", + "value": [ { - "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": "clause" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } + "string": "one two three", + "raw_string": "one two three" } ] } - } - } - }, - { - "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": "missoula" - } - ] - } - } - ] }, - "primary": {}, - "value": { - "map": { - "range": ",1:0:0-2: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": "clause" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - }, - { - "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": "steps" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": ",1:0:0-2: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": "missus" - } - ] - } - } - ] - }, - "primary": { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,12:13:130-12:26:143", - "value": [ - { - "string": "one two three", - "raw_string": "one two three" - } - ] - } - }, - "value": {} - } - } - ] - } - } - } - } - ] - } - } + "value": {} } } ] diff --git a/testdata/d2compiler/TestCompile2/boards/recursive.exp.json b/testdata/d2compiler/TestCompile2/boards/recursive.exp.json index 1789d73ba..7d087020c 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": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -385,7 +385,7 @@ "range": ",0:0:0-0:0:0", "value": [ { - "string": "base" + "string": "santa" } ] } @@ -395,328 +395,6 @@ "primary": {}, "value": {} } - }, - { - "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": "layers" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": ",1:0:0-2: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": "one" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": ",1:0:0-2: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": "santa" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - } - ] - } - } - } - }, - { - "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": "two" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": ",1:0:0-2: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": "clause" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - }, - { - "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": "steps" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": ",1:0:0-2: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": "seinfeld" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": ",1:0:0-2: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": "clause" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - }, - { - "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": "reindeer" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - } - ] - } - } - } - }, - { - "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": "missoula" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": ",1:0:0-2: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": "clause" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - }, - { - "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": "reindeer" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - }, - { - "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": "montana" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - } - ] - } - } - } - } - ] - } - } - } - } - ] - } - } - } - } - ] - } - } - } } ] }, @@ -796,7 +474,7 @@ "name": "two", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -809,7 +487,7 @@ "range": ",0:0:0-0:0:0", "value": [ { - "string": "base" + "string": "clause" } ] } @@ -831,7 +509,7 @@ "range": ",0:0:0-0:0:0", "value": [ { - "string": "layers" + "string": "steps" } ] } @@ -854,57 +532,7 @@ "range": ",0:0:0-0:0:0", "value": [ { - "string": "one" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": ",1:0:0-2: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": "santa" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - } - ] - } - } - } - }, - { - "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": "two" + "string": "seinfeld" } ] } @@ -949,7 +577,7 @@ "range": ",0:0:0-0:0:0", "value": [ { - "string": "steps" + "string": "reindeer" } ] } @@ -957,179 +585,101 @@ ] }, "primary": {}, - "value": { - "map": { - "range": ",1:0:0-2: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": "seinfeld" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": ",1:0:0-2: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": "clause" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - }, - { - "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": "reindeer" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - } - ] - } - } - } - }, - { - "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": "missoula" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": ",1:0:0-2: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": "clause" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - }, - { - "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": "reindeer" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - }, - { - "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": "montana" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - } - ] - } - } - } - } - ] - } + "value": {} + } + } + ] + } + } + } + }, + { + "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": "missoula" } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": ",1:0:0-2: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": "clause" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "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": "reindeer" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "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": "montana" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} } } ] @@ -1220,7 +770,7 @@ "name": "seinfeld", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -1255,7 +805,7 @@ "range": ",0:0:0-0:0:0", "value": [ { - "string": "steps" + "string": "reindeer" } ] } @@ -1263,179 +813,7 @@ ] }, "primary": {}, - "value": { - "map": { - "range": ",1:0:0-2: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": "seinfeld" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": ",1:0:0-2: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": "clause" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - }, - { - "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": "reindeer" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - } - ] - } - } - } - }, - { - "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": "missoula" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": ",1:0:0-2: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": "clause" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - }, - { - "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": "reindeer" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - }, - { - "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": "montana" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - } - ] - } - } - } - } - ] - } - } + "value": {} } } ] @@ -1561,7 +939,7 @@ "name": "missoula", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -1596,7 +974,7 @@ "range": ",0:0:0-0:0:0", "value": [ { - "string": "steps" + "string": "reindeer" } ] } @@ -1604,179 +982,29 @@ ] }, "primary": {}, - "value": { - "map": { - "range": ",1:0:0-2: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": "seinfeld" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": ",1:0:0-2: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": "clause" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - }, - { - "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": "reindeer" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - } - ] - } + "value": {} + } + }, + { + "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": "montana" } - } - }, - { - "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": "missoula" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": ",1:0:0-2: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": "clause" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - }, - { - "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": "reindeer" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - }, - { - "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": "montana" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - } - ] - } - } - } + ] } - ] - } - } + } + ] + }, + "primary": {}, + "value": {} } } ] diff --git a/testdata/d2compiler/TestCompile2/boards/root.exp.json b/testdata/d2compiler/TestCompile2/boards/root.exp.json index 9e2164fac..ae5deb1ec 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": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -252,7 +252,7 @@ "range": ",0:0:0-0:0:0", "value": [ { - "string": "base" + "string": "santa" } ] } @@ -262,134 +262,6 @@ "primary": {}, "value": {} } - }, - { - "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": "layers" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": ",1:0:0-2: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": "one" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": ",1:0:0-2: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": "santa" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - } - ] - } - } - } - }, - { - "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": "two" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": ",1:0:0-2: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": "clause" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - } - ] - } - } - } - } - ] - } - } - } } ] }, @@ -469,7 +341,7 @@ "name": "two", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -482,7 +354,7 @@ "range": ",0:0:0-0:0:0", "value": [ { - "string": "base" + "string": "clause" } ] } @@ -492,134 +364,6 @@ "primary": {}, "value": {} } - }, - { - "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": "layers" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": ",1:0:0-2: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": "one" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": ",1:0:0-2: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": "santa" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - } - ] - } - } - } - }, - { - "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": "two" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": ",1:0:0-2: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": "clause" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - } - ] - } - } - } - } - ] - } - } - } } ] }, diff --git a/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.exp.json b/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.exp.json index 520d07f2f..1310e7d72 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": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -393,212 +393,6 @@ "value": {} } }, - { - "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": "scenarios" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": ",1:0:0-2: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": "1" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": ",1:0:0-2: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": {} - } - }, - { - "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": "x" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - }, - { - "map_key": { - "range": ",0:0:0-0:0:0", - "edges": [ - { - "range": ",0:0:0-0:0:0", - "src": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "a" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": { - "map": { - "range": ",1:0:0-2: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": "style" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": ",1:0:0-2: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": "opacity" - } - ] - } - } - ] - }, - "primary": { - "number": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,4:31:59-4:34:62", - "raw": "0.1", - "value": "1/10" - } - }, - "value": {} - } - } - ] - } - } - } - } - ] - } - } - } - } - ] - } - } - } - } - ] - } - } - } - }, { "map_key": { "range": ",0:0:0-0:0:0", @@ -640,7 +434,69 @@ } ], "primary": {}, - "value": {} + "value": { + "map": { + "range": ",1:0:0-2: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": "style" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": ",1:0:0-2: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": "opacity" + } + ] + } + } + ] + }, + "primary": { + "number": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,4:31:59-4:34:62", + "raw": "0.1", + "value": "1/10" + } + }, + "value": {} + } + } + ] + } + } + } + } + ] + } + } } } ]