From d6e501419d5a21c3d0da384b0eb5bfb552a6c8ef Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Sat, 4 Mar 2023 00:32:52 -0800 Subject: [PATCH 1/4] fix delete suffix with value --- d2oracle/edit.go | 2 + d2oracle/edit_test.go | 9 + .../d2oracle/TestDelete/drop_value.exp.json | 190 ++++++++++++++++++ 3 files changed, 201 insertions(+) create mode 100644 testdata/d2oracle/TestDelete/drop_value.exp.json diff --git a/d2oracle/edit.go b/d2oracle/edit.go index a8d8e3665..bdc905adc 100644 --- a/d2oracle/edit.go +++ b/d2oracle/edit.go @@ -939,6 +939,8 @@ func deleteObject(g *d2graph.Graph, key *d2ast.KeyPath, obj *d2graph.Object) (*d } } } + } else if isSuffix { + ref.MapKey.Value = d2ast.ValueBox{} } } else if ref.InEdge() { edge := ref.MapKey.Edges[ref.MapKeyEdgeIndex] diff --git a/d2oracle/edit_test.go b/d2oracle/edit_test.go index 0cab38984..91b25550c 100644 --- a/d2oracle/edit_test.go +++ b/d2oracle/edit_test.go @@ -4853,6 +4853,15 @@ Text 2 Text Text 2 +`, + }, + { + name: "drop_value", + text: `a.b.c: "c label" +`, + key: `a.b.c`, + + exp: `a.b `, }, { diff --git a/testdata/d2oracle/TestDelete/drop_value.exp.json b/testdata/d2oracle/TestDelete/drop_value.exp.json new file mode 100644 index 000000000..97a95b190 --- /dev/null +++ b/testdata/d2oracle/TestDelete/drop_value.exp.json @@ -0,0 +1,190 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2oracle/TestDelete/drop_value.d2,0:0:0-1:0:4", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2oracle/TestDelete/drop_value.d2,0:0:0-0:3:3", + "key": { + "range": "d2/testdata/d2oracle/TestDelete/drop_value.d2,0:0:0-0:3:3", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestDelete/drop_value.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestDelete/drop_value.d2,0:2:2-0:3:3", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "label_dimensions": { + "width": 0, + "height": 0 + }, + "attributes": { + "label": { + "value": "" + }, + "style": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": { + "value": "" + } + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "a", + "id_val": "a", + "label_dimensions": { + "width": 0, + "height": 0 + }, + "references": [ + { + "key": { + "range": "d2/testdata/d2oracle/TestDelete/drop_value.d2,0:0:0-0:3:3", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestDelete/drop_value.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestDelete/drop_value.d2,0:2:2-0:3:3", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "a" + }, + "style": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": { + "value": "" + } + }, + "zIndex": 0 + }, + { + "id": "b", + "id_val": "b", + "label_dimensions": { + "width": 0, + "height": 0 + }, + "references": [ + { + "key": { + "range": "d2/testdata/d2oracle/TestDelete/drop_value.d2,0:0:0-0:3:3", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestDelete/drop_value.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestDelete/drop_value.d2,0:2:2-0:3:3", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "key_path_index": 1, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "b" + }, + "style": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": { + "value": "" + } + }, + "zIndex": 0 + } + ] + }, + "err": "" +} From e1b9a227c49d46489ff598f2290738c164396b3f Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Sat, 4 Mar 2023 00:40:12 -0800 Subject: [PATCH 2/4] fix delete not saving map --- d2oracle/edit.go | 3 +- d2oracle/edit_test.go | 13 ++ .../d2oracle/TestDelete/save_map.exp.json | 149 ++++++++++++++++++ 3 files changed, 164 insertions(+), 1 deletion(-) create mode 100644 testdata/d2oracle/TestDelete/save_map.exp.json diff --git a/d2oracle/edit.go b/d2oracle/edit.go index bdc905adc..502640821 100644 --- a/d2oracle/edit.go +++ b/d2oracle/edit.go @@ -927,10 +927,11 @@ func deleteObject(g *d2graph.Graph, key *d2ast.KeyPath, obj *d2graph.Object) (*d len(obj.Parent.References) > 1 { // Redundant key. deleteFromMap(ref.Scope, ref.MapKey) - } else if ref.MapKey.Value.Map != nil { + } else if ref.MapKey.Value.Map != nil && isSuffix { for i := 0; i < len(ref.MapKey.Value.Map.Nodes); i++ { n := ref.MapKey.Value.Map.Nodes[i] if n.MapKey != nil && n.MapKey.Key != nil { + println("\033[1;31m--- DEBUG:", "=======================", "\033[m") _, ok := d2graph.ReservedKeywords[n.MapKey.Key.Path[0].Unbox().ScalarString()] if ok { deleteFromMap(ref.MapKey.Value.Map, n.MapKey) diff --git a/d2oracle/edit_test.go b/d2oracle/edit_test.go index 91b25550c..ee07dc32b 100644 --- a/d2oracle/edit_test.go +++ b/d2oracle/edit_test.go @@ -4862,6 +4862,19 @@ Text 2 key: `a.b.c`, exp: `a.b +`, + }, + { + name: "save_map", + text: `a.b: { + shape: circle +} +`, + key: `a`, + + exp: `b: { + shape: circle +} `, }, { diff --git a/testdata/d2oracle/TestDelete/save_map.exp.json b/testdata/d2oracle/TestDelete/save_map.exp.json new file mode 100644 index 000000000..2cfe2696b --- /dev/null +++ b/testdata/d2oracle/TestDelete/save_map.exp.json @@ -0,0 +1,149 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2oracle/TestDelete/save_map.d2,0:0:0-3:0:23", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2oracle/TestDelete/save_map.d2,0:0:0-2:1:22", + "key": { + "range": "d2/testdata/d2oracle/TestDelete/save_map.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestDelete/save_map.d2,0:0:0-0:1:1", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2oracle/TestDelete/save_map.d2,0:3:3-2:0:21", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2oracle/TestDelete/save_map.d2,1:2:7-1:15:20", + "key": { + "range": "d2/testdata/d2oracle/TestDelete/save_map.d2,1:2:7-1:7:12", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestDelete/save_map.d2,1:2:7-1:7:12", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestDelete/save_map.d2,1:9:14-1:15:20", + "value": [ + { + "string": "circle", + "raw_string": "circle" + } + ] + } + } + } + } + ] + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "label_dimensions": { + "width": 0, + "height": 0 + }, + "attributes": { + "label": { + "value": "" + }, + "style": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": { + "value": "" + } + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "b", + "id_val": "b", + "label_dimensions": { + "width": 0, + "height": 0 + }, + "references": [ + { + "key": { + "range": "d2/testdata/d2oracle/TestDelete/save_map.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestDelete/save_map.d2,0:0:0-0:1:1", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "b" + }, + "style": {}, + "near_key": null, + "shape": { + "value": "circle" + }, + "direction": { + "value": "" + }, + "constraint": { + "value": "" + } + }, + "zIndex": 0 + } + ] + }, + "err": "" +} From 7fd7003f77d09aaf766e3e0e9367dcce64db6b34 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Sat, 4 Mar 2023 00:44:53 -0800 Subject: [PATCH 3/4] cleanup --- d2oracle/edit.go | 1 - 1 file changed, 1 deletion(-) diff --git a/d2oracle/edit.go b/d2oracle/edit.go index 502640821..7c6eabcc6 100644 --- a/d2oracle/edit.go +++ b/d2oracle/edit.go @@ -931,7 +931,6 @@ func deleteObject(g *d2graph.Graph, key *d2ast.KeyPath, obj *d2graph.Object) (*d for i := 0; i < len(ref.MapKey.Value.Map.Nodes); i++ { n := ref.MapKey.Value.Map.Nodes[i] if n.MapKey != nil && n.MapKey.Key != nil { - println("\033[1;31m--- DEBUG:", "=======================", "\033[m") _, ok := d2graph.ReservedKeywords[n.MapKey.Key.Path[0].Unbox().ScalarString()] if ok { deleteFromMap(ref.MapKey.Value.Map, n.MapKey) From ea60464d6c796c7a59a408ae91886eafd0901adc Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Sat, 4 Mar 2023 00:57:44 -0800 Subject: [PATCH 4/4] remove primary --- d2oracle/edit.go | 3 + d2oracle/edit_test.go | 24 +++ .../drop_value_with_primary.exp.json | 110 ++++++++++++ .../TestDelete/save_map_with_primary.exp.json | 159 ++++++++++++++++++ 4 files changed, 296 insertions(+) create mode 100644 testdata/d2oracle/TestDelete/drop_value_with_primary.exp.json create mode 100644 testdata/d2oracle/TestDelete/save_map_with_primary.exp.json diff --git a/d2oracle/edit.go b/d2oracle/edit.go index 7c6eabcc6..92053c58e 100644 --- a/d2oracle/edit.go +++ b/d2oracle/edit.go @@ -909,6 +909,9 @@ func deleteObject(g *d2graph.Graph, key *d2ast.KeyPath, obj *d2graph.Object) (*d if len(ref.MapKey.Edges) == 0 { isSuffix := ref.KeyPathIndex == len(ref.Key.Path)-1 + if isSuffix && ref.MapKey != nil { + ref.MapKey.Primary = d2ast.ScalarBox{} + } ref.Key.Path = append(ref.Key.Path[:ref.KeyPathIndex], ref.Key.Path[ref.KeyPathIndex+1:]...) withoutSpecial := go2.Filter(ref.Key.Path, func(x *d2ast.StringBox) bool { _, isReserved := d2graph.ReservedKeywords[x.Unbox().ScalarString()] diff --git a/d2oracle/edit_test.go b/d2oracle/edit_test.go index ee07dc32b..3e093033d 100644 --- a/d2oracle/edit_test.go +++ b/d2oracle/edit_test.go @@ -4862,6 +4862,17 @@ Text 2 key: `a.b.c`, exp: `a.b +`, + }, + { + name: "drop_value_with_primary", + text: `a.b: hello { + shape: circle +} +`, + key: `a.b`, + + exp: `a `, }, { @@ -4875,6 +4886,19 @@ Text 2 exp: `b: { shape: circle } +`, + }, + { + name: "save_map_with_primary", + text: `a.b: hello { + shape: circle +} +`, + key: `a`, + + exp: `b: hello { + shape: circle +} `, }, { diff --git a/testdata/d2oracle/TestDelete/drop_value_with_primary.exp.json b/testdata/d2oracle/TestDelete/drop_value_with_primary.exp.json new file mode 100644 index 000000000..12c19c189 --- /dev/null +++ b/testdata/d2oracle/TestDelete/drop_value_with_primary.exp.json @@ -0,0 +1,110 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2oracle/TestDelete/drop_value_with_primary.d2,0:0:0-1:0:2", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2oracle/TestDelete/drop_value_with_primary.d2,0:0:0-0:1:1", + "key": { + "range": "d2/testdata/d2oracle/TestDelete/drop_value_with_primary.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestDelete/drop_value_with_primary.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "label_dimensions": { + "width": 0, + "height": 0 + }, + "attributes": { + "label": { + "value": "" + }, + "style": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": { + "value": "" + } + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "a", + "id_val": "a", + "label_dimensions": { + "width": 0, + "height": 0 + }, + "references": [ + { + "key": { + "range": "d2/testdata/d2oracle/TestDelete/drop_value_with_primary.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestDelete/drop_value_with_primary.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" + }, + "style": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": { + "value": "" + } + }, + "zIndex": 0 + } + ] + }, + "err": "" +} diff --git a/testdata/d2oracle/TestDelete/save_map_with_primary.exp.json b/testdata/d2oracle/TestDelete/save_map_with_primary.exp.json new file mode 100644 index 000000000..39262ed2c --- /dev/null +++ b/testdata/d2oracle/TestDelete/save_map_with_primary.exp.json @@ -0,0 +1,159 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2oracle/TestDelete/save_map_with_primary.d2,0:0:0-3:0:29", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2oracle/TestDelete/save_map_with_primary.d2,0:0:0-2:1:28", + "key": { + "range": "d2/testdata/d2oracle/TestDelete/save_map_with_primary.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestDelete/save_map_with_primary.d2,0:0:0-0:1:1", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "primary": { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestDelete/save_map_with_primary.d2,0:3:3-0:8:8", + "value": [ + { + "string": "hello", + "raw_string": "hello" + } + ] + } + }, + "value": { + "map": { + "range": "d2/testdata/d2oracle/TestDelete/save_map_with_primary.d2,0:9:9-2:0:27", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2oracle/TestDelete/save_map_with_primary.d2,1:2:13-1:15:26", + "key": { + "range": "d2/testdata/d2oracle/TestDelete/save_map_with_primary.d2,1:2:13-1:7:18", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestDelete/save_map_with_primary.d2,1:2:13-1:7:18", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestDelete/save_map_with_primary.d2,1:9:20-1:15:26", + "value": [ + { + "string": "circle", + "raw_string": "circle" + } + ] + } + } + } + } + ] + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "label_dimensions": { + "width": 0, + "height": 0 + }, + "attributes": { + "label": { + "value": "" + }, + "style": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": { + "value": "" + } + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "b", + "id_val": "b", + "label_dimensions": { + "width": 0, + "height": 0 + }, + "references": [ + { + "key": { + "range": "d2/testdata/d2oracle/TestDelete/save_map_with_primary.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestDelete/save_map_with_primary.d2,0:0:0-0:1:1", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "hello" + }, + "style": {}, + "near_key": null, + "shape": { + "value": "circle" + }, + "direction": { + "value": "" + }, + "constraint": { + "value": "" + } + }, + "zIndex": 0 + } + ] + }, + "err": "" +}