From 69efd3a8e318e3bf6b5bf28ca80bda3a8b52fbb3 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Thu, 12 Dec 2024 15:54:56 -0700 Subject: [PATCH] d2compiler: allow empty layers fix --- d2ir/compile.go | 1 - d2oracle/edit_test.go | 31 ++ .../d2oracle/TestCreate/add_layer/5.exp.json | 514 ++++++++++++++++++ 3 files changed, 545 insertions(+), 1 deletion(-) create mode 100644 testdata/d2oracle/TestCreate/add_layer/5.exp.json diff --git a/d2ir/compile.go b/d2ir/compile.go index f0baff4da..b2ef2d86a 100644 --- a/d2ir/compile.go +++ b/d2ir/compile.go @@ -104,7 +104,6 @@ func (c *compiler) overlayClasses(m *Map) { for _, lf := range layers.Fields { if lf.Map() == nil || lf.Primary() != nil { - c.errorf(lf.References[0].Context_.Key, "invalid layer") continue } l := lf.Map() diff --git a/d2oracle/edit_test.go b/d2oracle/edit_test.go index 015746515..7b8d139be 100644 --- a/d2oracle/edit_test.go +++ b/d2oracle/edit_test.go @@ -559,6 +559,37 @@ layers: { expKey: `d`, exp: `b +layers: { + c: { + d + } +} +`, + }, + { + name: "add_layer/5", + text: `classes: { + a: { + style.stroke: red + } +} +b + +layers: { + c +} +`, + key: `d`, + + boardPath: []string{"c"}, + expKey: `d`, + exp: `classes: { + a: { + style.stroke: red + } +} +b + layers: { c: { d diff --git a/testdata/d2oracle/TestCreate/add_layer/5.exp.json b/testdata/d2oracle/TestCreate/add_layer/5.exp.json new file mode 100644 index 000000000..a5930bbd2 --- /dev/null +++ b/testdata/d2oracle/TestCreate/add_layer/5.exp.json @@ -0,0 +1,514 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2oracle/TestCreate/add_layer/5.d2,0:0:0-12:0:78", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2oracle/TestCreate/add_layer/5.d2,0:0:0-4:1:45", + "key": { + "range": "d2/testdata/d2oracle/TestCreate/add_layer/5.d2,0:0:0-0:7:7", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestCreate/add_layer/5.d2,0:0:0-0:7:7", + "value": [ + { + "string": "classes", + "raw_string": "classes" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2oracle/TestCreate/add_layer/5.d2,0:9:9-4:1:45", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2oracle/TestCreate/add_layer/5.d2,1:2:13-3:3:43", + "key": { + "range": "d2/testdata/d2oracle/TestCreate/add_layer/5.d2,1:2:13-1:3:14", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestCreate/add_layer/5.d2,1:2:13-1:3:14", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2oracle/TestCreate/add_layer/5.d2,1:5:16-3:3:43", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2oracle/TestCreate/add_layer/5.d2,2:4:22-2:21:39", + "key": { + "range": "d2/testdata/d2oracle/TestCreate/add_layer/5.d2,2:4:22-2:16:34", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestCreate/add_layer/5.d2,2:4:22-2:9:27", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestCreate/add_layer/5.d2,2:10:28-2:16:34", + "value": [ + { + "string": "stroke", + "raw_string": "stroke" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestCreate/add_layer/5.d2,2:18:36-2:21:39", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2oracle/TestCreate/add_layer/5.d2,5:0:46-5:1:47", + "key": { + "range": "d2/testdata/d2oracle/TestCreate/add_layer/5.d2,5:0:46-5:1:47", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestCreate/add_layer/5.d2,5:0:46-5:1:47", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": "d2/testdata/d2oracle/TestCreate/add_layer/5.d2,7:0:49-11:1:77", + "key": { + "range": "d2/testdata/d2oracle/TestCreate/add_layer/5.d2,7:0:49-7:6:55", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestCreate/add_layer/5.d2,7:0:49-7:6:55", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2oracle/TestCreate/add_layer/5.d2,7:8:57-11:1:77", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2oracle/TestCreate/add_layer/5.d2,8:2:61-10:3:75", + "key": { + "range": "d2/testdata/d2oracle/TestCreate/add_layer/5.d2,8:2:61-8:3:62", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestCreate/add_layer/5.d2,8:2:61-8:3:62", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2oracle/TestCreate/add_layer/5.d2,8:5:64-10:3:75", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2oracle/TestCreate/add_layer/5.d2,9:4:70-9:5:71", + "key": { + "range": "d2/testdata/d2oracle/TestCreate/add_layer/5.d2,9:4:70-9:5:71", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestCreate/add_layer/5.d2,9:4:70-9:5:71", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "b", + "id_val": "b", + "references": [ + { + "key": { + "range": "d2/testdata/d2oracle/TestCreate/add_layer/5.d2,5:0:46-5:1:47", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestCreate/add_layer/5.d2,5:0:46-5:1:47", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "b" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ], + "layers": [ + { + "name": "c", + "isFolderOnly": false, + "ast": { + "range": ",0:0:0-1:0:0", + "nodes": [ + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestCreate/add_layer/5.d2,9:4:70-9:5:71", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestCreate/add_layer/5.d2,0:0:0-0:7:7", + "value": [ + { + "string": "classes", + "raw_string": "classes" + } + ] + } + } + ] + }, + "primary": {}, + "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/d2oracle/TestCreate/add_layer/5.d2,1:2:13-1:3:14", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "primary": {}, + "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/d2oracle/TestCreate/add_layer/5.d2,2:4:22-2:9:27", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + } + ] + }, + "primary": {}, + "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/d2oracle/TestCreate/add_layer/5.d2,2:10:28-2:16:34", + "value": [ + { + "string": "stroke", + "raw_string": "stroke" + } + ] + } + } + ] + }, + "primary": { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestCreate/add_layer/5.d2,2:18:36-2:21:39", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + }, + "value": {} + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "d", + "id_val": "d", + "references": [ + { + "key": { + "range": "d2/testdata/d2oracle/TestCreate/add_layer/5.d2,9:4:70-9:5:71", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestCreate/add_layer/5.d2,9:4:70-9:5:71", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "d" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + } + ] + }, + "err": "" +}