From 35dd25c72f2632e8059d2aaa736916ef20044e6d Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Sun, 21 Jan 2024 11:47:26 -0800 Subject: [PATCH] merge --- testdata/d2oracle/TestSet/import/7.exp.json | 459 -------------------- testdata/d2oracle/TestSet/import/8.exp.json | 455 +++++++++++++++++++ 2 files changed, 455 insertions(+), 459 deletions(-) create mode 100644 testdata/d2oracle/TestSet/import/8.exp.json diff --git a/testdata/d2oracle/TestSet/import/7.exp.json b/testdata/d2oracle/TestSet/import/7.exp.json index ebbdf4d13..ce85d720a 100644 --- a/testdata/d2oracle/TestSet/import/7.exp.json +++ b/testdata/d2oracle/TestSet/import/7.exp.json @@ -1,4 +1,3 @@ -<<<<<<< HEAD { "graph": { "name": "", @@ -299,461 +298,3 @@ }, "err": "" } -||||||| parent of 2cc7f33d5 (fix d2oracle editing an imported board) -======= -{ - "graph": { - "name": "", - "isFolderOnly": false, - "ast": { - "range": "index.d2,0:0:0-8:0:59", - "nodes": [ - { - "map_key": { - "range": "index.d2,0:0:0-0:1:1", - "key": { - "range": "index.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "index.d2,0:0:0-0:1:1", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - }, - { - "map_key": { - "range": "index.d2,2:0:3-7:1:58", - "key": { - "range": "index.d2,2:0:3-2:6:9", - "path": [ - { - "unquoted_string": { - "range": "index.d2,2:0:3-2:6:9", - "value": [ - { - "string": "layers", - "raw_string": "layers" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "index.d2,2:8:11-7:1:58", - "nodes": [ - { - "map_key": { - "range": "index.d2,3:2:15-6:3:56", - "key": { - "range": "index.d2,3:2:15-3:3:16", - "path": [ - { - "unquoted_string": { - "range": "index.d2,3:2:15-3:3:16", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "index.d2,3:5:18-6:3:56", - "nodes": [ - { - "import": { - "range": "index.d2,4:4:24-4:10:30", - "spread": true, - "pre": "", - "path": [ - { - "unquoted_string": { - "range": "index.d2,4:8:28-4:10:30", - "value": [ - { - "string": "yo", - "raw_string": "yo" - } - ] - } - } - ] - } - }, - { - "map_key": { - "range": "index.d2,5:4:35-5:21:52", - "key": { - "range": "index.d2,5:4:35-5:16:47", - "path": [ - { - "unquoted_string": { - "range": "index.d2,5:4:35-5:5:36", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - }, - { - "unquoted_string": { - "range": "index.d2,5:6:37-5:11:42", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "index.d2,5:12:43-5:16:47", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "index.d2,5:18:49-5:21:52", - "value": [ - { - "string": "red", - "raw_string": "red" - } - ] - } - } - } - } - ] - } - } - } - } - ] - } - } - } - } - ] - }, - "root": { - "id": "", - "id_val": "", - "attributes": { - "label": { - "value": "" - }, - "labelDimensions": { - "width": 0, - "height": 0 - }, - "style": {}, - "near_key": null, - "shape": { - "value": "" - }, - "direction": { - "value": "" - }, - "constraint": null - }, - "zIndex": 0 - }, - "edges": null, - "objects": [ - { - "id": "a", - "id_val": "a", - "references": [ - { - "key": { - "range": "index.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "index.d2,0:0:0-0:1:1", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "key_path_index": 0, - "map_key_edge_index": -1 - } - ], - "attributes": { - "label": { - "value": "a" - }, - "labelDimensions": { - "width": 0, - "height": 0 - }, - "style": {}, - "near_key": null, - "shape": { - "value": "rectangle" - }, - "direction": { - "value": "" - }, - "constraint": null - }, - "zIndex": 0 - } - ], - "layers": [ - { - "name": "x", - "isFolderOnly": false, - "ast": { - "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": "b" - } - ] - } - } - ] - }, - "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": "fill" - } - ] - } - } - ] - }, - "primary": { - "unquoted_string": { - "range": "index.d2,5:18:49-5:21:52", - "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": "b", - "id_val": "b", - "references": [ - { - "key": { - "range": "yo.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "yo.d2,0:0:0-0:1:1", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "key_path_index": 0, - "map_key_edge_index": -1 - }, - { - "key": { - "range": "index.d2,5:4:35-5:16:47", - "path": [ - { - "unquoted_string": { - "range": "index.d2,5:4:35-5:5:36", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - }, - { - "unquoted_string": { - "range": "index.d2,5:6:37-5:11:42", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "index.d2,5:12:43-5:16:47", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - } - } - ] - }, - "key_path_index": 0, - "map_key_edge_index": -1 - } - ], - "attributes": { - "label": { - "value": "b" - }, - "labelDimensions": { - "width": 0, - "height": 0 - }, - "style": { - "fill": { - "value": "red" - } - }, - "near_key": null, - "shape": { - "value": "rectangle" - }, - "direction": { - "value": "" - }, - "constraint": null - }, - "zIndex": 0 - } - ] - } - ] - }, - "err": "" -} ->>>>>>> 2cc7f33d5 (fix d2oracle editing an imported board) diff --git a/testdata/d2oracle/TestSet/import/8.exp.json b/testdata/d2oracle/TestSet/import/8.exp.json new file mode 100644 index 000000000..6c3a722e8 --- /dev/null +++ b/testdata/d2oracle/TestSet/import/8.exp.json @@ -0,0 +1,455 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "index.d2,0:0:0-8:0:59", + "nodes": [ + { + "map_key": { + "range": "index.d2,0:0:0-0:1:1", + "key": { + "range": "index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": "index.d2,2:0:3-7:1:58", + "key": { + "range": "index.d2,2:0:3-2:6:9", + "path": [ + { + "unquoted_string": { + "range": "index.d2,2:0:3-2:6:9", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "index.d2,2:8:11-7:1:58", + "nodes": [ + { + "map_key": { + "range": "index.d2,3:2:15-6:3:56", + "key": { + "range": "index.d2,3:2:15-3:3:16", + "path": [ + { + "unquoted_string": { + "range": "index.d2,3:2:15-3:3:16", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "index.d2,3:5:18-6:3:56", + "nodes": [ + { + "import": { + "range": "index.d2,4:4:24-4:10:30", + "spread": true, + "pre": "", + "path": [ + { + "unquoted_string": { + "range": "index.d2,4:8:28-4:10:30", + "value": [ + { + "string": "yo", + "raw_string": "yo" + } + ] + } + } + ] + } + }, + { + "map_key": { + "range": "index.d2,5:4:35-5:21:52", + "key": { + "range": "index.d2,5:4:35-5:16:47", + "path": [ + { + "unquoted_string": { + "range": "index.d2,5:4:35-5:5:36", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + }, + { + "unquoted_string": { + "range": "index.d2,5:6:37-5:11:42", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "index.d2,5:12:43-5:16:47", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "index.d2,5:18:49-5:21:52", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "a", + "id_val": "a", + "references": [ + { + "key": { + "range": "index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "a" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ], + "layers": [ + { + "name": "x", + "isFolderOnly": false, + "ast": { + "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": "b" + } + ] + } + } + ] + }, + "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": "fill" + } + ] + } + } + ] + }, + "primary": { + "unquoted_string": { + "range": "index.d2,5:18:49-5:21:52", + "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": "b", + "id_val": "b", + "references": [ + { + "key": { + "range": "yo.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "yo.d2,0:0:0-0:1:1", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + }, + { + "key": { + "range": "index.d2,5:4:35-5:16:47", + "path": [ + { + "unquoted_string": { + "range": "index.d2,5:4:35-5:5:36", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + }, + { + "unquoted_string": { + "range": "index.d2,5:6:37-5:11:42", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "index.d2,5:12:43-5:16:47", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "b" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": { + "fill": { + "value": "red" + } + }, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + } + ] + }, + "err": "" +}