diff --git a/d2graph/d2graph.go b/d2graph/d2graph.go index 89948fbe4..d3afb199f 100644 --- a/d2graph/d2graph.go +++ b/d2graph/d2graph.go @@ -43,7 +43,7 @@ type Graph struct { IsFolderOnly bool `json:"isFolderOnly"` AST *d2ast.Map `json:"ast"` // BaseAST is the AST of the original graph without inherited fields and edges - BaseAST *d2ast.Map `json:"baseAST,omitempty"` + BaseAST *d2ast.Map `json:"-"` Root *Object `json:"root"` Edges []*Edge `json:"edges"` diff --git a/docs/examples/lib/2-d2oracle/d2oracle.go b/docs/examples/lib/2-d2oracle/d2oracle.go index cb30cfa5a..8f37024e2 100644 --- a/docs/examples/lib/2-d2oracle/d2oracle.go +++ b/docs/examples/lib/2-d2oracle/d2oracle.go @@ -21,14 +21,14 @@ func main() { }) // Create a shape with the ID, "meow" - graph, _, _ = d2oracle.Create(graph, "meow") + graph, _, _ = d2oracle.Create(graph, nil, "meow") // Style the shape green color := "green" - graph, _ = d2oracle.Set(graph, "meow.style.fill", nil, &color) + graph, _ = d2oracle.Set(graph, nil, "meow.style.fill", nil, &color) // Create a shape with the ID, "cat" - graph, _, _ = d2oracle.Create(graph, "cat") + graph, _, _ = d2oracle.Create(graph, nil, "cat") // Move the shape "meow" inside the container "cat" - graph, _ = d2oracle.Move(graph, "meow", "cat.meow", false) + graph, _ = d2oracle.Move(graph, nil, "meow", "cat.meow", false) // Prints formatted D2 script fmt.Print(d2format.Format(graph.AST)) } diff --git a/testdata/d2oracle/TestCreate/layers-basic.exp.json b/testdata/d2oracle/TestCreate/layers-basic.exp.json index c4e489b90..f8d267be3 100644 --- a/testdata/d2oracle/TestCreate/layers-basic.exp.json +++ b/testdata/d2oracle/TestCreate/layers-basic.exp.json @@ -258,57 +258,6 @@ } ] }, - "baseAST": { - "range": "d2/testdata/d2oracle/TestCreate/layers-basic.d2,2:5:17-5:3:34", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2oracle/TestCreate/layers-basic.d2,3:4:23-3:5:24", - "key": { - "range": "d2/testdata/d2oracle/TestCreate/layers-basic.d2,3:4:23-3:5:24", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2oracle/TestCreate/layers-basic.d2,3:4:23-3:5:24", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - }, - { - "map_key": { - "range": "d2/testdata/d2oracle/TestCreate/layers-basic.d2,4:4:29-4:5:30", - "key": { - "range": "d2/testdata/d2oracle/TestCreate/layers-basic.d2,4:4:29-4:5:30", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2oracle/TestCreate/layers-basic.d2,4:4:29-4:5:30", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - } - ] - }, "root": { "id": "", "id_val": "", diff --git a/testdata/d2oracle/TestCreate/layers-edge-duplicate.exp.json b/testdata/d2oracle/TestCreate/layers-edge-duplicate.exp.json index 566b24360..078e5df02 100644 --- a/testdata/d2oracle/TestCreate/layers-edge-duplicate.exp.json +++ b/testdata/d2oracle/TestCreate/layers-edge-duplicate.exp.json @@ -491,103 +491,6 @@ } ] }, - "baseAST": { - "range": "d2/testdata/d2oracle/TestCreate/layers-edge-duplicate.d2,2:5:22-5:3:49", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2oracle/TestCreate/layers-edge-duplicate.d2,3:4:28-3:10:34", - "edges": [ - { - "range": "d2/testdata/d2oracle/TestCreate/layers-edge-duplicate.d2,3:4:28-3:10:34", - "src": { - "range": "d2/testdata/d2oracle/TestCreate/layers-edge-duplicate.d2,3:4:28-3:5:29", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2oracle/TestCreate/layers-edge-duplicate.d2,3:4:28-3:5:29", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "d2/testdata/d2oracle/TestCreate/layers-edge-duplicate.d2,3:9:33-3:10:34", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2oracle/TestCreate/layers-edge-duplicate.d2,3:9:33-3:10:34", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - }, - { - "map_key": { - "range": "d2/testdata/d2oracle/TestCreate/layers-edge-duplicate.d2,4:4:39-4:10:45", - "edges": [ - { - "range": "d2/testdata/d2oracle/TestCreate/layers-edge-duplicate.d2,4:4:39-4:10:45", - "src": { - "range": "d2/testdata/d2oracle/TestCreate/layers-edge-duplicate.d2,4:4:39-4:5:40", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2oracle/TestCreate/layers-edge-duplicate.d2,4:4:39-4:5:40", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "d2/testdata/d2oracle/TestCreate/layers-edge-duplicate.d2,4:9:44-4:10:45", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2oracle/TestCreate/layers-edge-duplicate.d2,4:9:44-4:10:45", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } - ] - }, "root": { "id": "", "id_val": "", diff --git a/testdata/d2oracle/TestCreate/layers-edge.exp.json b/testdata/d2oracle/TestCreate/layers-edge.exp.json index 73ac59e37..d812756a0 100644 --- a/testdata/d2oracle/TestCreate/layers-edge.exp.json +++ b/testdata/d2oracle/TestCreate/layers-edge.exp.json @@ -325,80 +325,6 @@ } ] }, - "baseAST": { - "range": "d2/testdata/d2oracle/TestCreate/layers-edge.d2,2:5:17-5:3:39", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2oracle/TestCreate/layers-edge.d2,3:4:23-3:5:24", - "key": { - "range": "d2/testdata/d2oracle/TestCreate/layers-edge.d2,3:4:23-3:5:24", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2oracle/TestCreate/layers-edge.d2,3:4:23-3:5:24", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - }, - { - "map_key": { - "range": "d2/testdata/d2oracle/TestCreate/layers-edge.d2,4:4:29-4:10:35", - "edges": [ - { - "range": "d2/testdata/d2oracle/TestCreate/layers-edge.d2,4:4:29-4:10:35", - "src": { - "range": "d2/testdata/d2oracle/TestCreate/layers-edge.d2,4:4:29-4:5:30", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2oracle/TestCreate/layers-edge.d2,4:4:29-4:5:30", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "d2/testdata/d2oracle/TestCreate/layers-edge.d2,4:9:34-4:10:35", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2oracle/TestCreate/layers-edge.d2,4:9:34-4:10:35", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } - ] - }, "root": { "id": "", "id_val": "", diff --git a/testdata/d2oracle/TestCreate/scenarios-basic.exp.json b/testdata/d2oracle/TestCreate/scenarios-basic.exp.json index 4d4833d74..ab31d79a1 100644 --- a/testdata/d2oracle/TestCreate/scenarios-basic.exp.json +++ b/testdata/d2oracle/TestCreate/scenarios-basic.exp.json @@ -348,57 +348,6 @@ } ] }, - "baseAST": { - "range": "d2/testdata/d2oracle/TestCreate/scenarios-basic.d2,3:5:22-6:3:39", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2oracle/TestCreate/scenarios-basic.d2,4:4:28-4:5:29", - "key": { - "range": "d2/testdata/d2oracle/TestCreate/scenarios-basic.d2,4:4:28-4:5:29", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2oracle/TestCreate/scenarios-basic.d2,4:4:28-4:5:29", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - }, - { - "map_key": { - "range": "d2/testdata/d2oracle/TestCreate/scenarios-basic.d2,5:4:34-5:5:35", - "key": { - "range": "d2/testdata/d2oracle/TestCreate/scenarios-basic.d2,5:4:34-5:5:35", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2oracle/TestCreate/scenarios-basic.d2,5:4:34-5:5:35", - "value": [ - { - "string": "c", - "raw_string": "c" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - } - ] - }, "root": { "id": "", "id_val": "", diff --git a/testdata/d2oracle/TestCreate/scenarios-edge-inherited.exp.json b/testdata/d2oracle/TestCreate/scenarios-edge-inherited.exp.json index 9e2880fc8..091affa29 100644 --- a/testdata/d2oracle/TestCreate/scenarios-edge-inherited.exp.json +++ b/testdata/d2oracle/TestCreate/scenarios-edge-inherited.exp.json @@ -468,80 +468,6 @@ } ] }, - "baseAST": { - "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge-inherited.d2,2:5:25-5:3:47", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge-inherited.d2,3:4:31-3:5:32", - "key": { - "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge-inherited.d2,3:4:31-3:5:32", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge-inherited.d2,3:4:31-3:5:32", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - }, - { - "map_key": { - "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge-inherited.d2,4:4:37-4:10:43", - "edges": [ - { - "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge-inherited.d2,4:4:37-4:10:43", - "src": { - "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge-inherited.d2,4:4:37-4:5:38", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge-inherited.d2,4:4:37-4:5:38", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge-inherited.d2,4:9:42-4:10:43", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge-inherited.d2,4:9:42-4:10:43", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } - ] - }, "root": { "id": "", "id_val": "", diff --git a/testdata/d2oracle/TestCreate/scenarios-edge.exp.json b/testdata/d2oracle/TestCreate/scenarios-edge.exp.json index 91bbc8a5d..5a8bc5b31 100644 --- a/testdata/d2oracle/TestCreate/scenarios-edge.exp.json +++ b/testdata/d2oracle/TestCreate/scenarios-edge.exp.json @@ -393,80 +393,6 @@ } ] }, - "baseAST": { - "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge.d2,3:5:22-6:3:44", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge.d2,4:4:28-4:5:29", - "key": { - "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge.d2,4:4:28-4:5:29", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge.d2,4:4:28-4:5:29", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - }, - { - "map_key": { - "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge.d2,5:4:34-5:10:40", - "edges": [ - { - "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge.d2,5:4:34-5:10:40", - "src": { - "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge.d2,5:4:34-5:5:35", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge.d2,5:4:34-5:5:35", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge.d2,5:9:39-5:10:40", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge.d2,5:9:39-5:10:40", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } - ] - }, "root": { "id": "", "id_val": "", diff --git a/testdata/d2oracle/TestCreate/steps-basic.exp.json b/testdata/d2oracle/TestCreate/steps-basic.exp.json index 18b0dc0e5..ed22ad91a 100644 --- a/testdata/d2oracle/TestCreate/steps-basic.exp.json +++ b/testdata/d2oracle/TestCreate/steps-basic.exp.json @@ -370,57 +370,6 @@ } ] }, - "baseAST": { - "range": "d2/testdata/d2oracle/TestCreate/steps-basic.d2,3:5:18-6:3:35", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2oracle/TestCreate/steps-basic.d2,4:4:24-4:5:25", - "key": { - "range": "d2/testdata/d2oracle/TestCreate/steps-basic.d2,4:4:24-4:5:25", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2oracle/TestCreate/steps-basic.d2,4:4:24-4:5:25", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - }, - { - "map_key": { - "range": "d2/testdata/d2oracle/TestCreate/steps-basic.d2,5:4:30-5:5:31", - "key": { - "range": "d2/testdata/d2oracle/TestCreate/steps-basic.d2,5:4:30-5:5:31", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2oracle/TestCreate/steps-basic.d2,5:4:30-5:5:31", - "value": [ - { - "string": "c", - "raw_string": "c" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - } - ] - }, "root": { "id": "", "id_val": "", diff --git a/testdata/d2oracle/TestCreate/steps-conflict.exp.json b/testdata/d2oracle/TestCreate/steps-conflict.exp.json index e3c7234c5..1bfd3dc6c 100644 --- a/testdata/d2oracle/TestCreate/steps-conflict.exp.json +++ b/testdata/d2oracle/TestCreate/steps-conflict.exp.json @@ -370,57 +370,6 @@ } ] }, - "baseAST": { - "range": "d2/testdata/d2oracle/TestCreate/steps-conflict.d2,3:5:18-6:3:37", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2oracle/TestCreate/steps-conflict.d2,4:4:24-4:5:25", - "key": { - "range": "d2/testdata/d2oracle/TestCreate/steps-conflict.d2,4:4:24-4:5:25", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2oracle/TestCreate/steps-conflict.d2,4:4:24-4:5:25", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - }, - { - "map_key": { - "range": "d2/testdata/d2oracle/TestCreate/steps-conflict.d2,5:4:30-5:7:33", - "key": { - "range": "d2/testdata/d2oracle/TestCreate/steps-conflict.d2,5:4:30-5:7:33", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2oracle/TestCreate/steps-conflict.d2,5:4:30-5:7:33", - "value": [ - { - "string": "d 2", - "raw_string": "d 2" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - } - ] - }, "root": { "id": "", "id_val": "", diff --git a/testdata/d2oracle/TestCreate/steps-edge.exp.json b/testdata/d2oracle/TestCreate/steps-edge.exp.json index b6721480f..b718cca29 100644 --- a/testdata/d2oracle/TestCreate/steps-edge.exp.json +++ b/testdata/d2oracle/TestCreate/steps-edge.exp.json @@ -415,80 +415,6 @@ } ] }, - "baseAST": { - "range": "d2/testdata/d2oracle/TestCreate/steps-edge.d2,3:5:18-6:3:40", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2oracle/TestCreate/steps-edge.d2,4:4:24-4:5:25", - "key": { - "range": "d2/testdata/d2oracle/TestCreate/steps-edge.d2,4:4:24-4:5:25", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2oracle/TestCreate/steps-edge.d2,4:4:24-4:5:25", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - }, - { - "map_key": { - "range": "d2/testdata/d2oracle/TestCreate/steps-edge.d2,5:4:30-5:10:36", - "edges": [ - { - "range": "d2/testdata/d2oracle/TestCreate/steps-edge.d2,5:4:30-5:10:36", - "src": { - "range": "d2/testdata/d2oracle/TestCreate/steps-edge.d2,5:4:30-5:5:31", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2oracle/TestCreate/steps-edge.d2,5:4:30-5:5:31", - "value": [ - { - "string": "d", - "raw_string": "d" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "d2/testdata/d2oracle/TestCreate/steps-edge.d2,5:9:35-5:10:36", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2oracle/TestCreate/steps-edge.d2,5:9:35-5:10:36", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } - ] - }, "root": { "id": "", "id_val": "", diff --git a/testdata/d2oracle/TestDelete/layers-basic.exp.json b/testdata/d2oracle/TestDelete/layers-basic.exp.json index a2fa2900f..b255ecdde 100644 --- a/testdata/d2oracle/TestDelete/layers-basic.exp.json +++ b/testdata/d2oracle/TestDelete/layers-basic.exp.json @@ -213,34 +213,6 @@ } ] }, - "baseAST": { - "range": "d2/testdata/d2oracle/TestDelete/layers-basic.d2,2:5:17-4:3:28", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2oracle/TestDelete/layers-basic.d2,3:4:23-3:5:24", - "key": { - "range": "d2/testdata/d2oracle/TestDelete/layers-basic.d2,3:4:23-3:5:24", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2oracle/TestDelete/layers-basic.d2,3:4:23-3:5:24", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - } - ] - }, "root": { "id": "", "id_val": "", diff --git a/testdata/d2oracle/TestDelete/scenarios-basic.exp.json b/testdata/d2oracle/TestDelete/scenarios-basic.exp.json index 762c4efc2..870c452a0 100644 --- a/testdata/d2oracle/TestDelete/scenarios-basic.exp.json +++ b/testdata/d2oracle/TestDelete/scenarios-basic.exp.json @@ -235,34 +235,6 @@ } ] }, - "baseAST": { - "range": "d2/testdata/d2oracle/TestDelete/scenarios-basic.d2,2:5:20-4:3:31", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2oracle/TestDelete/scenarios-basic.d2,3:4:26-3:5:27", - "key": { - "range": "d2/testdata/d2oracle/TestDelete/scenarios-basic.d2,3:4:26-3:5:27", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2oracle/TestDelete/scenarios-basic.d2,3:4:26-3:5:27", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - } - ] - }, "root": { "id": "", "id_val": "", diff --git a/testdata/d2oracle/TestMove/layers-basic.exp.json b/testdata/d2oracle/TestMove/layers-basic.exp.json index dc8b931af..4d166d56b 100644 --- a/testdata/d2oracle/TestMove/layers-basic.exp.json +++ b/testdata/d2oracle/TestMove/layers-basic.exp.json @@ -270,63 +270,6 @@ } ] }, - "baseAST": { - "range": "d2/testdata/d2oracle/TestMove/layers-basic.d2,2:5:17-6:3:45", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2oracle/TestMove/layers-basic.d2,3:4:23-5:5:41", - "key": { - "range": "d2/testdata/d2oracle/TestMove/layers-basic.d2,3:4:23-3:5:24", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2oracle/TestMove/layers-basic.d2,3:4:23-3:5:24", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2oracle/TestMove/layers-basic.d2,3:7:26-5:5:41", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2oracle/TestMove/layers-basic.d2,4:6:34-4:7:35", - "key": { - "range": "d2/testdata/d2oracle/TestMove/layers-basic.d2,4:6:34-4:7:35", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2oracle/TestMove/layers-basic.d2,4:6:34-4:7:35", - "value": [ - { - "string": "c", - "raw_string": "c" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - } - ] - } - } - } - } - ] - }, "root": { "id": "", "id_val": "", diff --git a/testdata/d2oracle/TestSet/layers-unusable-ref-style.exp.json b/testdata/d2oracle/TestSet/layers-unusable-ref-style.exp.json index 3261649fb..c6b4a4570 100644 --- a/testdata/d2oracle/TestSet/layers-unusable-ref-style.exp.json +++ b/testdata/d2oracle/TestSet/layers-unusable-ref-style.exp.json @@ -348,85 +348,6 @@ } ] }, - "baseAST": { - "range": "d2/testdata/d2oracle/TestSet/layers-unusable-ref-style.d2,2:5:17-5:3:53", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2oracle/TestSet/layers-unusable-ref-style.d2,3:4:23-3:5:24", - "key": { - "range": "d2/testdata/d2oracle/TestSet/layers-unusable-ref-style.d2,3:4:23-3:5:24", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2oracle/TestSet/layers-unusable-ref-style.d2,3:4:23-3:5:24", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - }, - { - "map_key": { - "range": "d2/testdata/d2oracle/TestSet/layers-unusable-ref-style.d2,4:4:29-4:24:49", - "key": { - "range": "d2/testdata/d2oracle/TestSet/layers-unusable-ref-style.d2,4:4:29-4:19:44", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2oracle/TestSet/layers-unusable-ref-style.d2,4:4:29-4:5:30", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - }, - { - "unquoted_string": { - "range": "d2/testdata/d2oracle/TestSet/layers-unusable-ref-style.d2,4:6:31-4:11:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "d2/testdata/d2oracle/TestSet/layers-unusable-ref-style.d2,4:12:37-4:19:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "d2/testdata/d2oracle/TestSet/layers-unusable-ref-style.d2,4:21:46-4:24:49", - "raw": "0.2", - "value": "1/5" - } - } - } - } - ] - }, "root": { "id": "", "id_val": "", diff --git a/testdata/d2oracle/TestSet/layers-usable-ref-style.exp.json b/testdata/d2oracle/TestSet/layers-usable-ref-style.exp.json index 92c91335a..4acba418d 100644 --- a/testdata/d2oracle/TestSet/layers-usable-ref-style.exp.json +++ b/testdata/d2oracle/TestSet/layers-usable-ref-style.exp.json @@ -321,80 +321,6 @@ } ] }, - "baseAST": { - "range": "d2/testdata/d2oracle/TestSet/layers-usable-ref-style.d2,2:5:17-4:3:50", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2oracle/TestSet/layers-usable-ref-style.d2,3:4:23-3:27:46", - "key": { - "range": "d2/testdata/d2oracle/TestSet/layers-usable-ref-style.d2,3:4:23-3:5:24", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2oracle/TestSet/layers-usable-ref-style.d2,3:4:23-3:5:24", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2oracle/TestSet/layers-usable-ref-style.d2,3:7:26-3:27:46", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2oracle/TestSet/layers-usable-ref-style.d2,3:8:27-3:26:45", - "key": { - "range": "d2/testdata/d2oracle/TestSet/layers-usable-ref-style.d2,3:8:27-3:21:40", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2oracle/TestSet/layers-usable-ref-style.d2,3:8:27-3:13:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "d2/testdata/d2oracle/TestSet/layers-usable-ref-style.d2,3:14:33-3:21:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "d2/testdata/d2oracle/TestSet/layers-usable-ref-style.d2,3:23:42-3:26:45", - "raw": "0.2", - "value": "1/5" - } - } - } - } - ] - } - } - } - } - ] - }, "root": { "id": "", "id_val": "", diff --git a/testdata/d2oracle/TestSet/scenarios-label-primary-missing.exp.json b/testdata/d2oracle/TestSet/scenarios-label-primary-missing.exp.json index 3fe022577..5760a1fd4 100644 --- a/testdata/d2oracle/TestSet/scenarios-label-primary-missing.exp.json +++ b/testdata/d2oracle/TestSet/scenarios-label-primary-missing.exp.json @@ -390,67 +390,6 @@ } ] }, - "baseAST": { - "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary-missing.d2,4:5:46-7:3:66", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary-missing.d2,5:4:52-5:5:53", - "key": { - "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary-missing.d2,5:4:52-5:5:53", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary-missing.d2,5:4:52-5:5:53", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - }, - { - "map_key": { - "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary-missing.d2,6:4:58-6:8:62", - "key": { - "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary-missing.d2,6:4:58-6:5:59", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary-missing.d2,6:4:58-6:5:59", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary-missing.d2,6:7:61-6:8:62", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - } - } - ] - }, "root": { "id": "", "id_val": "", diff --git a/testdata/d2oracle/TestSet/scenarios-label-primary.exp.json b/testdata/d2oracle/TestSet/scenarios-label-primary.exp.json index 2a3f1d82f..84de4b425 100644 --- a/testdata/d2oracle/TestSet/scenarios-label-primary.exp.json +++ b/testdata/d2oracle/TestSet/scenarios-label-primary.exp.json @@ -391,90 +391,6 @@ } ] }, - "baseAST": { - "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary.d2,4:5:46-8:3:93", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary.d2,5:4:52-7:5:89", - "key": { - "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary.d2,5:4:52-5:5:53", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary.d2,5:4:52-5:5:53", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "primary": { - "unquoted_string": { - "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary.d2,5:7:55-5:8:56", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - }, - "value": { - "map": { - "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary.d2,5:9:57-7:5:89", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary.d2,6:6:65-6:24:83", - "key": { - "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary.d2,6:6:65-6:19:78", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary.d2,6:6:65-6:11:70", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary.d2,6:12:71-6:19:78", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary.d2,6:21:80-6:24:83", - "raw": "0.3", - "value": "3/10" - } - } - } - } - ] - } - } - } - } - ] - }, "root": { "id": "", "id_val": "", 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 c42f2831e..d8941e11b 100644 --- a/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.exp.json +++ b/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.exp.json @@ -482,119 +482,6 @@ } ] }, - "baseAST": { - "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,4:5:36-8:3:92", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,5:4:42-7:5:88", - "key": { - "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,5:4:42-5:5:43", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,5:4:42-5:5:43", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,5:7:45-7:5:88", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,6:6:53-6:35:82", - "key": { - "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,6:6:53-6:7:54", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,6:6:53-6:7:54", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "primary": { - "unquoted_string": { - "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,6:9:56-6:14:61", - "value": [ - { - "string": "inner", - "raw_string": "inner" - } - ] - } - }, - "value": { - "map": { - "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,6:15:62-6:35:82", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,6:16:63-6:34:81", - "key": { - "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,6:16:63-6:29:76", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,6:16:63-6:21:68", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,6:22:69-6:29:76", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,6:31:78-6:34:81", - "raw": "0.2", - "value": "1/5" - } - } - } - } - ] - } - } - } - } - ] - } - } - } - } - ] - }, "root": { "id": "", "id_val": "", diff --git a/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.exp.json b/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.exp.json index 6191e2584..35d7bc74d 100644 --- a/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.exp.json +++ b/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.exp.json @@ -348,85 +348,6 @@ } ] }, - "baseAST": { - "range": "d2/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.d2,2:5:20-5:3:56", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.d2,3:4:26-3:5:27", - "key": { - "range": "d2/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.d2,3:4:26-3:5:27", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.d2,3:4:26-3:5:27", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - }, - { - "map_key": { - "range": "d2/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.d2,4:4:32-4:24:52", - "key": { - "range": "d2/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.d2,4:4:32-4:19:47", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.d2,4:4:32-4:5:33", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - }, - { - "unquoted_string": { - "range": "d2/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.d2,4:6:34-4:11:39", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "d2/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.d2,4:12:40-4:19:47", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "d2/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.d2,4:21:49-4:24:52", - "raw": "0.2", - "value": "1/5" - } - } - } - } - ] - }, "root": { "id": "", "id_val": "", diff --git a/testdata/d2oracle/TestSet/scenarios-usable-ref-style.exp.json b/testdata/d2oracle/TestSet/scenarios-usable-ref-style.exp.json index c429916a3..3f4ab6c7a 100644 --- a/testdata/d2oracle/TestSet/scenarios-usable-ref-style.exp.json +++ b/testdata/d2oracle/TestSet/scenarios-usable-ref-style.exp.json @@ -351,90 +351,6 @@ } ] }, - "baseAST": { - "range": "d2/testdata/d2oracle/TestSet/scenarios-usable-ref-style.d2,2:5:27-4:3:66", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2oracle/TestSet/scenarios-usable-ref-style.d2,3:4:33-3:33:62", - "key": { - "range": "d2/testdata/d2oracle/TestSet/scenarios-usable-ref-style.d2,3:4:33-3:5:34", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2oracle/TestSet/scenarios-usable-ref-style.d2,3:4:33-3:5:34", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "primary": { - "unquoted_string": { - "range": "d2/testdata/d2oracle/TestSet/scenarios-usable-ref-style.d2,3:7:36-3:12:41", - "value": [ - { - "string": "inner", - "raw_string": "inner" - } - ] - } - }, - "value": { - "map": { - "range": "d2/testdata/d2oracle/TestSet/scenarios-usable-ref-style.d2,3:13:42-3:33:62", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2oracle/TestSet/scenarios-usable-ref-style.d2,3:14:43-3:32:61", - "key": { - "range": "d2/testdata/d2oracle/TestSet/scenarios-usable-ref-style.d2,3:14:43-3:27:56", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2oracle/TestSet/scenarios-usable-ref-style.d2,3:14:43-3:19:48", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "d2/testdata/d2oracle/TestSet/scenarios-usable-ref-style.d2,3:20:49-3:27:56", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "d2/testdata/d2oracle/TestSet/scenarios-usable-ref-style.d2,3:29:58-3:32:61", - "raw": "0.2", - "value": "1/5" - } - } - } - } - ] - } - } - } - } - ] - }, "root": { "id": "", "id_val": "",