From 102560a8ada5590cf9f544047942c744d563499d Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Sun, 5 Feb 2023 10:36:38 -0800 Subject: [PATCH 01/17] implement validation --- d2compiler/compile.go | 40 +- d2compiler/compile_test.go | 43 +- d2exporter/export.go | 2 +- d2graph/d2graph.go | 4 +- .../TestCompile/basic_icon.exp.json | 6 + .../TestCompile/basic_sequence.exp.json | 6 + .../TestCompile/basic_shape.exp.json | 6 + .../TestCompile/basic_style.exp.json | 6 + .../TestCompile/class_paren.exp.json | 6 + .../TestCompile/class_style.exp.json | 6 + .../TestCompile/constraint_label.exp.json | 6 + .../TestCompile/default_direction.exp.json | 6 + .../TestCompile/dimension_with_style.exp.json | 6 + .../dimensions_on_nonimage.exp.json | 6 + testdata/d2compiler/TestCompile/edge.exp.json | 12 + .../edge_arrowhead_fields.exp.json | 18 + .../TestCompile/edge_chain.exp.json | 18 + .../TestCompile/edge_chain_map.exp.json | 18 + .../TestCompile/edge_column_index.exp.json | 12 + .../TestCompile/edge_exclusive_style.exp.json | 12 + .../TestCompile/edge_flat_arrowhead.exp.json | 15 + .../edge_flat_label_arrowhead.exp.json | 15 + .../TestCompile/edge_in_column.exp.json | 15 + .../TestCompile/edge_index.exp.json | 12 + .../TestCompile/edge_index_map.exp.json | 12 + .../TestCompile/edge_index_nested.exp.json | 15 + .../edge_index_nested_cross_scope.exp.json | 15 + .../edge_key_group_flat_nested.exp.json | 15 + ..._key_group_flat_nested_underscore.exp.json | 15 + ..._group_map_flat_nested_underscore.exp.json | 15 + ...e_key_group_map_nested_underscore.exp.json | 15 + .../TestCompile/edge_label_map.exp.json | 12 + .../d2compiler/TestCompile/edge_map.exp.json | 12 + .../TestCompile/edge_map_arrowhead.exp.json | 15 + .../TestCompile/edge_map_group_flat.exp.json | 12 + .../edge_map_group_semiflat.exp.json | 12 + .../TestCompile/edge_map_nested.exp.json | 12 + .../TestCompile/edge_map_nested_flat.exp.json | 12 + .../TestCompile/edge_mixed_arrowhead.exp.json | 18 + .../edge_non_shape_arrowhead.exp.json | 15 + .../edge_semiflat_arrowhead.exp.json | 15 + .../TestCompile/escaped_id.exp.json | 6 + .../TestCompile/image_style.exp.json | 6 + .../TestCompile/link-board-nested.exp.json | 451 ++++++++++++++++++ .../TestCompile/link-board-not-board.exp.json | 12 + .../TestCompile/link-board-not-found.exp.json | 12 + .../TestCompile/link-board-ok.exp.json | 199 ++++++++ .../TestCompile/near_constant.exp.json | 6 + .../TestCompile/nested_sql.exp.json | 9 + testdata/d2compiler/TestCompile/null.exp.json | 6 + .../d2compiler/TestCompile/path_link.exp.json | 9 +- .../reserved_icon_near_style.exp.json | 9 + .../TestCompile/root_direction.exp.json | 3 + .../TestCompile/root_sequence.exp.json | 3 + .../TestCompile/self-referencing.exp.json | 9 + .../TestCompile/sequence_container.exp.json | 30 ++ .../TestCompile/sequence_container_2.exp.json | 30 ++ .../sequence_grouped_note.exp.json | 15 + .../TestCompile/sequence_scoping.exp.json | 33 ++ .../TestCompile/set_direction.exp.json | 6 + .../single_dimension_on_circle.exp.json | 6 + .../TestCompile/sql-regression.exp.json | 12 + .../d2compiler/TestCompile/sql_paren.exp.json | 6 + .../TestCompile/stroke-width.exp.json | 6 + .../table_connection_attr.exp.json | 12 + .../TestCompile/table_style.exp.json | 6 + .../TestCompile/table_style_map.exp.json | 6 + .../TestCompile/underscore_edge.exp.json | 12 + .../underscore_edge_chain.exp.json | 18 + .../underscore_edge_existing.exp.json | 18 + .../underscore_edge_index.exp.json | 15 + .../underscore_edge_nested.exp.json | 15 + .../underscore_parent_create.exp.json | 9 + .../underscore_parent_not_root.exp.json | 12 + .../underscore_parent_preference_1.exp.json | 9 + .../underscore_parent_preference_2.exp.json | 9 + .../underscore_parent_squared.exp.json | 12 + .../underscore_unresolved_obj.exp.json | 9 + .../TestCompile/unescaped_id_cr.exp.json | 6 + .../d2compiler/TestCompile/url_link.exp.json | 9 +- .../TestCompile/wrong_column_index.exp.json | 12 + .../TestCompile2/boards/recursive.exp.json | 30 ++ .../TestCompile2/boards/root.exp.json | 18 + 83 files changed, 1642 insertions(+), 12 deletions(-) create mode 100644 testdata/d2compiler/TestCompile/link-board-nested.exp.json create mode 100644 testdata/d2compiler/TestCompile/link-board-not-board.exp.json create mode 100644 testdata/d2compiler/TestCompile/link-board-not-found.exp.json create mode 100644 testdata/d2compiler/TestCompile/link-board-ok.exp.json diff --git a/d2compiler/compile.go b/d2compiler/compile.go index 584dd20afb..e0e99d1c60 100644 --- a/d2compiler/compile.go +++ b/d2compiler/compile.go @@ -71,6 +71,9 @@ func (c *compiler) compileBoard(g *d2graph.Graph, ir *d2ir.Map) *d2graph.Graph { c.compileBoardsField(g, ir, "layers") c.compileBoardsField(g, ir, "scenarios") c.compileBoardsField(g, ir, "steps") + + c.validateBoardLink(g, ir) + return g } @@ -275,7 +278,9 @@ func (c *compiler) compileReserved(attrs *d2graph.Attributes, f *d2ir.Field) { attrs.Height.Value = scalar.ScalarString() attrs.Height.MapKey = f.LastPrimaryKey() case "link": - attrs.Link = scalar.ScalarString() + attrs.Link.Value = scalar.ScalarString() + attrs.Link.MapKey = f.LastPrimaryKey() + attrs.Link.MapKey.Range = scalar.GetRange() case "direction": dirs := []string{"up", "down", "right", "left"} if !go2.Contains(dirs, scalar.ScalarString()) { @@ -646,6 +651,39 @@ func (c *compiler) validateNear(g *d2graph.Graph) { } } +func (c *compiler) validateBoardLink(g *d2graph.Graph, ir *d2ir.Map) { + for _, obj := range g.Objects { + if obj.Attributes.Link.Value == "" { + continue + } + + linkKey, err := d2parser.ParseKey(obj.Attributes.Link.Value) + // Links can be urls + if err != nil { + continue + } + + // If the keyword is not another board, don't validate + // Might just be linking to a local folder + switch linkKey.Path[0].Unbox().ScalarString() { + case "layers", "scenarios", "steps": + default: + continue + } + + b := ir.GetField(linkKey.IDA()...) + if b == nil { + c.errorf(obj.Attributes.Link.MapKey, "link key %#v to board not found", obj.Attributes.Link.Value) + continue + } + kind := d2ir.NodeBoardKind(b) + if kind == "" { + c.errorf(obj.Attributes.Link.MapKey, "internal link key %#v is not a top-level board", obj.Attributes.Link.Value) + continue + } + } +} + func init() { FullToShortLanguageAliases = make(map[string]string, len(ShortToFullLanguageAliases)) for k, v := range ShortToFullLanguageAliases { diff --git a/d2compiler/compile_test.go b/d2compiler/compile_test.go index 37e68632c3..50c1ef32e5 100644 --- a/d2compiler/compile_test.go +++ b/d2compiler/compile_test.go @@ -1351,8 +1351,8 @@ x -> y: { if len(g.Objects) != 1 { t.Fatal(g.Objects) } - if g.Objects[0].Attributes.Link != "https://google.com" { - t.Fatal(g.Objects[0].Attributes.Link) + if g.Objects[0].Attributes.Link.Value != "https://google.com" { + t.Fatal(g.Objects[0].Attributes.Link.Value) } }, }, @@ -1367,8 +1367,8 @@ x -> y: { if len(g.Objects) != 1 { t.Fatal(g.Objects) } - if g.Objects[0].Attributes.Link != "Overview.Untitled board 7.zzzzz" { - t.Fatal(g.Objects[0].Attributes.Link) + if g.Objects[0].Attributes.Link.Value != "Overview.Untitled board 7.zzzzz" { + t.Fatal(g.Objects[0].Attributes.Link.Value) } }, }, @@ -1899,6 +1899,41 @@ Chinchillas_Collectibles.chinchilla -> Chinchillas.id`, tassert.Equal(t, 2, *g.Edges[0].SrcTableColumnIndex) }, }, + { + name: "link-board-ok", + text: `x.link: layers.x +layers: { + x +}`, + }, + { + name: "link-board-not-found", + text: `x.link: layers.x +`, + expErr: `d2/testdata/d2compiler/TestCompile/link-board-not-found.d2:1:9: link key "layers.x" to board not found`, + }, + { + name: "link-board-not-board", + text: `zzz +x.link: layers.x.y +layers: { + x: { + y + } +}`, + expErr: `d2/testdata/d2compiler/TestCompile/link-board-not-board.d2:2:9: internal link key "layers.x.y" is not a top-level board`, + }, + { + name: "link-board-nested", + text: `x.link: layers.x.layers.x +layers: { + x: { + layers: { + x + } + } +}`, + }, } for _, tc := range testCases { diff --git a/d2exporter/export.go b/d2exporter/export.go index 5a57f0881b..3f4989b21c 100644 --- a/d2exporter/export.go +++ b/d2exporter/export.go @@ -150,7 +150,7 @@ func toShape(obj *d2graph.Object, theme *d2themes.Theme) d2target.Shape { } shape.Tooltip = obj.Attributes.Tooltip - shape.Link = obj.Attributes.Link + shape.Link = obj.Attributes.Link.Value shape.Icon = obj.Attributes.Icon if obj.IconPosition != nil { shape.IconPosition = *obj.IconPosition diff --git a/d2graph/d2graph.go b/d2graph/d2graph.go index f74b14496d..4b2ed84a81 100644 --- a/d2graph/d2graph.go +++ b/d2graph/d2graph.go @@ -96,7 +96,7 @@ type Attributes struct { Style Style `json:"style"` Icon *url.URL `json:"icon,omitempty"` Tooltip string `json:"tooltip,omitempty"` - Link string `json:"link,omitempty"` + Link Scalar `json:"link"` // Only applicable for images right now Width *Scalar `json:"width,omitempty"` @@ -1263,7 +1263,7 @@ func (g *Graph) SetDimensions(mtexts []*d2target.MText, ruler *textmeasure.Ruler switch shapeType { case shape.TABLE_TYPE, shape.CLASS_TYPE, shape.CODE_TYPE, shape.IMAGE_TYPE: default: - if obj.Attributes.Link != "" { + if obj.Attributes.Link.Value != "" { paddingX += 32 } if obj.Attributes.Tooltip != "" { diff --git a/testdata/d2compiler/TestCompile/basic_icon.exp.json b/testdata/d2compiler/TestCompile/basic_icon.exp.json index d4588e7872..a3b570bd79 100644 --- a/testdata/d2compiler/TestCompile/basic_icon.exp.json +++ b/testdata/d2compiler/TestCompile/basic_icon.exp.json @@ -85,6 +85,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -146,6 +149,9 @@ "Fragment": "", "RawFragment": "" }, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/basic_sequence.exp.json b/testdata/d2compiler/TestCompile/basic_sequence.exp.json index 74535d9b36..786168eb57 100644 --- a/testdata/d2compiler/TestCompile/basic_sequence.exp.json +++ b/testdata/d2compiler/TestCompile/basic_sequence.exp.json @@ -80,6 +80,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -129,6 +132,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "sequence_diagram" diff --git a/testdata/d2compiler/TestCompile/basic_shape.exp.json b/testdata/d2compiler/TestCompile/basic_shape.exp.json index a519d65a1d..7b2266f7a9 100644 --- a/testdata/d2compiler/TestCompile/basic_shape.exp.json +++ b/testdata/d2compiler/TestCompile/basic_shape.exp.json @@ -80,6 +80,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -129,6 +132,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "circle" diff --git a/testdata/d2compiler/TestCompile/basic_style.exp.json b/testdata/d2compiler/TestCompile/basic_style.exp.json index fb33638bad..d278ad24df 100644 --- a/testdata/d2compiler/TestCompile/basic_style.exp.json +++ b/testdata/d2compiler/TestCompile/basic_style.exp.json @@ -87,6 +87,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -140,6 +143,9 @@ "value": "0.4" } }, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/class_paren.exp.json b/testdata/d2compiler/TestCompile/class_paren.exp.json index 68fb7cf19b..3931f4558f 100644 --- a/testdata/d2compiler/TestCompile/class_paren.exp.json +++ b/testdata/d2compiler/TestCompile/class_paren.exp.json @@ -179,6 +179,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -249,6 +252,9 @@ "value": "shape" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "class" diff --git a/testdata/d2compiler/TestCompile/class_style.exp.json b/testdata/d2compiler/TestCompile/class_style.exp.json index 1d39a3212b..8dd910add8 100644 --- a/testdata/d2compiler/TestCompile/class_style.exp.json +++ b/testdata/d2compiler/TestCompile/class_style.exp.json @@ -153,6 +153,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -216,6 +219,9 @@ "value": "0.4" } }, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "class" diff --git a/testdata/d2compiler/TestCompile/constraint_label.exp.json b/testdata/d2compiler/TestCompile/constraint_label.exp.json index 5e917a0182..c948a21270 100644 --- a/testdata/d2compiler/TestCompile/constraint_label.exp.json +++ b/testdata/d2compiler/TestCompile/constraint_label.exp.json @@ -113,6 +113,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -162,6 +165,9 @@ "value": "bar" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/default_direction.exp.json b/testdata/d2compiler/TestCompile/default_direction.exp.json index 072ac22af8..b3c7e8526d 100644 --- a/testdata/d2compiler/TestCompile/default_direction.exp.json +++ b/testdata/d2compiler/TestCompile/default_direction.exp.json @@ -41,6 +41,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -90,6 +93,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/dimension_with_style.exp.json b/testdata/d2compiler/TestCompile/dimension_with_style.exp.json index 9f346789d5..f410ea0ba8 100644 --- a/testdata/d2compiler/TestCompile/dimension_with_style.exp.json +++ b/testdata/d2compiler/TestCompile/dimension_with_style.exp.json @@ -115,6 +115,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -168,6 +171,9 @@ "value": "true" } }, + "link": { + "value": "" + }, "width": { "value": "200" }, diff --git a/testdata/d2compiler/TestCompile/dimensions_on_nonimage.exp.json b/testdata/d2compiler/TestCompile/dimensions_on_nonimage.exp.json index 27d605bfa4..a1822b4c47 100644 --- a/testdata/d2compiler/TestCompile/dimensions_on_nonimage.exp.json +++ b/testdata/d2compiler/TestCompile/dimensions_on_nonimage.exp.json @@ -143,6 +143,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -192,6 +195,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "width": { "value": "200" }, diff --git a/testdata/d2compiler/TestCompile/edge.exp.json b/testdata/d2compiler/TestCompile/edge.exp.json index 636b4fb3dc..a452dafd1f 100644 --- a/testdata/d2compiler/TestCompile/edge.exp.json +++ b/testdata/d2compiler/TestCompile/edge.exp.json @@ -64,6 +64,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -99,6 +102,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -148,6 +154,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -195,6 +204,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json b/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json index 02147eba13..028f4c36c5 100644 --- a/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json +++ b/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json @@ -243,6 +243,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -272,6 +275,9 @@ "value": "Reisner's Rule of Conceptual Inertia" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "diamond" @@ -293,6 +299,9 @@ "value": "true" } }, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -314,6 +323,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -363,6 +375,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -410,6 +425,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_chain.exp.json b/testdata/d2compiler/TestCompile/edge_chain.exp.json index 124bbc7f0d..c67619e4d5 100644 --- a/testdata/d2compiler/TestCompile/edge_chain.exp.json +++ b/testdata/d2compiler/TestCompile/edge_chain.exp.json @@ -111,6 +111,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -146,6 +149,9 @@ "value": "The kids will love our inflatable slides" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -180,6 +186,9 @@ "value": "The kids will love our inflatable slides" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -229,6 +238,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -296,6 +308,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -343,6 +358,9 @@ "value": "z" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_chain_map.exp.json b/testdata/d2compiler/TestCompile/edge_chain_map.exp.json index dd7ea9f90b..8627ffc72e 100644 --- a/testdata/d2compiler/TestCompile/edge_chain_map.exp.json +++ b/testdata/d2compiler/TestCompile/edge_chain_map.exp.json @@ -140,6 +140,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -175,6 +178,9 @@ "value": "Space: the final frontier. These are the voyages of the starship Enterprise." }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -209,6 +215,9 @@ "value": "Space: the final frontier. These are the voyages of the starship Enterprise." }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -258,6 +267,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -325,6 +337,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -372,6 +387,9 @@ "value": "z" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_column_index.exp.json b/testdata/d2compiler/TestCompile/edge_column_index.exp.json index 22fb0bf425..be203773cd 100644 --- a/testdata/d2compiler/TestCompile/edge_column_index.exp.json +++ b/testdata/d2compiler/TestCompile/edge_column_index.exp.json @@ -342,6 +342,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -379,6 +382,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -519,6 +525,9 @@ "value": "src" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "sql_table" @@ -657,6 +666,9 @@ "value": "dst" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "sql_table" diff --git a/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json b/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json index 2526682017..c27262cb97 100644 --- a/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json +++ b/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json @@ -109,6 +109,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -148,6 +151,9 @@ "value": "true" } }, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -197,6 +203,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -244,6 +253,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json index d84e0455d4..3d4455e774 100644 --- a/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json @@ -152,6 +152,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -181,6 +184,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "diamond" @@ -206,6 +212,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -275,6 +284,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -342,6 +354,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json index 83b5d71830..1a49c8782a 100644 --- a/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json @@ -120,6 +120,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -149,6 +152,9 @@ "value": "yo" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -171,6 +177,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -220,6 +229,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -267,6 +279,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_in_column.exp.json b/testdata/d2compiler/TestCompile/edge_in_column.exp.json index 7783ac781f..1a3bec53f3 100644 --- a/testdata/d2compiler/TestCompile/edge_in_column.exp.json +++ b/testdata/d2compiler/TestCompile/edge_in_column.exp.json @@ -155,6 +155,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -190,6 +193,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -271,6 +277,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "sql_table" @@ -318,6 +327,9 @@ "value": "p" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -365,6 +377,9 @@ "value": "q" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_index.exp.json b/testdata/d2compiler/TestCompile/edge_index.exp.json index f768c55880..ff223eef46 100644 --- a/testdata/d2compiler/TestCompile/edge_index.exp.json +++ b/testdata/d2compiler/TestCompile/edge_index.exp.json @@ -135,6 +135,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -173,6 +176,9 @@ "value": "two" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -242,6 +248,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -309,6 +318,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_index_map.exp.json b/testdata/d2compiler/TestCompile/edge_index_map.exp.json index 3eff01b38d..1155cf9010 100644 --- a/testdata/d2compiler/TestCompile/edge_index_map.exp.json +++ b/testdata/d2compiler/TestCompile/edge_index_map.exp.json @@ -154,6 +154,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -192,6 +195,9 @@ "value": "Space: the final frontier. These are the voyages of the starship Enterprise." }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -261,6 +267,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -328,6 +337,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_index_nested.exp.json b/testdata/d2compiler/TestCompile/edge_index_nested.exp.json index 900dde803d..8708aa601d 100644 --- a/testdata/d2compiler/TestCompile/edge_index_nested.exp.json +++ b/testdata/d2compiler/TestCompile/edge_index_nested.exp.json @@ -164,6 +164,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -202,6 +205,9 @@ "value": "two" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -251,6 +257,9 @@ "value": "b" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -318,6 +327,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -385,6 +397,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json b/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json index 63e0279b71..9781484232 100644 --- a/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json +++ b/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json @@ -180,6 +180,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -218,6 +221,9 @@ "value": "two" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -287,6 +293,9 @@ "value": "b" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -354,6 +363,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -421,6 +433,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.exp.json b/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.exp.json index 0d1e24e0eb..a93563c2ea 100644 --- a/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.exp.json +++ b/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.exp.json @@ -193,6 +193,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -235,6 +238,9 @@ "value": "0.4" } }, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -304,6 +310,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -371,6 +380,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -438,6 +450,9 @@ "value": "b" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.exp.json b/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.exp.json index c5845edcbd..31498cc758 100644 --- a/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.exp.json +++ b/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.exp.json @@ -199,6 +199,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -241,6 +244,9 @@ "value": "0.4" } }, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -290,6 +296,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -337,6 +346,9 @@ "value": "b" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -384,6 +396,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.exp.json b/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.exp.json index 4069495d14..0920d1f757 100644 --- a/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.exp.json +++ b/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.exp.json @@ -212,6 +212,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -254,6 +257,9 @@ "value": "0.4" } }, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -303,6 +309,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -350,6 +359,9 @@ "value": "b" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -397,6 +409,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.exp.json b/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.exp.json index b8e131947a..4deb3e58de 100644 --- a/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.exp.json +++ b/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.exp.json @@ -230,6 +230,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -272,6 +275,9 @@ "value": "0.4" } }, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -321,6 +327,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -368,6 +377,9 @@ "value": "b" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -415,6 +427,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_label_map.exp.json b/testdata/d2compiler/TestCompile/edge_label_map.exp.json index f70133e233..4ca65a2da1 100644 --- a/testdata/d2compiler/TestCompile/edge_label_map.exp.json +++ b/testdata/d2compiler/TestCompile/edge_label_map.exp.json @@ -120,6 +120,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -159,6 +162,9 @@ "value": "0.5" } }, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -208,6 +214,9 @@ "value": "hey y9" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -255,6 +264,9 @@ "value": "qwer" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_map.exp.json b/testdata/d2compiler/TestCompile/edge_map.exp.json index 0901560aa7..d696404e79 100644 --- a/testdata/d2compiler/TestCompile/edge_map.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map.exp.json @@ -103,6 +103,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -138,6 +141,9 @@ "value": "Space: the final frontier. These are the voyages of the starship Enterprise." }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -187,6 +193,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -234,6 +243,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json index 7ab789ec08..6153ccce74 100644 --- a/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json @@ -132,6 +132,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -161,6 +164,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "diamond" @@ -183,6 +189,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -232,6 +241,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -279,6 +291,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json b/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json index ef4b689aae..d20399edfc 100644 --- a/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json @@ -148,6 +148,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -190,6 +193,9 @@ "value": "0.4" } }, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -259,6 +265,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -326,6 +335,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json b/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json index 13da7398c7..fb1ea295e6 100644 --- a/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json @@ -166,6 +166,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -208,6 +211,9 @@ "value": "0.4" } }, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -277,6 +283,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -344,6 +353,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_map_nested.exp.json b/testdata/d2compiler/TestCompile/edge_map_nested.exp.json index e51525ab63..42dd5da05a 100644 --- a/testdata/d2compiler/TestCompile/edge_map_nested.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_nested.exp.json @@ -128,6 +128,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -167,6 +170,9 @@ "value": "0.4" } }, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -216,6 +222,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -263,6 +272,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json b/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json index a7541c4597..09b0f036a9 100644 --- a/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json @@ -110,6 +110,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -149,6 +152,9 @@ "value": "0.4" } }, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -198,6 +204,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -245,6 +254,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json index bbc7e6603c..1e4f587b56 100644 --- a/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json @@ -220,6 +220,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -249,6 +252,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "diamond" @@ -266,6 +272,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "diamond" @@ -290,6 +299,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -359,6 +371,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -426,6 +441,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json index ec7a399069..88b241d6c5 100644 --- a/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json @@ -114,6 +114,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -143,6 +146,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "triangle" @@ -165,6 +171,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -214,6 +223,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -261,6 +273,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json index bd91085339..d177c105f1 100644 --- a/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json @@ -170,6 +170,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -199,6 +202,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "diamond" @@ -224,6 +230,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -293,6 +302,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -360,6 +372,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/escaped_id.exp.json b/testdata/d2compiler/TestCompile/escaped_id.exp.json index bdb71deb0f..9fcce910e6 100644 --- a/testdata/d2compiler/TestCompile/escaped_id.exp.json +++ b/testdata/d2compiler/TestCompile/escaped_id.exp.json @@ -41,6 +41,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -90,6 +93,9 @@ "value": "b\nb" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/image_style.exp.json b/testdata/d2compiler/TestCompile/image_style.exp.json index ffc9aea3fb..54a03f9486 100644 --- a/testdata/d2compiler/TestCompile/image_style.exp.json +++ b/testdata/d2compiler/TestCompile/image_style.exp.json @@ -162,6 +162,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -227,6 +230,9 @@ "Fragment": "", "RawFragment": "" }, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "image" diff --git a/testdata/d2compiler/TestCompile/link-board-nested.exp.json b/testdata/d2compiler/TestCompile/link-board-nested.exp.json new file mode 100644 index 0000000000..4cac13579b --- /dev/null +++ b/testdata/d2compiler/TestCompile/link-board-nested.exp.json @@ -0,0 +1,451 @@ +{ + "graph": { + "name": "", + "ast": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:0:0-7:1:75", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:8:8-0:25:25", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:0:0-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:2:2-0:6:6", + "value": [ + { + "string": "link", + "raw_string": "link" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:8:8-0:25:25", + "value": [ + { + "string": "layers.x.layers.x", + "raw_string": "layers.x.layers.x" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,1:0:26-7:1:75", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,1:0:26-1:6:32", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,1:0:26-1:6:32", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,1:8:34-7:0:74", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,2:1:37-6:3:73", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,2:1:37-2:2:38", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,2:1:37-2:2:38", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,2:4:40-6:2:72", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,3:4:46-5:5:69", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,3:4:46-3:10:52", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,3:4:46-3:10:52", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,3:12:54-5:4:68", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,4:6:62-4:7:63", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,4:6:62-4:7:63", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,4:6:62-4:7:63", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "label_dimensions": { + "width": 0, + "height": 0 + }, + "attributes": { + "label": { + "value": "" + }, + "style": {}, + "link": { + "value": "" + }, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": { + "value": "" + } + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "x", + "id_val": "x", + "label_dimensions": { + "width": 0, + "height": 0 + }, + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:0:0-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:2:2-0:6:6", + "value": [ + { + "string": "link", + "raw_string": "link" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "x" + }, + "style": {}, + "link": { + "value": "layers.x.layers.x" + }, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": { + "value": "" + } + }, + "zIndex": 0 + } + ], + "layers": [ + { + "name": "x", + "ast": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:0:0-7:1:75", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:8:8-0:25:25", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:0:0-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:2:2-0:6:6", + "value": [ + { + "string": "link", + "raw_string": "link" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:8:8-0:25:25", + "value": [ + { + "string": "layers.x.layers.x", + "raw_string": "layers.x.layers.x" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,1:0:26-7:1:75", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,1:0:26-1:6:32", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,1:0:26-1:6:32", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,1:8:34-7:0:74", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,2:1:37-6:3:73", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,2:1:37-2:2:38", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,2:1:37-2:2:38", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,2:4:40-6:2:72", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,3:4:46-5:5:69", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,3:4:46-3:10:52", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,3:4:46-3:10:52", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,3:12:54-5:4:68", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,4:6:62-4:7:63", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,4:6:62-4:7:63", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,4:6:62-4:7:63", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "label_dimensions": { + "width": 0, + "height": 0 + }, + "attributes": { + "label": { + "value": "" + }, + "style": {}, + "link": { + "value": "" + }, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": { + "value": "" + } + }, + "zIndex": 0 + }, + "edges": null, + "objects": null + } + ] + }, + "err": null +} diff --git a/testdata/d2compiler/TestCompile/link-board-not-board.exp.json b/testdata/d2compiler/TestCompile/link-board-not-board.exp.json new file mode 100644 index 0000000000..1885fdb6d3 --- /dev/null +++ b/testdata/d2compiler/TestCompile/link-board-not-board.exp.json @@ -0,0 +1,12 @@ +{ + "graph": null, + "err": { + "ioerr": null, + "errs": [ + { + "range": "d2/testdata/d2compiler/TestCompile/link-board-not-board.d2,1:8:12-1:18:22", + "errmsg": "d2/testdata/d2compiler/TestCompile/link-board-not-board.d2:2:9: internal link key \"layers.x.y\" is not a top-level board" + } + ] + } +} diff --git a/testdata/d2compiler/TestCompile/link-board-not-found.exp.json b/testdata/d2compiler/TestCompile/link-board-not-found.exp.json new file mode 100644 index 0000000000..8c8509b5d2 --- /dev/null +++ b/testdata/d2compiler/TestCompile/link-board-not-found.exp.json @@ -0,0 +1,12 @@ +{ + "graph": null, + "err": { + "ioerr": null, + "errs": [ + { + "range": "d2/testdata/d2compiler/TestCompile/link-board-not-found.d2,0:8:8-0:16:16", + "errmsg": "d2/testdata/d2compiler/TestCompile/link-board-not-found.d2:1:9: link key \"layers.x\" to board not found" + } + ] + } +} diff --git a/testdata/d2compiler/TestCompile/link-board-ok.exp.json b/testdata/d2compiler/TestCompile/link-board-ok.exp.json new file mode 100644 index 0000000000..b6e66ee2f7 --- /dev/null +++ b/testdata/d2compiler/TestCompile/link-board-ok.exp.json @@ -0,0 +1,199 @@ +{ + "graph": { + "name": "", + "ast": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,0:0:0-3:1:32", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,0:8:8-0:16:16", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,0:0:0-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,0:2:2-0:6:6", + "value": [ + { + "string": "link", + "raw_string": "link" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,0:8:8-0:16:16", + "value": [ + { + "string": "layers.x", + "raw_string": "layers.x" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,1:0:17-3:1:32", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,1:0:17-1:6:23", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,1:0:17-1:6:23", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,1:8:25-3:0:31", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,2:2:29-2:3:30", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,2:2:29-2:3:30", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,2:2:29-2:3:30", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + ] + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "label_dimensions": { + "width": 0, + "height": 0 + }, + "attributes": { + "label": { + "value": "" + }, + "style": {}, + "link": { + "value": "" + }, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": { + "value": "" + } + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "x", + "id_val": "x", + "label_dimensions": { + "width": 0, + "height": 0 + }, + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,0:0:0-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,0:2:2-0:6:6", + "value": [ + { + "string": "link", + "raw_string": "link" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "x" + }, + "style": {}, + "link": { + "value": "layers.x" + }, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": { + "value": "" + } + }, + "zIndex": 0 + } + ] + }, + "err": null +} diff --git a/testdata/d2compiler/TestCompile/near_constant.exp.json b/testdata/d2compiler/TestCompile/near_constant.exp.json index 7aa383a8d6..9730e36a58 100644 --- a/testdata/d2compiler/TestCompile/near_constant.exp.json +++ b/testdata/d2compiler/TestCompile/near_constant.exp.json @@ -62,6 +62,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -122,6 +125,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": { "range": "d2/testdata/d2compiler/TestCompile/near_constant.d2,0:8:8-0:18:18", "path": [ diff --git a/testdata/d2compiler/TestCompile/nested_sql.exp.json b/testdata/d2compiler/TestCompile/nested_sql.exp.json index cbd905feb0..24399cd47a 100644 --- a/testdata/d2compiler/TestCompile/nested_sql.exp.json +++ b/testdata/d2compiler/TestCompile/nested_sql.exp.json @@ -175,6 +175,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -224,6 +227,9 @@ "value": "outer" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -331,6 +337,9 @@ "value": "table" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "sql_table" diff --git a/testdata/d2compiler/TestCompile/null.exp.json b/testdata/d2compiler/TestCompile/null.exp.json index 35d0e55fbe..a8245a1a28 100644 --- a/testdata/d2compiler/TestCompile/null.exp.json +++ b/testdata/d2compiler/TestCompile/null.exp.json @@ -41,6 +41,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -90,6 +93,9 @@ "value": "null" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/path_link.exp.json b/testdata/d2compiler/TestCompile/path_link.exp.json index 9a1cb6fc30..284e04b66c 100644 --- a/testdata/d2compiler/TestCompile/path_link.exp.json +++ b/testdata/d2compiler/TestCompile/path_link.exp.json @@ -30,7 +30,7 @@ "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/path_link.d2,1:2:7-1:39:44", + "range": "d2/testdata/d2compiler/TestCompile/path_link.d2,1:8:13-1:39:44", "key": { "range": "d2/testdata/d2compiler/TestCompile/path_link.d2,1:2:7-1:6:11", "path": [ @@ -80,6 +80,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -129,7 +132,9 @@ "value": "x" }, "style": {}, - "link": "Overview.Untitled board 7.zzzzz", + "link": { + "value": "Overview.Untitled board 7.zzzzz" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json b/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json index b5e89869b8..2bf17c2798 100644 --- a/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json +++ b/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json @@ -275,6 +275,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -377,6 +380,9 @@ "Fragment": "", "RawFragment": "" }, + "link": { + "value": "" + }, "near_key": { "range": "d2/testdata/d2compiler/TestCompile/reserved_icon_near_style.d2,6:8:90-6:9:91", "path": [ @@ -439,6 +445,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/root_direction.exp.json b/testdata/d2compiler/TestCompile/root_direction.exp.json index 7f854e01c5..ed46978ad2 100644 --- a/testdata/d2compiler/TestCompile/root_direction.exp.json +++ b/testdata/d2compiler/TestCompile/root_direction.exp.json @@ -51,6 +51,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" diff --git a/testdata/d2compiler/TestCompile/root_sequence.exp.json b/testdata/d2compiler/TestCompile/root_sequence.exp.json index 3b18c9b7f2..edeebea234 100644 --- a/testdata/d2compiler/TestCompile/root_sequence.exp.json +++ b/testdata/d2compiler/TestCompile/root_sequence.exp.json @@ -51,6 +51,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "sequence_diagram" diff --git a/testdata/d2compiler/TestCompile/self-referencing.exp.json b/testdata/d2compiler/TestCompile/self-referencing.exp.json index e5769bdfbd..fbfee35ca2 100644 --- a/testdata/d2compiler/TestCompile/self-referencing.exp.json +++ b/testdata/d2compiler/TestCompile/self-referencing.exp.json @@ -64,6 +64,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -99,6 +102,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -168,6 +174,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/sequence_container.exp.json b/testdata/d2compiler/TestCompile/sequence_container.exp.json index a561fc72fb..62cfb63a6a 100644 --- a/testdata/d2compiler/TestCompile/sequence_container.exp.json +++ b/testdata/d2compiler/TestCompile/sequence_container.exp.json @@ -260,6 +260,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "sequence_diagram" @@ -295,6 +298,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -329,6 +335,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -442,6 +451,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -553,6 +565,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -664,6 +679,9 @@ "value": "q" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -775,6 +793,9 @@ "value": "j" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -886,6 +907,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -997,6 +1021,9 @@ "value": "p" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -1044,6 +1071,9 @@ "value": "ok" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/sequence_container_2.exp.json b/testdata/d2compiler/TestCompile/sequence_container_2.exp.json index 4674302c54..4b8abe15ae 100644 --- a/testdata/d2compiler/TestCompile/sequence_container_2.exp.json +++ b/testdata/d2compiler/TestCompile/sequence_container_2.exp.json @@ -238,6 +238,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "sequence_diagram" @@ -273,6 +276,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -386,6 +392,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -497,6 +506,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -608,6 +620,9 @@ "value": "q" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -655,6 +670,9 @@ "value": "ok" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -724,6 +742,9 @@ "value": "j" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -793,6 +814,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -862,6 +886,9 @@ "value": "p" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -909,6 +936,9 @@ "value": "meow" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/sequence_grouped_note.exp.json b/testdata/d2compiler/TestCompile/sequence_grouped_note.exp.json index aa5093e977..f19e60e11c 100644 --- a/testdata/d2compiler/TestCompile/sequence_grouped_note.exp.json +++ b/testdata/d2compiler/TestCompile/sequence_grouped_note.exp.json @@ -160,6 +160,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "sequence_diagram" @@ -209,6 +212,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -287,6 +293,9 @@ "value": "d" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -334,6 +343,9 @@ "value": "choo" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -392,6 +404,9 @@ "value": "this note" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/sequence_scoping.exp.json b/testdata/d2compiler/TestCompile/sequence_scoping.exp.json index 02af6b56a6..c0cf20990f 100644 --- a/testdata/d2compiler/TestCompile/sequence_scoping.exp.json +++ b/testdata/d2compiler/TestCompile/sequence_scoping.exp.json @@ -348,6 +348,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -383,6 +386,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -417,6 +423,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -451,6 +460,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -500,6 +512,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "sequence_diagram" @@ -598,6 +613,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -769,6 +787,9 @@ "value": "b" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -816,6 +837,9 @@ "value": "group" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -874,6 +898,9 @@ "value": "t1" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -1005,6 +1032,9 @@ "value": "t1" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -1074,6 +1104,9 @@ "value": "t2" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/set_direction.exp.json b/testdata/d2compiler/TestCompile/set_direction.exp.json index df116fbeeb..2c28dd65e3 100644 --- a/testdata/d2compiler/TestCompile/set_direction.exp.json +++ b/testdata/d2compiler/TestCompile/set_direction.exp.json @@ -80,6 +80,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -129,6 +132,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/single_dimension_on_circle.exp.json b/testdata/d2compiler/TestCompile/single_dimension_on_circle.exp.json index bf216c1c28..8ff698d3b8 100644 --- a/testdata/d2compiler/TestCompile/single_dimension_on_circle.exp.json +++ b/testdata/d2compiler/TestCompile/single_dimension_on_circle.exp.json @@ -114,6 +114,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -163,6 +166,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "height": { "value": "230" }, diff --git a/testdata/d2compiler/TestCompile/sql-regression.exp.json b/testdata/d2compiler/TestCompile/sql-regression.exp.json index 09e889feed..c13eaecb36 100644 --- a/testdata/d2compiler/TestCompile/sql-regression.exp.json +++ b/testdata/d2compiler/TestCompile/sql-regression.exp.json @@ -217,6 +217,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -270,6 +273,9 @@ "value": "lemonchiffon" } }, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -349,6 +355,9 @@ "value": "b" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "sql_table" @@ -396,6 +405,9 @@ "value": "d" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/sql_paren.exp.json b/testdata/d2compiler/TestCompile/sql_paren.exp.json index c61a984fa8..9b94f34b07 100644 --- a/testdata/d2compiler/TestCompile/sql_paren.exp.json +++ b/testdata/d2compiler/TestCompile/sql_paren.exp.json @@ -156,6 +156,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -265,6 +268,9 @@ "value": "shape" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "sql_table" diff --git a/testdata/d2compiler/TestCompile/stroke-width.exp.json b/testdata/d2compiler/TestCompile/stroke-width.exp.json index 6479ada26a..5e58364b58 100644 --- a/testdata/d2compiler/TestCompile/stroke-width.exp.json +++ b/testdata/d2compiler/TestCompile/stroke-width.exp.json @@ -87,6 +87,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -140,6 +143,9 @@ "value": "0" } }, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/table_connection_attr.exp.json b/testdata/d2compiler/TestCompile/table_connection_attr.exp.json index 8ec78e2da3..7f75f846f6 100644 --- a/testdata/d2compiler/TestCompile/table_connection_attr.exp.json +++ b/testdata/d2compiler/TestCompile/table_connection_attr.exp.json @@ -301,6 +301,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -342,6 +345,9 @@ "value": "true" } }, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -454,6 +460,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "sql_table" @@ -564,6 +573,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "sql_table" diff --git a/testdata/d2compiler/TestCompile/table_style.exp.json b/testdata/d2compiler/TestCompile/table_style.exp.json index a7447912ca..caf5ba3764 100644 --- a/testdata/d2compiler/TestCompile/table_style.exp.json +++ b/testdata/d2compiler/TestCompile/table_style.exp.json @@ -153,6 +153,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -238,6 +241,9 @@ "value": "0.4" } }, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "sql_table" diff --git a/testdata/d2compiler/TestCompile/table_style_map.exp.json b/testdata/d2compiler/TestCompile/table_style_map.exp.json index a81f2575db..bb2aa58753 100644 --- a/testdata/d2compiler/TestCompile/table_style_map.exp.json +++ b/testdata/d2compiler/TestCompile/table_style_map.exp.json @@ -204,6 +204,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -292,6 +295,9 @@ "value": "blue" } }, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "sql_table" diff --git a/testdata/d2compiler/TestCompile/underscore_edge.exp.json b/testdata/d2compiler/TestCompile/underscore_edge.exp.json index a44664b677..3780ddb0fc 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge.exp.json @@ -115,6 +115,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -150,6 +153,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -230,6 +236,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -288,6 +297,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json index 0f25d48192..3d0f17835b 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json @@ -174,6 +174,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -209,6 +212,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -243,6 +249,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -354,6 +363,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -412,6 +424,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -470,6 +485,9 @@ "value": "z" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json index fbb09bf261..aa3e6be5a0 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json @@ -181,6 +181,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -216,6 +219,9 @@ "value": "Can you imagine how life could be improved if we could do away with" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -250,6 +256,9 @@ "value": "Well, it's garish, ugly, and derelicts have used it for a toilet." }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -330,6 +339,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -408,6 +420,9 @@ "value": "b" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -455,6 +470,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json index b12d10cbd1..d70f05bc1a 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json @@ -186,6 +186,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -224,6 +227,9 @@ "value": "Well, it's garish, ugly, and derelicts have used it for a toilet." }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -273,6 +279,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -320,6 +329,9 @@ "value": "b" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -367,6 +379,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json index 43eb5dd758..4265e30727 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json @@ -155,6 +155,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -190,6 +193,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -239,6 +245,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -317,6 +326,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -386,6 +398,9 @@ "value": "z" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/underscore_parent_create.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_create.exp.json index cddc450bbd..0726910e84 100644 --- a/testdata/d2compiler/TestCompile/underscore_parent_create.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_parent_create.exp.json @@ -81,6 +81,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -130,6 +133,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -188,6 +194,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/underscore_parent_not_root.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_not_root.exp.json index d4bd78e028..c35b195c93 100644 --- a/testdata/d2compiler/TestCompile/underscore_parent_not_root.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_parent_not_root.exp.json @@ -110,6 +110,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -159,6 +162,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -206,6 +212,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -264,6 +273,9 @@ "value": "z" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/underscore_parent_preference_1.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_preference_1.exp.json index 8f7a7bf84c..a59ff2068a 100644 --- a/testdata/d2compiler/TestCompile/underscore_parent_preference_1.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_parent_preference_1.exp.json @@ -124,6 +124,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -173,6 +176,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -251,6 +257,9 @@ "value": "But it's real. And if it's real it can be affected ... we may not be able" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/underscore_parent_preference_2.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_preference_2.exp.json index d7bb50733a..612e79cbea 100644 --- a/testdata/d2compiler/TestCompile/underscore_parent_preference_2.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_parent_preference_2.exp.json @@ -124,6 +124,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -204,6 +207,9 @@ "value": "All we are given is possibilities -- to make ourselves one thing or another." }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -251,6 +257,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/underscore_parent_squared.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_squared.exp.json index aa3ea871a8..d99c73f5b8 100644 --- a/testdata/d2compiler/TestCompile/underscore_parent_squared.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_parent_squared.exp.json @@ -121,6 +121,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -170,6 +173,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -217,6 +223,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -286,6 +295,9 @@ "value": "z" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/underscore_unresolved_obj.exp.json b/testdata/d2compiler/TestCompile/underscore_unresolved_obj.exp.json index 6c2c9ac2dc..17b5f49ec6 100644 --- a/testdata/d2compiler/TestCompile/underscore_unresolved_obj.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_unresolved_obj.exp.json @@ -81,6 +81,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -130,6 +133,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -188,6 +194,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/unescaped_id_cr.exp.json b/testdata/d2compiler/TestCompile/unescaped_id_cr.exp.json index 280044b626..1b00d60cc3 100644 --- a/testdata/d2compiler/TestCompile/unescaped_id_cr.exp.json +++ b/testdata/d2compiler/TestCompile/unescaped_id_cr.exp.json @@ -41,6 +41,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -90,6 +93,9 @@ "value": "b\rb" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/url_link.exp.json b/testdata/d2compiler/TestCompile/url_link.exp.json index b0ebf8a9d5..d45e56b1aa 100644 --- a/testdata/d2compiler/TestCompile/url_link.exp.json +++ b/testdata/d2compiler/TestCompile/url_link.exp.json @@ -30,7 +30,7 @@ "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/url_link.d2,1:2:7-1:26:31", + "range": "d2/testdata/d2compiler/TestCompile/url_link.d2,1:8:13-1:26:31", "key": { "range": "d2/testdata/d2compiler/TestCompile/url_link.d2,1:2:7-1:6:11", "path": [ @@ -80,6 +80,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -129,7 +132,9 @@ "value": "x" }, "style": {}, - "link": "https://google.com", + "link": { + "value": "https://google.com" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/wrong_column_index.exp.json b/testdata/d2compiler/TestCompile/wrong_column_index.exp.json index 3bae4743f0..34598fc178 100644 --- a/testdata/d2compiler/TestCompile/wrong_column_index.exp.json +++ b/testdata/d2compiler/TestCompile/wrong_column_index.exp.json @@ -702,6 +702,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -739,6 +742,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -991,6 +997,9 @@ "value": "Chinchillas" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "sql_table" @@ -1157,6 +1166,9 @@ "value": "Chinchillas_Collectibles" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "sql_table" diff --git a/testdata/d2compiler/TestCompile2/boards/recursive.exp.json b/testdata/d2compiler/TestCompile2/boards/recursive.exp.json index 4496b07527..f42fd496d2 100644 --- a/testdata/d2compiler/TestCompile2/boards/recursive.exp.json +++ b/testdata/d2compiler/TestCompile2/boards/recursive.exp.json @@ -307,6 +307,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -356,6 +359,9 @@ "value": "base" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -679,6 +685,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -728,6 +737,9 @@ "value": "santa" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -1051,6 +1063,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -1100,6 +1115,9 @@ "value": "clause" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -1423,6 +1441,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -1472,6 +1493,9 @@ "value": "reindeer" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -1795,6 +1819,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -1844,6 +1871,9 @@ "value": "montana" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/boards/root.exp.json b/testdata/d2compiler/TestCompile2/boards/root.exp.json index 7efd58eac8..db6d203930 100644 --- a/testdata/d2compiler/TestCompile2/boards/root.exp.json +++ b/testdata/d2compiler/TestCompile2/boards/root.exp.json @@ -174,6 +174,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -223,6 +226,9 @@ "value": "base" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -413,6 +419,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -462,6 +471,9 @@ "value": "santa" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -652,6 +664,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -701,6 +716,9 @@ "value": "clause" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" From 0a677b382ec386c4ccfeff4e4b4c0872fdfd17f6 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Sun, 5 Feb 2023 10:39:02 -0800 Subject: [PATCH 02/17] update tests --- testdata/d2oracle/TestCreate/base.exp.json | 6 ++ .../d2oracle/TestCreate/container.exp.json | 9 +++ .../TestCreate/container_edge.exp.json | 15 ++++ .../TestCreate/container_edge_label.exp.json | 15 ++++ testdata/d2oracle/TestCreate/edge.exp.json | 12 ++++ .../d2oracle/TestCreate/edge_nested.exp.json | 15 ++++ .../d2oracle/TestCreate/edge_scope.exp.json | 15 ++++ .../TestCreate/edge_scope_flat.exp.json | 15 ++++ .../TestCreate/edge_scope_nested.exp.json | 18 +++++ .../d2oracle/TestCreate/edge_unique.exp.json | 30 ++++++++ testdata/d2oracle/TestCreate/gen_key.exp.json | 9 +++ .../d2oracle/TestCreate/gen_key_n.exp.json | 45 ++++++++++++ .../TestCreate/gen_key_nested.exp.json | 18 +++++ .../TestCreate/gen_key_scope.exp.json | 18 +++++ .../TestCreate/gen_key_suffix.exp.json | 9 +++ .../TestCreate/make_scope_multiline.exp.json | 9 +++ .../make_scope_multiline_spacing_1.exp.json | 15 ++++ .../make_scope_multiline_spacing_2.exp.json | 15 ++++ testdata/d2oracle/TestCreate/nested.exp.json | 12 ++++ testdata/d2oracle/TestCreate/scope.exp.json | 15 ++++ .../TestDelete/breakup_arrowhead.exp.json | 6 ++ .../d2oracle/TestDelete/children.exp.json | 15 ++++ .../TestDelete/children_conflicts.exp.json | 9 +++ .../children_edge_conflicts.exp.json | 15 ++++ .../children_edges_flat_conflicts.exp.json | 24 +++++++ .../children_flat_conflicts.exp.json | 9 +++ .../children_multiple_conflicts.exp.json | 18 +++++ .../children_nested_conflicts.exp.json | 12 ++++ ...ldren_nested_referenced_conflicts.exp.json | 12 ++++ .../children_no_self_conflict.exp.json | 6 ++ .../TestDelete/children_order.exp.json | 15 ++++ .../children_referenced_conflicts.exp.json | 9 +++ .../TestDelete/children_scope.exp.json | 21 ++++++ .../TestDelete/container_near.exp.json | 12 ++++ .../d2oracle/TestDelete/delete_icon.exp.json | 12 +++- .../d2oracle/TestDelete/delete_link.exp.json | 6 ++ .../d2oracle/TestDelete/delete_near.exp.json | 9 +++ .../delete_needed_flat_near.exp.json | 9 +++ .../delete_redundant_flat_near.exp.json | 9 +++ .../TestDelete/delete_tooltip.exp.json | 6 ++ .../edge_both_identical_childs.exp.json | 18 +++++ .../d2oracle/TestDelete/edge_common.exp.json | 12 ++++ .../TestDelete/edge_common_2.exp.json | 12 ++++ .../TestDelete/edge_common_3.exp.json | 12 ++++ .../TestDelete/edge_common_4.exp.json | 12 ++++ .../TestDelete/edge_conflict.exp.json | 18 +++++ .../TestDelete/edge_decrement.exp.json | 21 ++++++ .../d2oracle/TestDelete/edge_first.exp.json | 30 ++++++++ .../TestDelete/edge_flat_style.exp.json | 6 ++ .../TestDelete/edge_identical_child.exp.json | 21 ++++++ .../TestDelete/edge_key_style.exp.json | 12 ++++ .../d2oracle/TestDelete/edge_last.exp.json | 36 ++++++++++ .../TestDelete/edge_map_style.exp.json | 12 ++++ .../d2oracle/TestDelete/edge_middle.exp.json | 36 ++++++++++ .../d2oracle/TestDelete/empty_map.exp.json | 9 +++ testdata/d2oracle/TestDelete/flat.exp.json | 3 + .../TestDelete/flat_reserved.exp.json | 12 ++++ .../TestDelete/hoist_children.exp.json | 9 +++ .../TestDelete/hoist_edge_children.exp.json | 15 ++++ .../TestDelete/key_with_edges.exp.json | 12 ++++ .../TestDelete/key_with_edges_2.exp.json | 9 +++ .../TestDelete/key_with_edges_3.exp.json | 9 +++ .../TestDelete/key_with_edges_4.exp.json | 12 ++++ .../d2oracle/TestDelete/multi_near.exp.json | 15 ++++ .../multi_path_map_conflict.exp.json | 12 ++++ .../multi_path_map_no_conflict.exp.json | 12 ++++ .../multiple_flat_middle_container.exp.json | 12 ++++ .../TestDelete/multiple_flat_style.exp.json | 6 ++ .../TestDelete/multiple_map_styles.exp.json | 6 ++ testdata/d2oracle/TestDelete/near.exp.json | 6 ++ testdata/d2oracle/TestDelete/nested.exp.json | 12 ++++ .../d2oracle/TestDelete/nested_2.exp.json | 12 ++++ .../TestDelete/nested_edge_key_style.exp.json | 15 ++++ .../TestDelete/nested_flat_style.exp.json | 6 ++ .../TestDelete/nested_reserved.exp.json | 12 ++++ .../nested_underscore_update.exp.json | 9 +++ .../d2oracle/TestDelete/node_in_edge.exp.json | 27 +++++++ .../TestDelete/node_in_edge_last.exp.json | 33 +++++++++ .../only_delete_edge_reserved.exp.json | 12 ++++ .../only_delete_obj_reserved.exp.json | 12 ++++ testdata/d2oracle/TestDelete/order_1.exp.json | 15 ++++ testdata/d2oracle/TestDelete/order_2.exp.json | 9 +++ testdata/d2oracle/TestDelete/order_3.exp.json | 9 +++ testdata/d2oracle/TestDelete/order_4.exp.json | 6 ++ testdata/d2oracle/TestDelete/order_5.exp.json | 24 +++++++ testdata/d2oracle/TestDelete/order_6.exp.json | 15 ++++ testdata/d2oracle/TestDelete/order_7.exp.json | 18 +++++ testdata/d2oracle/TestDelete/order_8.exp.json | 18 +++++ .../d2oracle/TestDelete/shape_class.exp.json | 6 ++ .../TestDelete/shape_sql_table.exp.json | 15 ++++ .../TestDelete/singular_flat_style.exp.json | 6 ++ .../TestDelete/singular_map_style.exp.json | 6 ++ .../underscore_no_conflict.exp.json | 12 ++++ .../TestDelete/underscore_remove.exp.json | 24 +++++++ .../TestMove/append_multiple_styles.exp.json | 9 +++ testdata/d2oracle/TestMove/basic.exp.json | 6 ++ .../d2oracle/TestMove/basic_nested.exp.json | 9 +++ .../TestMove/basic_out_of_container.exp.json | 9 +++ .../TestMove/between_containers.exp.json | 12 ++++ .../TestMove/chain_connected_nested.exp.json | 18 +++++ ..._connected_nested_no_extra_create.exp.json | 21 ++++++ .../TestMove/connected_nested.exp.json | 15 ++++ .../d2oracle/TestMove/container_near.exp.json | 21 ++++++ .../TestMove/edge_across_containers.exp.json | 18 +++++ .../d2oracle/TestMove/edge_basic.exp.json | 12 ++++ .../TestMove/edge_chain_basic.exp.json | 18 +++++ .../TestMove/edge_chain_circular.exp.json | 18 +++++ .../edge_chain_into_container.exp.json | 21 ++++++ .../edge_chain_out_container.exp.json | 21 ++++++ .../d2oracle/TestMove/edge_conflict.exp.json | 21 ++++++ .../TestMove/edge_into_container.exp.json | 18 +++++ .../TestMove/edge_nested_basic.exp.json | 15 ++++ .../TestMove/edge_out_of_container.exp.json | 15 ++++ .../d2oracle/TestMove/extend_map.exp.json | 15 ++++ .../TestMove/extend_stationary_path.exp.json | 12 ++++ .../TestMove/flat_between_containers.exp.json | 12 ++++ .../d2oracle/TestMove/flat_merge.exp.json | 15 ++++ .../TestMove/flat_middle_container.exp.json | 15 ++++ .../TestMove/flat_nested_merge.exp.json | 33 +++++++++ .../flat_nested_merge_multiple_refs.exp.json | 27 +++++++ .../flat_reparent_with_map_value.exp.json | 9 +++ ...lat_reparent_with_mixed_map_value.exp.json | 12 ++++ .../flat_reparent_with_value.exp.json | 9 +++ .../d2oracle/TestMove/flat_style.exp.json | 9 +++ .../TestMove/full_edge_slice.exp.json | 21 ++++++ .../d2oracle/TestMove/full_slice.exp.json | 12 ++++ testdata/d2oracle/TestMove/gnarly_1.exp.json | 48 +++++++++++++ .../hoist_container_children.exp.json | 15 ++++ .../into_container_existing_map.exp.json | 12 ++++ .../into_container_nonexisting_map.exp.json | 9 +++ .../into_container_with_flat_keys.exp.json | 9 +++ .../into_container_with_flat_style.exp.json | 9 +++ .../d2oracle/TestMove/map_transplant.exp.json | 15 ++++ .../d2oracle/TestMove/map_with_label.exp.json | 12 ++++ .../TestMove/merge_nested_maps.exp.json | 27 +++++++ .../d2oracle/TestMove/merge_reserved.exp.json | 21 ++++++ .../TestMove/middle_container.exp.json | 12 ++++ .../TestMove/move_container_children.exp.json | 18 +++++ .../move_container_conflict_children.exp.json | 18 +++++ .../move_into_key_with_value.exp.json | 9 +++ .../TestMove/move_out_of_edge.exp.json | 24 +++++++ .../TestMove/move_out_of_nested_edge.exp.json | 24 +++++++ .../TestMove/multiple_nesting_levels.exp.json | 24 +++++++ testdata/d2oracle/TestMove/near.exp.json | 9 +++ .../d2oracle/TestMove/nhooyr_one.exp.json | 15 ++++ .../d2oracle/TestMove/nhooyr_two.exp.json | 24 +++++++ .../d2oracle/TestMove/parentheses.exp.json | 15 ++++ .../TestMove/partial_edge_slice.exp.json | 15 ++++ .../d2oracle/TestMove/partial_slice.exp.json | 9 +++ testdata/d2oracle/TestMove/rename_2.exp.json | 18 +++++ testdata/d2oracle/TestMove/reuse_map.exp.json | 18 +++++ .../d2oracle/TestMove/slice_style.exp.json | 9 +++ .../TestMove/underscore_children.exp.json | 9 +++ .../underscore_edge_children.exp.json | 15 ++++ .../underscore_edge_container_1.exp.json | 15 ++++ .../underscore_edge_container_2.exp.json | 15 ++++ .../underscore_edge_container_3.exp.json | 15 ++++ .../underscore_edge_container_4.exp.json | 15 ++++ .../underscore_edge_container_5.exp.json | 15 ++++ .../TestMove/underscore_edge_split.exp.json | 21 ++++++ .../TestMove/underscore_merge.exp.json | 12 ++++ .../TestMove/underscore_split.exp.json | 15 ++++ .../TestMove/underscore_split_out.exp.json | 18 +++++ .../TestMove/underscore_transplant.exp.json | 12 ++++ .../d2oracle/TestMove/unique_name.exp.json | 15 ++++ .../unique_name_with_references.exp.json | 21 ++++++ testdata/d2oracle/TestRename/arrows.exp.json | 12 ++++ .../d2oracle/TestRename/arrows_chain.exp.json | 24 +++++++ .../TestRename/arrows_complex.exp.json | 18 +++++ .../TestRename/arrows_trim_common.exp.json | 27 +++++++ .../TestRename/arrows_trim_common_2.exp.json | 27 +++++++ .../TestRename/complex_edge_1.exp.json | 18 +++++ .../TestRename/complex_edge_2.exp.json | 18 +++++ .../d2oracle/TestRename/conflict.exp.json | 9 +++ .../d2oracle/TestRename/conflict_2.exp.json | 18 +++++ .../TestRename/conflict_with_dots.exp.json | 9 +++ .../d2oracle/TestRename/container.exp.json | 72 +++++++++++++++++++ testdata/d2oracle/TestRename/edges.exp.json | 45 ++++++++++++ testdata/d2oracle/TestRename/flat.exp.json | 6 ++ .../d2oracle/TestRename/generated.exp.json | 6 ++ testdata/d2oracle/TestRename/near.exp.json | 9 +++ testdata/d2oracle/TestRename/nested.exp.json | 18 +++++ testdata/d2oracle/TestSet/base.exp.json | 6 ++ .../TestSet/block_string_multiline.exp.json | 6 ++ .../TestSet/block_string_oneline.exp.json | 6 ++ testdata/d2oracle/TestSet/edge.exp.json | 12 ++++ .../TestSet/edge_append_style.exp.json | 12 ++++ testdata/d2oracle/TestSet/edge_chain.exp.json | 21 ++++++ .../TestSet/edge_chain_append_style.exp.json | 18 +++++ .../edge_chain_existing_style.exp.json | 18 +++++ .../TestSet/edge_chain_nested_set.exp.json | 21 ++++++ .../d2oracle/TestSet/edge_index_case.exp.json | 27 +++++++ .../TestSet/edge_index_nested.exp.json | 15 ++++ .../TestSet/edge_key_and_key.exp.json | 15 ++++ testdata/d2oracle/TestSet/edge_label.exp.json | 12 ++++ .../TestSet/edge_merge_style.exp.json | 12 ++++ .../TestSet/edge_nested_label_set.exp.json | 15 ++++ .../TestSet/edge_nested_style_set.exp.json | 15 ++++ .../TestSet/expanded_map_style.exp.json | 6 ++ testdata/d2oracle/TestSet/icon.exp.json | 6 ++ .../d2oracle/TestSet/inline_style.exp.json | 6 ++ testdata/d2oracle/TestSet/label.exp.json | 6 ++ .../d2oracle/TestSet/label_primary.exp.json | 15 ++++ .../d2oracle/TestSet/label_replace.exp.json | 6 ++ .../d2oracle/TestSet/label_unset.exp.json | 6 ++ .../d2oracle/TestSet/map_key_missing.exp.json | 12 ++++ .../d2oracle/TestSet/nested_alex.exp.json | 15 ++++ testdata/d2oracle/TestSet/new_style.exp.json | 6 ++ .../d2oracle/TestSet/replace_shape.exp.json | 6 ++ .../d2oracle/TestSet/replace_style.exp.json | 6 ++ .../TestSet/replace_style_edgecase.exp.json | 6 ++ testdata/d2oracle/TestSet/shape.exp.json | 6 ++ .../TestSet/shape_nested_style_set.exp.json | 6 ++ 213 files changed, 3127 insertions(+), 2 deletions(-) diff --git a/testdata/d2oracle/TestCreate/base.exp.json b/testdata/d2oracle/TestCreate/base.exp.json index 996a7c9941..53c61e0e5f 100644 --- a/testdata/d2oracle/TestCreate/base.exp.json +++ b/testdata/d2oracle/TestCreate/base.exp.json @@ -41,6 +41,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -90,6 +93,9 @@ "value": "square" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/container.exp.json b/testdata/d2oracle/TestCreate/container.exp.json index 1a87d6d38c..effc0c1e5d 100644 --- a/testdata/d2oracle/TestCreate/container.exp.json +++ b/testdata/d2oracle/TestCreate/container.exp.json @@ -70,6 +70,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -119,6 +122,9 @@ "value": "b" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -166,6 +172,9 @@ "value": "q" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/container_edge.exp.json b/testdata/d2oracle/TestCreate/container_edge.exp.json index 12ef496246..402e22b721 100644 --- a/testdata/d2oracle/TestCreate/container_edge.exp.json +++ b/testdata/d2oracle/TestCreate/container_edge.exp.json @@ -93,6 +93,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -128,6 +131,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -177,6 +183,9 @@ "value": "b" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -224,6 +233,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -271,6 +283,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/container_edge_label.exp.json b/testdata/d2oracle/TestCreate/container_edge_label.exp.json index 482c308831..9292281d11 100644 --- a/testdata/d2oracle/TestCreate/container_edge_label.exp.json +++ b/testdata/d2oracle/TestCreate/container_edge_label.exp.json @@ -103,6 +103,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -138,6 +141,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -187,6 +193,9 @@ "value": "zoom" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -234,6 +243,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -281,6 +293,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/edge.exp.json b/testdata/d2oracle/TestCreate/edge.exp.json index 9667c122af..4ddff69ff6 100644 --- a/testdata/d2oracle/TestCreate/edge.exp.json +++ b/testdata/d2oracle/TestCreate/edge.exp.json @@ -64,6 +64,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -99,6 +102,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -148,6 +154,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -195,6 +204,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/edge_nested.exp.json b/testdata/d2oracle/TestCreate/edge_nested.exp.json index 870d3a6011..f1b3b39885 100644 --- a/testdata/d2oracle/TestCreate/edge_nested.exp.json +++ b/testdata/d2oracle/TestCreate/edge_nested.exp.json @@ -80,6 +80,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -115,6 +118,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -164,6 +170,9 @@ "value": "container" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -211,6 +220,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -258,6 +270,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/edge_scope.exp.json b/testdata/d2oracle/TestCreate/edge_scope.exp.json index cda1c03a66..7e88441312 100644 --- a/testdata/d2oracle/TestCreate/edge_scope.exp.json +++ b/testdata/d2oracle/TestCreate/edge_scope.exp.json @@ -93,6 +93,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -128,6 +131,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -177,6 +183,9 @@ "value": "container" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -224,6 +233,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -271,6 +283,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json b/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json index acba172e8f..f19b2473ee 100644 --- a/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json +++ b/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json @@ -93,6 +93,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -128,6 +131,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -177,6 +183,9 @@ "value": "container" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -224,6 +233,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -271,6 +283,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json b/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json index 62d3c0e7b3..d63ccbb27d 100644 --- a/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json +++ b/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json @@ -104,6 +104,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -139,6 +142,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -199,6 +205,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -257,6 +266,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -304,6 +316,9 @@ "value": "z" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -351,6 +366,9 @@ "value": "q" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/edge_unique.exp.json b/testdata/d2oracle/TestCreate/edge_unique.exp.json index bd24e02df6..538838aed9 100644 --- a/testdata/d2oracle/TestCreate/edge_unique.exp.json +++ b/testdata/d2oracle/TestCreate/edge_unique.exp.json @@ -250,6 +250,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -285,6 +288,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -319,6 +325,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -353,6 +362,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -387,6 +399,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -436,6 +451,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -483,6 +501,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -570,6 +591,9 @@ "value": "hello" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -657,6 +681,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -744,6 +771,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/gen_key.exp.json b/testdata/d2oracle/TestCreate/gen_key.exp.json index c2b722f1cb..ac7d6356f9 100644 --- a/testdata/d2oracle/TestCreate/gen_key.exp.json +++ b/testdata/d2oracle/TestCreate/gen_key.exp.json @@ -64,6 +64,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -113,6 +116,9 @@ "value": "square" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -160,6 +166,9 @@ "value": "square 2" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/gen_key_n.exp.json b/testdata/d2oracle/TestCreate/gen_key_n.exp.json index f7b16843b4..489e10fd08 100644 --- a/testdata/d2oracle/TestCreate/gen_key_n.exp.json +++ b/testdata/d2oracle/TestCreate/gen_key_n.exp.json @@ -322,6 +322,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -393,6 +396,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -462,6 +468,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -531,6 +540,9 @@ "value": "z" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -578,6 +590,9 @@ "value": "square" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -625,6 +640,9 @@ "value": "square 2" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -672,6 +690,9 @@ "value": "square 3" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -719,6 +740,9 @@ "value": "square 4" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -766,6 +790,9 @@ "value": "square 5" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -813,6 +840,9 @@ "value": "square 6" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -860,6 +890,9 @@ "value": "square 7" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -907,6 +940,9 @@ "value": "square 8" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -954,6 +990,9 @@ "value": "square 9" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -1001,6 +1040,9 @@ "value": "square 10" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -1048,6 +1090,9 @@ "value": "square 11" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/gen_key_nested.exp.json b/testdata/d2oracle/TestCreate/gen_key_nested.exp.json index d0554e316d..7d0688f661 100644 --- a/testdata/d2oracle/TestCreate/gen_key_nested.exp.json +++ b/testdata/d2oracle/TestCreate/gen_key_nested.exp.json @@ -130,6 +130,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -265,6 +268,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -398,6 +404,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -531,6 +540,9 @@ "value": "z" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -611,6 +623,9 @@ "value": "square" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -691,6 +706,9 @@ "value": "square 2" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/gen_key_scope.exp.json b/testdata/d2oracle/TestCreate/gen_key_scope.exp.json index 925596db4c..622ed35e40 100644 --- a/testdata/d2oracle/TestCreate/gen_key_scope.exp.json +++ b/testdata/d2oracle/TestCreate/gen_key_scope.exp.json @@ -115,6 +115,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -186,6 +189,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -255,6 +261,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -324,6 +333,9 @@ "value": "z" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -371,6 +383,9 @@ "value": "square" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -418,6 +433,9 @@ "value": "square 2" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/gen_key_suffix.exp.json b/testdata/d2oracle/TestCreate/gen_key_suffix.exp.json index 91484dee57..07ca49dc06 100644 --- a/testdata/d2oracle/TestCreate/gen_key_suffix.exp.json +++ b/testdata/d2oracle/TestCreate/gen_key_suffix.exp.json @@ -64,6 +64,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -113,6 +116,9 @@ "value": "x " }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -160,6 +166,9 @@ "value": "x 2" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/make_scope_multiline.exp.json b/testdata/d2oracle/TestCreate/make_scope_multiline.exp.json index 82bbc20523..405270ad71 100644 --- a/testdata/d2oracle/TestCreate/make_scope_multiline.exp.json +++ b/testdata/d2oracle/TestCreate/make_scope_multiline.exp.json @@ -103,6 +103,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -152,6 +155,9 @@ "value": "rawr" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "circle" @@ -199,6 +205,9 @@ "value": "orange" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.exp.json b/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.exp.json index e41155eaa2..d8c22f2c3e 100644 --- a/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.exp.json +++ b/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.exp.json @@ -149,6 +149,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -198,6 +201,9 @@ "value": "before" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -245,6 +251,9 @@ "value": "rawr" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "circle" @@ -292,6 +301,9 @@ "value": "orange" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -339,6 +351,9 @@ "value": "after" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.exp.json b/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.exp.json index 442432aa79..7b6db80840 100644 --- a/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.exp.json +++ b/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.exp.json @@ -149,6 +149,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -198,6 +201,9 @@ "value": "before" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -245,6 +251,9 @@ "value": "rawr" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "circle" @@ -292,6 +301,9 @@ "value": "orange" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -339,6 +351,9 @@ "value": "after" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/nested.exp.json b/testdata/d2oracle/TestCreate/nested.exp.json index 643e62ffe6..ce456d3583 100644 --- a/testdata/d2oracle/TestCreate/nested.exp.json +++ b/testdata/d2oracle/TestCreate/nested.exp.json @@ -63,6 +63,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -134,6 +137,9 @@ "value": "b" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -203,6 +209,9 @@ "value": "c" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -272,6 +281,9 @@ "value": "square" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/scope.exp.json b/testdata/d2oracle/TestCreate/scope.exp.json index fd309beffe..c6c23265c6 100644 --- a/testdata/d2oracle/TestCreate/scope.exp.json +++ b/testdata/d2oracle/TestCreate/scope.exp.json @@ -92,6 +92,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -163,6 +166,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -232,6 +238,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -301,6 +310,9 @@ "value": "z" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -348,6 +360,9 @@ "value": "square" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/breakup_arrowhead.exp.json b/testdata/d2oracle/TestDelete/breakup_arrowhead.exp.json index 15a36bad0f..54bdba6cb9 100644 --- a/testdata/d2oracle/TestDelete/breakup_arrowhead.exp.json +++ b/testdata/d2oracle/TestDelete/breakup_arrowhead.exp.json @@ -41,6 +41,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -90,6 +93,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/children.exp.json b/testdata/d2oracle/TestDelete/children.exp.json index bbe45f5ded..07200d3679 100644 --- a/testdata/d2oracle/TestDelete/children.exp.json +++ b/testdata/d2oracle/TestDelete/children.exp.json @@ -87,6 +87,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -122,6 +125,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -171,6 +177,9 @@ "value": "what's up" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -218,6 +227,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -265,6 +277,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/children_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_conflicts.exp.json index b948b2c815..c3811ce8cf 100644 --- a/testdata/d2oracle/TestDelete/children_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_conflicts.exp.json @@ -64,6 +64,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -113,6 +116,9 @@ "value": "x 2" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -160,6 +166,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json index 64ba9b5158..78cbc06432 100644 --- a/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json @@ -120,6 +120,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -155,6 +158,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -224,6 +230,9 @@ "value": "hi" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -271,6 +280,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -318,6 +330,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json index 9ad7f6dc25..6411b01083 100644 --- a/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json @@ -213,6 +213,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -248,6 +251,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -282,6 +288,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -351,6 +360,9 @@ "value": "hi" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -418,6 +430,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -485,6 +500,9 @@ "value": "ey" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -532,6 +550,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -579,6 +600,9 @@ "value": "z" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/children_flat_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_flat_conflicts.exp.json index bcd4d45b96..bf392c647f 100644 --- a/testdata/d2oracle/TestDelete/children_flat_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_flat_conflicts.exp.json @@ -97,6 +97,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -166,6 +169,9 @@ "value": "hi" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -213,6 +219,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json index ff02a6970b..2e6b4b9a45 100644 --- a/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json @@ -189,6 +189,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -224,6 +227,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -313,6 +319,9 @@ "value": "hi" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -380,6 +389,9 @@ "value": "y 2" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -427,6 +439,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -474,6 +489,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/children_nested_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_nested_conflicts.exp.json index 5325c9501c..2167e27756 100644 --- a/testdata/d2oracle/TestDelete/children_nested_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_nested_conflicts.exp.json @@ -93,6 +93,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -142,6 +145,9 @@ "value": "x 2" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -189,6 +195,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -236,6 +245,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/children_nested_referenced_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_nested_referenced_conflicts.exp.json index 52e1f8cb13..b9c0282c25 100644 --- a/testdata/d2oracle/TestDelete/children_nested_referenced_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_nested_referenced_conflicts.exp.json @@ -152,6 +152,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -263,6 +266,9 @@ "value": "hi" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -352,6 +358,9 @@ "value": "hey" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -399,6 +408,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/children_no_self_conflict.exp.json b/testdata/d2oracle/TestDelete/children_no_self_conflict.exp.json index 452712e66f..c889b84192 100644 --- a/testdata/d2oracle/TestDelete/children_no_self_conflict.exp.json +++ b/testdata/d2oracle/TestDelete/children_no_self_conflict.exp.json @@ -41,6 +41,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -90,6 +93,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/children_order.exp.json b/testdata/d2oracle/TestDelete/children_order.exp.json index 6c3104b9b4..ed63b3bf70 100644 --- a/testdata/d2oracle/TestDelete/children_order.exp.json +++ b/testdata/d2oracle/TestDelete/children_order.exp.json @@ -116,6 +116,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -165,6 +168,9 @@ "value": "c" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -212,6 +218,9 @@ "value": "before" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -259,6 +268,9 @@ "value": "congo" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -306,6 +318,9 @@ "value": "after" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/children_referenced_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_referenced_conflicts.exp.json index f4248dfb23..eb6f59763a 100644 --- a/testdata/d2oracle/TestDelete/children_referenced_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_referenced_conflicts.exp.json @@ -97,6 +97,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -166,6 +169,9 @@ "value": "hi" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -213,6 +219,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/children_scope.exp.json b/testdata/d2oracle/TestDelete/children_scope.exp.json index 1d87e7168f..af45423fa7 100644 --- a/testdata/d2oracle/TestDelete/children_scope.exp.json +++ b/testdata/d2oracle/TestDelete/children_scope.exp.json @@ -127,6 +127,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -162,6 +165,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -222,6 +228,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -280,6 +289,9 @@ "value": "q" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -327,6 +339,9 @@ "value": "what's up" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -374,6 +389,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -421,6 +439,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/container_near.exp.json b/testdata/d2oracle/TestDelete/container_near.exp.json index 2da2da37f4..3565a24b88 100644 --- a/testdata/d2oracle/TestDelete/container_near.exp.json +++ b/testdata/d2oracle/TestDelete/container_near.exp.json @@ -165,6 +165,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -214,6 +217,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": { "range": "d2/testdata/d2oracle/TestDelete/container_near.d2,1:8:13-1:9:14", "path": [ @@ -276,6 +282,9 @@ "value": "z" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -323,6 +332,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": { "range": "d2/testdata/d2oracle/TestDelete/container_near.d2,5:8:32-5:9:33", "path": [ diff --git a/testdata/d2oracle/TestDelete/delete_icon.exp.json b/testdata/d2oracle/TestDelete/delete_icon.exp.json index 374b88cb2e..2e4f796942 100644 --- a/testdata/d2oracle/TestDelete/delete_icon.exp.json +++ b/testdata/d2oracle/TestDelete/delete_icon.exp.json @@ -41,7 +41,7 @@ "nodes": [ { "map_key": { - "range": "d2/testdata/d2oracle/TestDelete/delete_icon.d2,1:2:9-1:26:33", + "range": "d2/testdata/d2oracle/TestDelete/delete_icon.d2,1:8:15-1:26:33", "key": { "range": "d2/testdata/d2oracle/TestDelete/delete_icon.d2,1:2:9-1:6:13", "path": [ @@ -91,6 +91,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -151,6 +154,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -209,7 +215,9 @@ "value": "x" }, "style": {}, - "link": "https://google.com", + "link": { + "value": "https://google.com" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/delete_link.exp.json b/testdata/d2oracle/TestDelete/delete_link.exp.json index 4fc895c7c2..d7bff65c87 100644 --- a/testdata/d2oracle/TestDelete/delete_link.exp.json +++ b/testdata/d2oracle/TestDelete/delete_link.exp.json @@ -41,6 +41,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -90,6 +93,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/delete_near.exp.json b/testdata/d2oracle/TestDelete/delete_near.exp.json index 77810228ed..a8681d06b1 100644 --- a/testdata/d2oracle/TestDelete/delete_near.exp.json +++ b/testdata/d2oracle/TestDelete/delete_near.exp.json @@ -64,6 +64,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -113,6 +116,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -160,6 +166,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/delete_needed_flat_near.exp.json b/testdata/d2oracle/TestDelete/delete_needed_flat_near.exp.json index 80e21b12b1..c6273b8a7a 100644 --- a/testdata/d2oracle/TestDelete/delete_needed_flat_near.exp.json +++ b/testdata/d2oracle/TestDelete/delete_needed_flat_near.exp.json @@ -64,6 +64,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -113,6 +116,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -160,6 +166,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/delete_redundant_flat_near.exp.json b/testdata/d2oracle/TestDelete/delete_redundant_flat_near.exp.json index 17650db857..cc3831d249 100644 --- a/testdata/d2oracle/TestDelete/delete_redundant_flat_near.exp.json +++ b/testdata/d2oracle/TestDelete/delete_redundant_flat_near.exp.json @@ -64,6 +64,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -113,6 +116,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -160,6 +166,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/delete_tooltip.exp.json b/testdata/d2oracle/TestDelete/delete_tooltip.exp.json index d2cd0ee739..9bedf05893 100644 --- a/testdata/d2oracle/TestDelete/delete_tooltip.exp.json +++ b/testdata/d2oracle/TestDelete/delete_tooltip.exp.json @@ -41,6 +41,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -90,6 +93,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json b/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json index b10cd9d5fb..fb28a72fd1 100644 --- a/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json +++ b/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json @@ -97,6 +97,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -132,6 +135,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -234,6 +240,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -303,6 +312,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -372,6 +384,9 @@ "value": "z" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -430,6 +445,9 @@ "value": "b" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/edge_common.exp.json b/testdata/d2oracle/TestDelete/edge_common.exp.json index 1e5e01fd32..f0ea7e2d62 100644 --- a/testdata/d2oracle/TestDelete/edge_common.exp.json +++ b/testdata/d2oracle/TestDelete/edge_common.exp.json @@ -64,6 +64,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -99,6 +102,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -148,6 +154,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -195,6 +204,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/edge_common_2.exp.json b/testdata/d2oracle/TestDelete/edge_common_2.exp.json index fe55153e0d..db56f2ed61 100644 --- a/testdata/d2oracle/TestDelete/edge_common_2.exp.json +++ b/testdata/d2oracle/TestDelete/edge_common_2.exp.json @@ -64,6 +64,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -99,6 +102,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -148,6 +154,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -195,6 +204,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/edge_common_3.exp.json b/testdata/d2oracle/TestDelete/edge_common_3.exp.json index a044a6d9cc..c35488dbf2 100644 --- a/testdata/d2oracle/TestDelete/edge_common_3.exp.json +++ b/testdata/d2oracle/TestDelete/edge_common_3.exp.json @@ -86,6 +86,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -177,6 +180,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -235,6 +241,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -293,6 +302,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/edge_common_4.exp.json b/testdata/d2oracle/TestDelete/edge_common_4.exp.json index c04064cc84..462f7cd705 100644 --- a/testdata/d2oracle/TestDelete/edge_common_4.exp.json +++ b/testdata/d2oracle/TestDelete/edge_common_4.exp.json @@ -86,6 +86,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -177,6 +180,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -235,6 +241,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -293,6 +302,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/edge_conflict.exp.json b/testdata/d2oracle/TestDelete/edge_conflict.exp.json index 69e5772aa3..d7a98de67f 100644 --- a/testdata/d2oracle/TestDelete/edge_conflict.exp.json +++ b/testdata/d2oracle/TestDelete/edge_conflict.exp.json @@ -109,6 +109,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -144,6 +147,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -235,6 +241,9 @@ "value": "y 2" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -293,6 +302,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -351,6 +363,9 @@ "value": "b" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -398,6 +413,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/edge_decrement.exp.json b/testdata/d2oracle/TestDelete/edge_decrement.exp.json index 4ab45fd6fa..b046ff1946 100644 --- a/testdata/d2oracle/TestDelete/edge_decrement.exp.json +++ b/testdata/d2oracle/TestDelete/edge_decrement.exp.json @@ -446,6 +446,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -484,6 +487,9 @@ "value": "zero" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -521,6 +527,9 @@ "value": "one" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -558,6 +567,9 @@ "value": "three" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -595,6 +607,9 @@ "value": "four" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -784,6 +799,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -971,6 +989,9 @@ "value": "b" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/edge_first.exp.json b/testdata/d2oracle/TestDelete/edge_first.exp.json index 34e6fa07f1..dce00ebad5 100644 --- a/testdata/d2oracle/TestDelete/edge_first.exp.json +++ b/testdata/d2oracle/TestDelete/edge_first.exp.json @@ -175,6 +175,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -210,6 +213,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -244,6 +250,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -315,6 +324,9 @@ "value": "l" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -384,6 +396,9 @@ "value": "p" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -453,6 +468,9 @@ "value": "d" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -500,6 +518,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -547,6 +568,9 @@ "value": "p" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -614,6 +638,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -661,6 +688,9 @@ "value": "z" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/edge_flat_style.exp.json b/testdata/d2oracle/TestDelete/edge_flat_style.exp.json index 7910d6c669..082536c947 100644 --- a/testdata/d2oracle/TestDelete/edge_flat_style.exp.json +++ b/testdata/d2oracle/TestDelete/edge_flat_style.exp.json @@ -41,6 +41,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -90,6 +93,9 @@ "value": "B" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/edge_identical_child.exp.json b/testdata/d2oracle/TestDelete/edge_identical_child.exp.json index 1e5afaf191..9dcce5d395 100644 --- a/testdata/d2oracle/TestDelete/edge_identical_child.exp.json +++ b/testdata/d2oracle/TestDelete/edge_identical_child.exp.json @@ -97,6 +97,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -132,6 +135,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -203,6 +209,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -272,6 +281,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -341,6 +353,9 @@ "value": "z" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -399,6 +414,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -457,6 +475,9 @@ "value": "b" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/edge_key_style.exp.json b/testdata/d2oracle/TestDelete/edge_key_style.exp.json index dbf182d48a..be5ec3a8cc 100644 --- a/testdata/d2oracle/TestDelete/edge_key_style.exp.json +++ b/testdata/d2oracle/TestDelete/edge_key_style.exp.json @@ -64,6 +64,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -99,6 +102,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -148,6 +154,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -195,6 +204,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/edge_last.exp.json b/testdata/d2oracle/TestDelete/edge_last.exp.json index 5c5b92a1ae..a09c89634a 100644 --- a/testdata/d2oracle/TestDelete/edge_last.exp.json +++ b/testdata/d2oracle/TestDelete/edge_last.exp.json @@ -212,6 +212,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -247,6 +250,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -281,6 +287,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -315,6 +324,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -386,6 +398,9 @@ "value": "l" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -455,6 +470,9 @@ "value": "p" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -524,6 +542,9 @@ "value": "d" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -571,6 +592,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -638,6 +662,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -705,6 +732,9 @@ "value": "z" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -752,6 +782,9 @@ "value": "q" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -799,6 +832,9 @@ "value": "p" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/edge_map_style.exp.json b/testdata/d2oracle/TestDelete/edge_map_style.exp.json index e66a56e1aa..fd6dea1c88 100644 --- a/testdata/d2oracle/TestDelete/edge_map_style.exp.json +++ b/testdata/d2oracle/TestDelete/edge_map_style.exp.json @@ -64,6 +64,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -99,6 +102,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -148,6 +154,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -195,6 +204,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/edge_middle.exp.json b/testdata/d2oracle/TestDelete/edge_middle.exp.json index fa20d2ca4e..6e98120aea 100644 --- a/testdata/d2oracle/TestDelete/edge_middle.exp.json +++ b/testdata/d2oracle/TestDelete/edge_middle.exp.json @@ -198,6 +198,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -233,6 +236,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -267,6 +273,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -301,6 +310,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -372,6 +384,9 @@ "value": "l" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -441,6 +456,9 @@ "value": "p" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -510,6 +528,9 @@ "value": "d" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -557,6 +578,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -624,6 +648,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -671,6 +698,9 @@ "value": "z" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -718,6 +748,9 @@ "value": "q" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -765,6 +798,9 @@ "value": "p" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/empty_map.exp.json b/testdata/d2oracle/TestDelete/empty_map.exp.json index 48a037b44b..02c5648275 100644 --- a/testdata/d2oracle/TestDelete/empty_map.exp.json +++ b/testdata/d2oracle/TestDelete/empty_map.exp.json @@ -70,6 +70,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -119,6 +122,9 @@ "value": "c" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -166,6 +172,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/flat.exp.json b/testdata/d2oracle/TestDelete/flat.exp.json index efd57ca615..6507181178 100644 --- a/testdata/d2oracle/TestDelete/flat.exp.json +++ b/testdata/d2oracle/TestDelete/flat.exp.json @@ -17,6 +17,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" diff --git a/testdata/d2oracle/TestDelete/flat_reserved.exp.json b/testdata/d2oracle/TestDelete/flat_reserved.exp.json index b1933c4d08..1a7a243a99 100644 --- a/testdata/d2oracle/TestDelete/flat_reserved.exp.json +++ b/testdata/d2oracle/TestDelete/flat_reserved.exp.json @@ -64,6 +64,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -99,6 +102,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -148,6 +154,9 @@ "value": "A" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -195,6 +204,9 @@ "value": "B" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/hoist_children.exp.json b/testdata/d2oracle/TestDelete/hoist_children.exp.json index 21e5def649..08c46bae62 100644 --- a/testdata/d2oracle/TestDelete/hoist_children.exp.json +++ b/testdata/d2oracle/TestDelete/hoist_children.exp.json @@ -70,6 +70,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -119,6 +122,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -166,6 +172,9 @@ "value": "c" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json b/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json index c3703e0b07..99e46838da 100644 --- a/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json +++ b/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json @@ -87,6 +87,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -122,6 +125,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -171,6 +177,9 @@ "value": "b" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -218,6 +227,9 @@ "value": "c" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -265,6 +277,9 @@ "value": "d" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/key_with_edges.exp.json b/testdata/d2oracle/TestDelete/key_with_edges.exp.json index e7052b733d..c797c750d9 100644 --- a/testdata/d2oracle/TestDelete/key_with_edges.exp.json +++ b/testdata/d2oracle/TestDelete/key_with_edges.exp.json @@ -86,6 +86,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -177,6 +180,9 @@ "value": "hello" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -235,6 +241,9 @@ "value": "meow" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -293,6 +302,9 @@ "value": "bark" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/key_with_edges_2.exp.json b/testdata/d2oracle/TestDelete/key_with_edges_2.exp.json index 7895330b33..0edf7e63e6 100644 --- a/testdata/d2oracle/TestDelete/key_with_edges_2.exp.json +++ b/testdata/d2oracle/TestDelete/key_with_edges_2.exp.json @@ -52,6 +52,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -112,6 +115,9 @@ "value": "hello" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -170,6 +176,9 @@ "value": "bark" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/key_with_edges_3.exp.json b/testdata/d2oracle/TestDelete/key_with_edges_3.exp.json index 40833f8beb..2b421a3cba 100644 --- a/testdata/d2oracle/TestDelete/key_with_edges_3.exp.json +++ b/testdata/d2oracle/TestDelete/key_with_edges_3.exp.json @@ -52,6 +52,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -112,6 +115,9 @@ "value": "hello" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -170,6 +176,9 @@ "value": "bark" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/key_with_edges_4.exp.json b/testdata/d2oracle/TestDelete/key_with_edges_4.exp.json index 81dfb37659..0ca7b6d0c7 100644 --- a/testdata/d2oracle/TestDelete/key_with_edges_4.exp.json +++ b/testdata/d2oracle/TestDelete/key_with_edges_4.exp.json @@ -86,6 +86,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -177,6 +180,9 @@ "value": "hello" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -235,6 +241,9 @@ "value": "meow" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -293,6 +302,9 @@ "value": "bark" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/multi_near.exp.json b/testdata/d2oracle/TestDelete/multi_near.exp.json index ee3e75b94a..1ba67c26d1 100644 --- a/testdata/d2oracle/TestDelete/multi_near.exp.json +++ b/testdata/d2oracle/TestDelete/multi_near.exp.json @@ -188,6 +188,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -237,6 +240,9 @@ "value": "API" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -284,6 +290,9 @@ "value": "Bluefish" }, "style": {}, + "link": { + "value": "" + }, "near_key": { "range": "d2/testdata/d2oracle/TestDelete/multi_near.d2,2:8:24-2:11:27", "path": [ @@ -346,6 +355,9 @@ "value": "Yo" }, "style": {}, + "link": { + "value": "" + }, "near_key": { "range": "d2/testdata/d2oracle/TestDelete/multi_near.d2,5:8:44-5:12:48", "path": [ @@ -408,6 +420,9 @@ "value": "Blah" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/multi_path_map_conflict.exp.json b/testdata/d2oracle/TestDelete/multi_path_map_conflict.exp.json index ad7b50c02e..48c4c5b825 100644 --- a/testdata/d2oracle/TestDelete/multi_path_map_conflict.exp.json +++ b/testdata/d2oracle/TestDelete/multi_path_map_conflict.exp.json @@ -122,6 +122,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -191,6 +194,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -238,6 +244,9 @@ "value": "z 2" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -285,6 +294,9 @@ "value": "z" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/multi_path_map_no_conflict.exp.json b/testdata/d2oracle/TestDelete/multi_path_map_no_conflict.exp.json index 911987500d..5a698c9c11 100644 --- a/testdata/d2oracle/TestDelete/multi_path_map_no_conflict.exp.json +++ b/testdata/d2oracle/TestDelete/multi_path_map_no_conflict.exp.json @@ -93,6 +93,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -142,6 +145,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -189,6 +195,9 @@ "value": "z" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -236,6 +245,9 @@ "value": "z" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/multiple_flat_middle_container.exp.json b/testdata/d2oracle/TestDelete/multiple_flat_middle_container.exp.json index 07ec7b0f95..d6e6415d10 100644 --- a/testdata/d2oracle/TestDelete/multiple_flat_middle_container.exp.json +++ b/testdata/d2oracle/TestDelete/multiple_flat_middle_container.exp.json @@ -86,6 +86,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -177,6 +180,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -235,6 +241,9 @@ "value": "c" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -293,6 +302,9 @@ "value": "d" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/multiple_flat_style.exp.json b/testdata/d2oracle/TestDelete/multiple_flat_style.exp.json index ded66bfc1f..04a012d14b 100644 --- a/testdata/d2oracle/TestDelete/multiple_flat_style.exp.json +++ b/testdata/d2oracle/TestDelete/multiple_flat_style.exp.json @@ -69,6 +69,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -144,6 +147,9 @@ "value": "0.4" } }, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/multiple_map_styles.exp.json b/testdata/d2oracle/TestDelete/multiple_map_styles.exp.json index f65f409864..89680e3a35 100644 --- a/testdata/d2oracle/TestDelete/multiple_map_styles.exp.json +++ b/testdata/d2oracle/TestDelete/multiple_map_styles.exp.json @@ -105,6 +105,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -158,6 +161,9 @@ "value": "0.4" } }, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/near.exp.json b/testdata/d2oracle/TestDelete/near.exp.json index bc5952b257..212e9fb958 100644 --- a/testdata/d2oracle/TestDelete/near.exp.json +++ b/testdata/d2oracle/TestDelete/near.exp.json @@ -41,6 +41,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -90,6 +93,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/nested.exp.json b/testdata/d2oracle/TestDelete/nested.exp.json index 8cf70d4ac8..e7d669050e 100644 --- a/testdata/d2oracle/TestDelete/nested.exp.json +++ b/testdata/d2oracle/TestDelete/nested.exp.json @@ -63,6 +63,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -134,6 +137,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -203,6 +209,9 @@ "value": "c" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -272,6 +281,9 @@ "value": "d" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/nested_2.exp.json b/testdata/d2oracle/TestDelete/nested_2.exp.json index c0fcd695f6..f4884c87b3 100644 --- a/testdata/d2oracle/TestDelete/nested_2.exp.json +++ b/testdata/d2oracle/TestDelete/nested_2.exp.json @@ -63,6 +63,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -134,6 +137,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -203,6 +209,9 @@ "value": "b" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -272,6 +281,9 @@ "value": "c" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json b/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json index 5ec5bf573e..55dd91ef4b 100644 --- a/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json +++ b/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json @@ -93,6 +93,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -128,6 +131,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -177,6 +183,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -224,6 +233,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -271,6 +283,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/nested_flat_style.exp.json b/testdata/d2oracle/TestDelete/nested_flat_style.exp.json index f1e33ea616..2ee4ddf26d 100644 --- a/testdata/d2oracle/TestDelete/nested_flat_style.exp.json +++ b/testdata/d2oracle/TestDelete/nested_flat_style.exp.json @@ -41,6 +41,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -90,6 +93,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/nested_reserved.exp.json b/testdata/d2oracle/TestDelete/nested_reserved.exp.json index c7c746eb24..28eba86877 100644 --- a/testdata/d2oracle/TestDelete/nested_reserved.exp.json +++ b/testdata/d2oracle/TestDelete/nested_reserved.exp.json @@ -97,6 +97,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -199,6 +202,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -299,6 +305,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -368,6 +377,9 @@ "value": "jingle" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/nested_underscore_update.exp.json b/testdata/d2oracle/TestDelete/nested_underscore_update.exp.json index 0600e7be22..4a80f0d96d 100644 --- a/testdata/d2oracle/TestDelete/nested_underscore_update.exp.json +++ b/testdata/d2oracle/TestDelete/nested_underscore_update.exp.json @@ -81,6 +81,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -130,6 +133,9 @@ "value": "books" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -188,6 +194,9 @@ "value": "pipe" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/node_in_edge.exp.json b/testdata/d2oracle/TestDelete/node_in_edge.exp.json index dcb1a70ab7..6794b39395 100644 --- a/testdata/d2oracle/TestDelete/node_in_edge.exp.json +++ b/testdata/d2oracle/TestDelete/node_in_edge.exp.json @@ -162,6 +162,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -197,6 +200,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -231,6 +237,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -280,6 +289,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -327,6 +339,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -374,6 +389,9 @@ "value": "q" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -421,6 +439,9 @@ "value": "p" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -468,6 +489,9 @@ "value": "ok" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -515,6 +539,9 @@ "value": "what's up" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json b/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json index 655ce329ff..3ad123961e 100644 --- a/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json +++ b/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json @@ -201,6 +201,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -236,6 +239,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -270,6 +276,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -304,6 +313,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -353,6 +365,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -420,6 +435,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -487,6 +505,9 @@ "value": "z" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -534,6 +555,9 @@ "value": "q" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -592,6 +616,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -650,6 +677,9 @@ "value": "b" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -697,6 +727,9 @@ "value": "what's up" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json b/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json index 2b45a4726a..86598d6390 100644 --- a/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json +++ b/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json @@ -160,6 +160,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -195,6 +198,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -268,6 +274,9 @@ "value": "#000e3d" } }, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -335,6 +344,9 @@ "value": "B" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json b/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json index 244083c887..c723be08e8 100644 --- a/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json +++ b/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json @@ -160,6 +160,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -199,6 +202,9 @@ "value": "#2b50c2" } }, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -268,6 +274,9 @@ "value": "A" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -335,6 +344,9 @@ "value": "B" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/order_1.exp.json b/testdata/d2oracle/TestDelete/order_1.exp.json index 281b408ec2..f3fc3bb1f9 100644 --- a/testdata/d2oracle/TestDelete/order_1.exp.json +++ b/testdata/d2oracle/TestDelete/order_1.exp.json @@ -87,6 +87,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -122,6 +125,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -171,6 +177,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -218,6 +227,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -265,6 +277,9 @@ "value": "z" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/order_2.exp.json b/testdata/d2oracle/TestDelete/order_2.exp.json index 0e91a5f4fc..b81aa28898 100644 --- a/testdata/d2oracle/TestDelete/order_2.exp.json +++ b/testdata/d2oracle/TestDelete/order_2.exp.json @@ -64,6 +64,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -113,6 +116,9 @@ "value": "p" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -160,6 +166,9 @@ "value": "z" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/order_3.exp.json b/testdata/d2oracle/TestDelete/order_3.exp.json index a10acc9820..f16f7de9cc 100644 --- a/testdata/d2oracle/TestDelete/order_3.exp.json +++ b/testdata/d2oracle/TestDelete/order_3.exp.json @@ -64,6 +64,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -113,6 +116,9 @@ "value": "p" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -160,6 +166,9 @@ "value": "z" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/order_4.exp.json b/testdata/d2oracle/TestDelete/order_4.exp.json index b894c5e491..9fa8dcd1b4 100644 --- a/testdata/d2oracle/TestDelete/order_4.exp.json +++ b/testdata/d2oracle/TestDelete/order_4.exp.json @@ -41,6 +41,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -90,6 +93,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/order_5.exp.json b/testdata/d2oracle/TestDelete/order_5.exp.json index e7e51144d7..9bb8480a17 100644 --- a/testdata/d2oracle/TestDelete/order_5.exp.json +++ b/testdata/d2oracle/TestDelete/order_5.exp.json @@ -139,6 +139,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -174,6 +177,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -208,6 +214,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -257,6 +266,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -304,6 +316,9 @@ "value": "b" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -351,6 +366,9 @@ "value": "c" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -398,6 +416,9 @@ "value": "q" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -445,6 +466,9 @@ "value": "p" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/order_6.exp.json b/testdata/d2oracle/TestDelete/order_6.exp.json index b35e3f7b04..d2340cdab5 100644 --- a/testdata/d2oracle/TestDelete/order_6.exp.json +++ b/testdata/d2oracle/TestDelete/order_6.exp.json @@ -115,6 +115,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -206,6 +209,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -253,6 +259,9 @@ "value": "lol" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -322,6 +331,9 @@ "value": "p" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -391,6 +403,9 @@ "value": "q" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/order_7.exp.json b/testdata/d2oracle/TestDelete/order_7.exp.json index f0f8a237d0..cf60f1ad81 100644 --- a/testdata/d2oracle/TestDelete/order_7.exp.json +++ b/testdata/d2oracle/TestDelete/order_7.exp.json @@ -126,6 +126,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -228,6 +231,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -275,6 +281,9 @@ "value": "lol" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -355,6 +364,9 @@ "value": "p" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -435,6 +447,9 @@ "value": "q" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -515,6 +530,9 @@ "value": "more" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/order_8.exp.json b/testdata/d2oracle/TestDelete/order_8.exp.json index 4d596cf763..117470b845 100644 --- a/testdata/d2oracle/TestDelete/order_8.exp.json +++ b/testdata/d2oracle/TestDelete/order_8.exp.json @@ -133,6 +133,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -182,6 +185,9 @@ "value": "bark" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -229,6 +235,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -276,6 +285,9 @@ "value": "zebra" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -323,6 +335,9 @@ "value": "q" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -370,6 +385,9 @@ "value": "kang" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/shape_class.exp.json b/testdata/d2oracle/TestDelete/shape_class.exp.json index 0db68a3571..23ddadef7a 100644 --- a/testdata/d2oracle/TestDelete/shape_class.exp.json +++ b/testdata/d2oracle/TestDelete/shape_class.exp.json @@ -41,6 +41,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -90,6 +93,9 @@ "value": "github.com/terrastruct/d2parser.git" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/shape_sql_table.exp.json b/testdata/d2oracle/TestDelete/shape_sql_table.exp.json index 2343b6250b..aac52ce904 100644 --- a/testdata/d2oracle/TestDelete/shape_sql_table.exp.json +++ b/testdata/d2oracle/TestDelete/shape_sql_table.exp.json @@ -261,6 +261,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -296,6 +299,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -345,6 +351,9 @@ "value": "cloud" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -475,6 +484,9 @@ "value": "disks" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "sql_table" @@ -522,6 +534,9 @@ "value": "AWS S3 Vancouver" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/singular_flat_style.exp.json b/testdata/d2oracle/TestDelete/singular_flat_style.exp.json index 66257d2b81..754ad2bc9e 100644 --- a/testdata/d2oracle/TestDelete/singular_flat_style.exp.json +++ b/testdata/d2oracle/TestDelete/singular_flat_style.exp.json @@ -41,6 +41,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -90,6 +93,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/singular_map_style.exp.json b/testdata/d2oracle/TestDelete/singular_map_style.exp.json index a0f9bc1607..e989df8d1b 100644 --- a/testdata/d2oracle/TestDelete/singular_map_style.exp.json +++ b/testdata/d2oracle/TestDelete/singular_map_style.exp.json @@ -41,6 +41,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -90,6 +93,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/underscore_no_conflict.exp.json b/testdata/d2oracle/TestDelete/underscore_no_conflict.exp.json index f7bb55dc2f..6fd2cfb1f3 100644 --- a/testdata/d2oracle/TestDelete/underscore_no_conflict.exp.json +++ b/testdata/d2oracle/TestDelete/underscore_no_conflict.exp.json @@ -104,6 +104,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -153,6 +156,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -211,6 +217,9 @@ "value": "z" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -258,6 +267,9 @@ "value": "z" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/underscore_remove.exp.json b/testdata/d2oracle/TestDelete/underscore_remove.exp.json index 4681f41bcb..7716bc8ff8 100644 --- a/testdata/d2oracle/TestDelete/underscore_remove.exp.json +++ b/testdata/d2oracle/TestDelete/underscore_remove.exp.json @@ -133,6 +133,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -168,6 +171,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -202,6 +208,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -251,6 +260,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -298,6 +310,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -345,6 +360,9 @@ "value": "b" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -392,6 +410,9 @@ "value": "c" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -439,6 +460,9 @@ "value": "d" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/append_multiple_styles.exp.json b/testdata/d2oracle/TestMove/append_multiple_styles.exp.json index 9321651648..9061657302 100644 --- a/testdata/d2oracle/TestMove/append_multiple_styles.exp.json +++ b/testdata/d2oracle/TestMove/append_multiple_styles.exp.json @@ -225,6 +225,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -274,6 +277,9 @@ "value": "d" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -348,6 +354,9 @@ "value": "red" } }, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/basic.exp.json b/testdata/d2oracle/TestMove/basic.exp.json index 06e880d9a0..376cd73e52 100644 --- a/testdata/d2oracle/TestMove/basic.exp.json +++ b/testdata/d2oracle/TestMove/basic.exp.json @@ -41,6 +41,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -90,6 +93,9 @@ "value": "b" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/basic_nested.exp.json b/testdata/d2oracle/TestMove/basic_nested.exp.json index b35f7cebab..661d265f0c 100644 --- a/testdata/d2oracle/TestMove/basic_nested.exp.json +++ b/testdata/d2oracle/TestMove/basic_nested.exp.json @@ -70,6 +70,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -119,6 +122,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -166,6 +172,9 @@ "value": "c" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/basic_out_of_container.exp.json b/testdata/d2oracle/TestMove/basic_out_of_container.exp.json index 9bcfc0c5aa..ae98933aea 100644 --- a/testdata/d2oracle/TestMove/basic_out_of_container.exp.json +++ b/testdata/d2oracle/TestMove/basic_out_of_container.exp.json @@ -64,6 +64,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -113,6 +116,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -160,6 +166,9 @@ "value": "b" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/between_containers.exp.json b/testdata/d2oracle/TestMove/between_containers.exp.json index f2941d00d3..0260ddb296 100644 --- a/testdata/d2oracle/TestMove/between_containers.exp.json +++ b/testdata/d2oracle/TestMove/between_containers.exp.json @@ -93,6 +93,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -142,6 +145,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -189,6 +195,9 @@ "value": "c" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -236,6 +245,9 @@ "value": "b" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/chain_connected_nested.exp.json b/testdata/d2oracle/TestMove/chain_connected_nested.exp.json index dc49a1953f..79f47f6490 100644 --- a/testdata/d2oracle/TestMove/chain_connected_nested.exp.json +++ b/testdata/d2oracle/TestMove/chain_connected_nested.exp.json @@ -124,6 +124,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -159,6 +162,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -193,6 +199,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -262,6 +271,9 @@ "value": "z" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -329,6 +341,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -376,6 +391,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.exp.json b/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.exp.json index 2dcce1517f..5e84757c02 100644 --- a/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.exp.json +++ b/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.exp.json @@ -112,6 +112,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -147,6 +150,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -181,6 +187,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -241,6 +250,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -299,6 +311,9 @@ "value": "b" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -366,6 +381,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -413,6 +431,9 @@ "value": "z" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/connected_nested.exp.json b/testdata/d2oracle/TestMove/connected_nested.exp.json index c36689ff30..5c5a072d1c 100644 --- a/testdata/d2oracle/TestMove/connected_nested.exp.json +++ b/testdata/d2oracle/TestMove/connected_nested.exp.json @@ -87,6 +87,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -122,6 +125,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -171,6 +177,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -218,6 +227,9 @@ "value": "z" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -265,6 +277,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/container_near.exp.json b/testdata/d2oracle/TestMove/container_near.exp.json index fe29c811f3..5487afc03a 100644 --- a/testdata/d2oracle/TestMove/container_near.exp.json +++ b/testdata/d2oracle/TestMove/container_near.exp.json @@ -195,6 +195,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -244,6 +247,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -291,6 +297,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": { "range": "d2/testdata/d2oracle/TestMove/container_near.d2,2:10:22-2:15:27", "path": [ @@ -386,6 +395,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -444,6 +456,9 @@ "value": "z" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -491,6 +506,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -538,6 +556,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/edge_across_containers.exp.json b/testdata/d2oracle/TestMove/edge_across_containers.exp.json index 9f99c25557..17d79ff57b 100644 --- a/testdata/d2oracle/TestMove/edge_across_containers.exp.json +++ b/testdata/d2oracle/TestMove/edge_across_containers.exp.json @@ -138,6 +138,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -173,6 +176,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -222,6 +228,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -311,6 +320,9 @@ "value": "d" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -380,6 +392,9 @@ "value": "b" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -427,6 +442,9 @@ "value": "c" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/edge_basic.exp.json b/testdata/d2oracle/TestMove/edge_basic.exp.json index 2a60da94e6..ab42c01acb 100644 --- a/testdata/d2oracle/TestMove/edge_basic.exp.json +++ b/testdata/d2oracle/TestMove/edge_basic.exp.json @@ -64,6 +64,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -99,6 +102,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -148,6 +154,9 @@ "value": "c" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -195,6 +204,9 @@ "value": "b" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/edge_chain_basic.exp.json b/testdata/d2oracle/TestMove/edge_chain_basic.exp.json index c6d6588978..6d799752c3 100644 --- a/testdata/d2oracle/TestMove/edge_chain_basic.exp.json +++ b/testdata/d2oracle/TestMove/edge_chain_basic.exp.json @@ -101,6 +101,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -136,6 +139,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -170,6 +176,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -219,6 +228,9 @@ "value": "d" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -286,6 +298,9 @@ "value": "b" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -333,6 +348,9 @@ "value": "c" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/edge_chain_circular.exp.json b/testdata/d2oracle/TestMove/edge_chain_circular.exp.json index 6679b41252..b3003c078d 100644 --- a/testdata/d2oracle/TestMove/edge_chain_circular.exp.json +++ b/testdata/d2oracle/TestMove/edge_chain_circular.exp.json @@ -152,6 +152,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -187,6 +190,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -221,6 +227,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -270,6 +279,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -359,6 +371,9 @@ "value": "b" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -426,6 +441,9 @@ "value": "c" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json b/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json index f09c257926..bcfe216195 100644 --- a/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json +++ b/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json @@ -135,6 +135,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -170,6 +173,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -204,6 +210,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -284,6 +293,9 @@ "value": "d" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -342,6 +354,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -409,6 +424,9 @@ "value": "b" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -456,6 +474,9 @@ "value": "c" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json b/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json index 6bcae60e4f..3eaab7f180 100644 --- a/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json +++ b/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json @@ -152,6 +152,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -187,6 +190,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -221,6 +227,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -270,6 +279,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -317,6 +329,9 @@ "value": "b" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -406,6 +421,9 @@ "value": "c" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -453,6 +471,9 @@ "value": "d" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/edge_conflict.exp.json b/testdata/d2oracle/TestMove/edge_conflict.exp.json index 1e9d65f2a0..ac9b4e473c 100644 --- a/testdata/d2oracle/TestMove/edge_conflict.exp.json +++ b/testdata/d2oracle/TestMove/edge_conflict.exp.json @@ -138,6 +138,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -173,6 +176,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -264,6 +270,9 @@ "value": "y 2" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -322,6 +331,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -380,6 +392,9 @@ "value": "b" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -427,6 +442,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -474,6 +492,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/edge_into_container.exp.json b/testdata/d2oracle/TestMove/edge_into_container.exp.json index 6f2f17d669..ca8d7e28f3 100644 --- a/testdata/d2oracle/TestMove/edge_into_container.exp.json +++ b/testdata/d2oracle/TestMove/edge_into_container.exp.json @@ -127,6 +127,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -162,6 +165,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -242,6 +248,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -289,6 +298,9 @@ "value": "d" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -347,6 +359,9 @@ "value": "b" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -394,6 +409,9 @@ "value": "c" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/edge_nested_basic.exp.json b/testdata/d2oracle/TestMove/edge_nested_basic.exp.json index b94d411784..9d7237e535 100644 --- a/testdata/d2oracle/TestMove/edge_nested_basic.exp.json +++ b/testdata/d2oracle/TestMove/edge_nested_basic.exp.json @@ -93,6 +93,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -128,6 +131,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -177,6 +183,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -224,6 +233,9 @@ "value": "d" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -271,6 +283,9 @@ "value": "c" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/edge_out_of_container.exp.json b/testdata/d2oracle/TestMove/edge_out_of_container.exp.json index 3ebabb074b..c05a666b35 100644 --- a/testdata/d2oracle/TestMove/edge_out_of_container.exp.json +++ b/testdata/d2oracle/TestMove/edge_out_of_container.exp.json @@ -104,6 +104,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -139,6 +142,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -188,6 +194,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -246,6 +255,9 @@ "value": "b" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -293,6 +305,9 @@ "value": "c" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/extend_map.exp.json b/testdata/d2oracle/TestMove/extend_map.exp.json index 0fa8abbe9e..0e4c8035f2 100644 --- a/testdata/d2oracle/TestMove/extend_map.exp.json +++ b/testdata/d2oracle/TestMove/extend_map.exp.json @@ -151,6 +151,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -220,6 +223,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -267,6 +273,9 @@ "value": "e" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -314,6 +323,9 @@ "value": "c" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -361,6 +373,9 @@ "value": "b" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/extend_stationary_path.exp.json b/testdata/d2oracle/TestMove/extend_stationary_path.exp.json index 4fa0e17c84..6d7d0cfc0c 100644 --- a/testdata/d2oracle/TestMove/extend_stationary_path.exp.json +++ b/testdata/d2oracle/TestMove/extend_stationary_path.exp.json @@ -144,6 +144,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -235,6 +238,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -324,6 +330,9 @@ "value": "c" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -413,6 +422,9 @@ "value": "b" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/flat_between_containers.exp.json b/testdata/d2oracle/TestMove/flat_between_containers.exp.json index c90e16cd48..0e2a85d56b 100644 --- a/testdata/d2oracle/TestMove/flat_between_containers.exp.json +++ b/testdata/d2oracle/TestMove/flat_between_containers.exp.json @@ -93,6 +93,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -142,6 +145,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -189,6 +195,9 @@ "value": "c" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -236,6 +245,9 @@ "value": "b" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/flat_merge.exp.json b/testdata/d2oracle/TestMove/flat_merge.exp.json index 5e629af742..a47c60f789 100644 --- a/testdata/d2oracle/TestMove/flat_merge.exp.json +++ b/testdata/d2oracle/TestMove/flat_merge.exp.json @@ -126,6 +126,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -175,6 +178,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -222,6 +228,9 @@ "value": "c" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -269,6 +278,9 @@ "value": "meow" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -316,6 +328,9 @@ "value": "b" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/flat_middle_container.exp.json b/testdata/d2oracle/TestMove/flat_middle_container.exp.json index 88ec4f4706..c054fac8e6 100644 --- a/testdata/d2oracle/TestMove/flat_middle_container.exp.json +++ b/testdata/d2oracle/TestMove/flat_middle_container.exp.json @@ -104,6 +104,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -164,6 +167,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -222,6 +228,9 @@ "value": "c" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -269,6 +278,9 @@ "value": "d" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -316,6 +328,9 @@ "value": "b" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/flat_nested_merge.exp.json b/testdata/d2oracle/TestMove/flat_nested_merge.exp.json index 1d9fe533b5..5b37917f16 100644 --- a/testdata/d2oracle/TestMove/flat_nested_merge.exp.json +++ b/testdata/d2oracle/TestMove/flat_nested_merge.exp.json @@ -182,6 +182,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -264,6 +267,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -344,6 +350,9 @@ "value": "b" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -424,6 +433,9 @@ "value": "d" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -504,6 +516,9 @@ "value": "e" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -562,6 +577,9 @@ "value": "p" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -620,6 +638,9 @@ "value": "q" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -689,6 +710,9 @@ "value": "b" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -758,6 +782,9 @@ "value": "m" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -827,6 +854,9 @@ "value": "o" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -874,6 +904,9 @@ "value": "z" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/flat_nested_merge_multiple_refs.exp.json b/testdata/d2oracle/TestMove/flat_nested_merge_multiple_refs.exp.json index 3fc5de7723..18aa890899 100644 --- a/testdata/d2oracle/TestMove/flat_nested_merge_multiple_refs.exp.json +++ b/testdata/d2oracle/TestMove/flat_nested_merge_multiple_refs.exp.json @@ -280,6 +280,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -424,6 +427,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -577,6 +583,9 @@ "value": "b" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -730,6 +739,9 @@ "value": "c" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -777,6 +789,9 @@ "value": "d" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -824,6 +839,9 @@ "value": "e" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -871,6 +889,9 @@ "value": "f" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -918,6 +939,9 @@ "value": "g" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -998,6 +1022,9 @@ "value": "q" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/flat_reparent_with_map_value.exp.json b/testdata/d2oracle/TestMove/flat_reparent_with_map_value.exp.json index 28f4a4d887..51038a2f21 100644 --- a/testdata/d2oracle/TestMove/flat_reparent_with_map_value.exp.json +++ b/testdata/d2oracle/TestMove/flat_reparent_with_map_value.exp.json @@ -103,6 +103,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -152,6 +155,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -199,6 +205,9 @@ "value": "b" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "hexagon" diff --git a/testdata/d2oracle/TestMove/flat_reparent_with_mixed_map_value.exp.json b/testdata/d2oracle/TestMove/flat_reparent_with_mixed_map_value.exp.json index 729fc1fbad..6354b6118d 100644 --- a/testdata/d2oracle/TestMove/flat_reparent_with_mixed_map_value.exp.json +++ b/testdata/d2oracle/TestMove/flat_reparent_with_mixed_map_value.exp.json @@ -144,6 +144,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -193,6 +196,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -240,6 +246,9 @@ "value": "c" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -287,6 +296,9 @@ "value": "b" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "hexagon" diff --git a/testdata/d2oracle/TestMove/flat_reparent_with_value.exp.json b/testdata/d2oracle/TestMove/flat_reparent_with_value.exp.json index 4c86d82221..51112d6dad 100644 --- a/testdata/d2oracle/TestMove/flat_reparent_with_value.exp.json +++ b/testdata/d2oracle/TestMove/flat_reparent_with_value.exp.json @@ -74,6 +74,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -123,6 +126,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -170,6 +176,9 @@ "value": "yo" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/flat_style.exp.json b/testdata/d2oracle/TestMove/flat_style.exp.json index 5895f7640e..cd16e5b5e6 100644 --- a/testdata/d2oracle/TestMove/flat_style.exp.json +++ b/testdata/d2oracle/TestMove/flat_style.exp.json @@ -153,6 +153,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -202,6 +205,9 @@ "value": "b" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -320,6 +326,9 @@ "value": "black" } }, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/full_edge_slice.exp.json b/testdata/d2oracle/TestMove/full_edge_slice.exp.json index 7930f259f9..ffd61772f4 100644 --- a/testdata/d2oracle/TestMove/full_edge_slice.exp.json +++ b/testdata/d2oracle/TestMove/full_edge_slice.exp.json @@ -207,6 +207,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -242,6 +245,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -276,6 +282,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -356,6 +365,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -403,6 +415,9 @@ "value": "b" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -501,6 +516,9 @@ "value": "c" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -579,6 +597,9 @@ "value": "d" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/full_slice.exp.json b/testdata/d2oracle/TestMove/full_slice.exp.json index e8f944e88c..40016d9cd1 100644 --- a/testdata/d2oracle/TestMove/full_slice.exp.json +++ b/testdata/d2oracle/TestMove/full_slice.exp.json @@ -93,6 +93,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -142,6 +145,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -189,6 +195,9 @@ "value": "b" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -236,6 +245,9 @@ "value": "c" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/gnarly_1.exp.json b/testdata/d2oracle/TestMove/gnarly_1.exp.json index 4e2f91a5b7..3a6fe95fdd 100644 --- a/testdata/d2oracle/TestMove/gnarly_1.exp.json +++ b/testdata/d2oracle/TestMove/gnarly_1.exp.json @@ -351,6 +351,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -386,6 +389,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -420,6 +426,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -454,6 +463,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -525,6 +537,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -594,6 +609,9 @@ "value": "b" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -663,6 +681,9 @@ "value": "c" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -772,6 +793,9 @@ "value": "d" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -841,6 +865,9 @@ "value": "e" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -910,6 +937,9 @@ "value": "f" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -957,6 +987,9 @@ "value": "meow" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -1066,6 +1099,9 @@ "value": "eyy" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -1144,6 +1180,9 @@ "value": "q" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -1202,6 +1241,9 @@ "value": "p" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -1260,6 +1302,9 @@ "value": "q" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -1318,6 +1363,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/hoist_container_children.exp.json b/testdata/d2oracle/TestMove/hoist_container_children.exp.json index f7281f4502..e8444d0828 100644 --- a/testdata/d2oracle/TestMove/hoist_container_children.exp.json +++ b/testdata/d2oracle/TestMove/hoist_container_children.exp.json @@ -116,6 +116,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -165,6 +168,9 @@ "value": "b" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -212,6 +218,9 @@ "value": "c" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -259,6 +268,9 @@ "value": "d" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -306,6 +318,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/into_container_existing_map.exp.json b/testdata/d2oracle/TestMove/into_container_existing_map.exp.json index 24c90bda3e..646d737c43 100644 --- a/testdata/d2oracle/TestMove/into_container_existing_map.exp.json +++ b/testdata/d2oracle/TestMove/into_container_existing_map.exp.json @@ -93,6 +93,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -142,6 +145,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -189,6 +195,9 @@ "value": "b" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -236,6 +245,9 @@ "value": "c" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/into_container_nonexisting_map.exp.json b/testdata/d2oracle/TestMove/into_container_nonexisting_map.exp.json index 97a8c08420..02a1a815e7 100644 --- a/testdata/d2oracle/TestMove/into_container_nonexisting_map.exp.json +++ b/testdata/d2oracle/TestMove/into_container_nonexisting_map.exp.json @@ -70,6 +70,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -119,6 +122,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -166,6 +172,9 @@ "value": "c" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/into_container_with_flat_keys.exp.json b/testdata/d2oracle/TestMove/into_container_with_flat_keys.exp.json index 37ed09c5a1..7a02b46d8c 100644 --- a/testdata/d2oracle/TestMove/into_container_with_flat_keys.exp.json +++ b/testdata/d2oracle/TestMove/into_container_with_flat_keys.exp.json @@ -204,6 +204,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -253,6 +256,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -310,6 +316,9 @@ "value": "#FFFFFF" } }, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/into_container_with_flat_style.exp.json b/testdata/d2oracle/TestMove/into_container_with_flat_style.exp.json index 9b1be928bf..1f1e0a1aed 100644 --- a/testdata/d2oracle/TestMove/into_container_with_flat_style.exp.json +++ b/testdata/d2oracle/TestMove/into_container_with_flat_style.exp.json @@ -110,6 +110,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -163,6 +166,9 @@ "value": "5" } }, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -210,6 +216,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/map_transplant.exp.json b/testdata/d2oracle/TestMove/map_transplant.exp.json index 7cfe895073..4fb8e63382 100644 --- a/testdata/d2oracle/TestMove/map_transplant.exp.json +++ b/testdata/d2oracle/TestMove/map_transplant.exp.json @@ -213,6 +213,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -262,6 +265,9 @@ "value": "b" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -309,6 +315,9 @@ "value": "c" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -356,6 +365,9 @@ "value": "d" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -407,6 +419,9 @@ "value": "0.4" } }, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/map_with_label.exp.json b/testdata/d2oracle/TestMove/map_with_label.exp.json index 9be066a031..cf7f00e262 100644 --- a/testdata/d2oracle/TestMove/map_with_label.exp.json +++ b/testdata/d2oracle/TestMove/map_with_label.exp.json @@ -103,6 +103,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -152,6 +155,9 @@ "value": "c" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -199,6 +205,9 @@ "value": "d" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -246,6 +255,9 @@ "value": "yo" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/merge_nested_maps.exp.json b/testdata/d2oracle/TestMove/merge_nested_maps.exp.json index 3a9a60e265..90952da413 100644 --- a/testdata/d2oracle/TestMove/merge_nested_maps.exp.json +++ b/testdata/d2oracle/TestMove/merge_nested_maps.exp.json @@ -264,6 +264,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -313,6 +316,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -464,6 +470,9 @@ "value": "b" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -522,6 +531,9 @@ "value": "c" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -600,6 +612,9 @@ "value": "d" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -669,6 +684,9 @@ "value": "e" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -738,6 +756,9 @@ "value": "g" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -785,6 +806,9 @@ "value": "o" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -832,6 +856,9 @@ "value": "k" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/merge_reserved.exp.json b/testdata/d2oracle/TestMove/merge_reserved.exp.json index 5b1266847b..362c5560b6 100644 --- a/testdata/d2oracle/TestMove/merge_reserved.exp.json +++ b/testdata/d2oracle/TestMove/merge_reserved.exp.json @@ -255,6 +255,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -304,6 +307,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -444,6 +450,9 @@ "value": "hi" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -502,6 +511,9 @@ "value": "c" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -560,6 +572,9 @@ "value": "e" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -618,6 +633,9 @@ "value": "g" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -665,6 +683,9 @@ "value": "k" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/middle_container.exp.json b/testdata/d2oracle/TestMove/middle_container.exp.json index 2290d2ecd7..1470b67812 100644 --- a/testdata/d2oracle/TestMove/middle_container.exp.json +++ b/testdata/d2oracle/TestMove/middle_container.exp.json @@ -93,6 +93,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -142,6 +145,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -189,6 +195,9 @@ "value": "z" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -236,6 +245,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/move_container_children.exp.json b/testdata/d2oracle/TestMove/move_container_children.exp.json index 0fc5e2d5c2..f5b6070250 100644 --- a/testdata/d2oracle/TestMove/move_container_children.exp.json +++ b/testdata/d2oracle/TestMove/move_container_children.exp.json @@ -139,6 +139,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -188,6 +191,9 @@ "value": "p" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -235,6 +241,9 @@ "value": "q" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -282,6 +291,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -329,6 +341,9 @@ "value": "d" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -376,6 +391,9 @@ "value": "b" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/move_container_conflict_children.exp.json b/testdata/d2oracle/TestMove/move_container_conflict_children.exp.json index 54d04a271f..544f148275 100644 --- a/testdata/d2oracle/TestMove/move_container_conflict_children.exp.json +++ b/testdata/d2oracle/TestMove/move_container_conflict_children.exp.json @@ -139,6 +139,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -188,6 +191,9 @@ "value": "a 2" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -235,6 +241,9 @@ "value": "b" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -282,6 +291,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -329,6 +341,9 @@ "value": "d" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -376,6 +391,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/move_into_key_with_value.exp.json b/testdata/d2oracle/TestMove/move_into_key_with_value.exp.json index 3ed4a639d4..2c05c1f113 100644 --- a/testdata/d2oracle/TestMove/move_into_key_with_value.exp.json +++ b/testdata/d2oracle/TestMove/move_into_key_with_value.exp.json @@ -80,6 +80,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -129,6 +132,9 @@ "value": "meow" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -176,6 +182,9 @@ "value": "b" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/move_out_of_edge.exp.json b/testdata/d2oracle/TestMove/move_out_of_edge.exp.json index d59c9e251a..9cd5bc5a7a 100644 --- a/testdata/d2oracle/TestMove/move_out_of_edge.exp.json +++ b/testdata/d2oracle/TestMove/move_out_of_edge.exp.json @@ -120,6 +120,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -155,6 +158,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -215,6 +221,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -273,6 +282,9 @@ "value": "c" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -342,6 +354,9 @@ "value": "d" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -411,6 +426,9 @@ "value": "e" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -480,6 +498,9 @@ "value": "f" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -527,6 +548,9 @@ "value": "q" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/move_out_of_nested_edge.exp.json b/testdata/d2oracle/TestMove/move_out_of_nested_edge.exp.json index 512eef8885..ee5e0c0cb8 100644 --- a/testdata/d2oracle/TestMove/move_out_of_nested_edge.exp.json +++ b/testdata/d2oracle/TestMove/move_out_of_nested_edge.exp.json @@ -160,6 +160,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -195,6 +198,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -255,6 +261,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -313,6 +322,9 @@ "value": "c" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -413,6 +425,9 @@ "value": "d" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -513,6 +528,9 @@ "value": "e" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -582,6 +600,9 @@ "value": "f" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -629,6 +650,9 @@ "value": "q" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/multiple_nesting_levels.exp.json b/testdata/d2oracle/TestMove/multiple_nesting_levels.exp.json index b4748aa223..fcf6fffc5d 100644 --- a/testdata/d2oracle/TestMove/multiple_nesting_levels.exp.json +++ b/testdata/d2oracle/TestMove/multiple_nesting_levels.exp.json @@ -275,6 +275,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -377,6 +380,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -519,6 +525,9 @@ "value": "b" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -681,6 +690,9 @@ "value": "c" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -728,6 +740,9 @@ "value": "g" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -775,6 +790,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -844,6 +862,9 @@ "value": "d" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -924,6 +945,9 @@ "value": "f" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/near.exp.json b/testdata/d2oracle/TestMove/near.exp.json index 81e71d5e46..a74300b6f4 100644 --- a/testdata/d2oracle/TestMove/near.exp.json +++ b/testdata/d2oracle/TestMove/near.exp.json @@ -103,6 +103,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -152,6 +155,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": { "range": "d2/testdata/d2oracle/TestMove/near.d2,1:8:13-1:11:16", "path": [ @@ -225,6 +231,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/nhooyr_one.exp.json b/testdata/d2oracle/TestMove/nhooyr_one.exp.json index 09b3f6a315..59df1a784d 100644 --- a/testdata/d2oracle/TestMove/nhooyr_one.exp.json +++ b/testdata/d2oracle/TestMove/nhooyr_one.exp.json @@ -122,6 +122,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -171,6 +174,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -218,6 +224,9 @@ "value": "c" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -265,6 +274,9 @@ "value": "d" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -312,6 +324,9 @@ "value": "q" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/nhooyr_two.exp.json b/testdata/d2oracle/TestMove/nhooyr_two.exp.json index 91b09c9868..7630df4b3e 100644 --- a/testdata/d2oracle/TestMove/nhooyr_two.exp.json +++ b/testdata/d2oracle/TestMove/nhooyr_two.exp.json @@ -168,6 +168,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -203,6 +206,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -252,6 +258,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -299,6 +308,9 @@ "value": "c" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -346,6 +358,9 @@ "value": "meow" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -393,6 +408,9 @@ "value": "d" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -440,6 +458,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -487,6 +508,9 @@ "value": "b" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/parentheses.exp.json b/testdata/d2oracle/TestMove/parentheses.exp.json index b2580ed86b..73a25d9c84 100644 --- a/testdata/d2oracle/TestMove/parentheses.exp.json +++ b/testdata/d2oracle/TestMove/parentheses.exp.json @@ -103,6 +103,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -138,6 +141,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -187,6 +193,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -265,6 +274,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -323,6 +335,9 @@ "value": "y (z)" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/partial_edge_slice.exp.json b/testdata/d2oracle/TestMove/partial_edge_slice.exp.json index 29fbde7e72..f1a0796cf0 100644 --- a/testdata/d2oracle/TestMove/partial_edge_slice.exp.json +++ b/testdata/d2oracle/TestMove/partial_edge_slice.exp.json @@ -110,6 +110,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -145,6 +148,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -194,6 +200,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -261,6 +270,9 @@ "value": "b" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -308,6 +320,9 @@ "value": "c" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/partial_slice.exp.json b/testdata/d2oracle/TestMove/partial_slice.exp.json index 0161c622da..6869c4c864 100644 --- a/testdata/d2oracle/TestMove/partial_slice.exp.json +++ b/testdata/d2oracle/TestMove/partial_slice.exp.json @@ -64,6 +64,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -113,6 +116,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -160,6 +166,9 @@ "value": "b" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/rename_2.exp.json b/testdata/d2oracle/TestMove/rename_2.exp.json index e9b014af4c..4d39ca632e 100644 --- a/testdata/d2oracle/TestMove/rename_2.exp.json +++ b/testdata/d2oracle/TestMove/rename_2.exp.json @@ -139,6 +139,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -188,6 +191,9 @@ "value": "b" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -235,6 +241,9 @@ "value": "y 2" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -282,6 +291,9 @@ "value": "b 2" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -329,6 +341,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -376,6 +391,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/reuse_map.exp.json b/testdata/d2oracle/TestMove/reuse_map.exp.json index 7998a83598..8e29a80885 100644 --- a/testdata/d2oracle/TestMove/reuse_map.exp.json +++ b/testdata/d2oracle/TestMove/reuse_map.exp.json @@ -156,6 +156,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -205,6 +208,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -283,6 +289,9 @@ "value": "b" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -330,6 +339,9 @@ "value": "hey" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -377,6 +389,9 @@ "value": "k" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -435,6 +450,9 @@ "value": "yo" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/slice_style.exp.json b/testdata/d2oracle/TestMove/slice_style.exp.json index a679114f2b..91dad9358b 100644 --- a/testdata/d2oracle/TestMove/slice_style.exp.json +++ b/testdata/d2oracle/TestMove/slice_style.exp.json @@ -108,6 +108,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -157,6 +160,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -247,6 +253,9 @@ "Fragment": "", "RawFragment": "" }, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/underscore_children.exp.json b/testdata/d2oracle/TestMove/underscore_children.exp.json index b6c8caa7e0..56f93abbea 100644 --- a/testdata/d2oracle/TestMove/underscore_children.exp.json +++ b/testdata/d2oracle/TestMove/underscore_children.exp.json @@ -104,6 +104,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -153,6 +156,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -231,6 +237,9 @@ "value": "c" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/underscore_edge_children.exp.json b/testdata/d2oracle/TestMove/underscore_edge_children.exp.json index 464d2c192c..9a9f91f014 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_children.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_children.exp.json @@ -127,6 +127,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -162,6 +165,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -211,6 +217,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -289,6 +298,9 @@ "value": "c" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -336,6 +348,9 @@ "value": "c" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json index 90b7fa65ed..f8a4b6ef53 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json @@ -93,6 +93,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -128,6 +131,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -177,6 +183,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -224,6 +233,9 @@ "value": "b" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -271,6 +283,9 @@ "value": "c" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json index f323b850c5..3e839166c5 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json @@ -104,6 +104,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -139,6 +142,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -188,6 +194,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -266,6 +275,9 @@ "value": "c" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -324,6 +336,9 @@ "value": "b" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json index 1f9caaf4c8..a89e5d2562 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json @@ -104,6 +104,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -139,6 +142,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -188,6 +194,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -246,6 +255,9 @@ "value": "d" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -293,6 +305,9 @@ "value": "c" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json index 6f099e02c5..f175b5d309 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json @@ -93,6 +93,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -128,6 +131,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -177,6 +183,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -224,6 +233,9 @@ "value": "f" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -271,6 +283,9 @@ "value": "c" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json index 6312973f91..dc5b43e743 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json @@ -126,6 +126,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -161,6 +164,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -210,6 +216,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -310,6 +319,9 @@ "value": "c" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -379,6 +391,9 @@ "value": "b" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/underscore_edge_split.exp.json b/testdata/d2oracle/TestMove/underscore_edge_split.exp.json index 28b326089e..65bcf63c0a 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_split.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_split.exp.json @@ -156,6 +156,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -191,6 +194,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -240,6 +246,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -287,6 +296,9 @@ "value": "b" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -345,6 +357,9 @@ "value": "f" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -392,6 +407,9 @@ "value": "yo" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -439,6 +457,9 @@ "value": "c" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/underscore_merge.exp.json b/testdata/d2oracle/TestMove/underscore_merge.exp.json index 34d2cab069..04ca266ac0 100644 --- a/testdata/d2oracle/TestMove/underscore_merge.exp.json +++ b/testdata/d2oracle/TestMove/underscore_merge.exp.json @@ -136,6 +136,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -185,6 +188,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -232,6 +238,9 @@ "value": "c" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -299,6 +308,9 @@ "value": "what" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/underscore_split.exp.json b/testdata/d2oracle/TestMove/underscore_split.exp.json index 497f43451c..bb29ffd6fd 100644 --- a/testdata/d2oracle/TestMove/underscore_split.exp.json +++ b/testdata/d2oracle/TestMove/underscore_split.exp.json @@ -133,6 +133,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -182,6 +185,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -229,6 +235,9 @@ "value": "b" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -287,6 +296,9 @@ "value": "f" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -334,6 +346,9 @@ "value": "c" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/underscore_split_out.exp.json b/testdata/d2oracle/TestMove/underscore_split_out.exp.json index 1f114ae4a8..915d2f7e70 100644 --- a/testdata/d2oracle/TestMove/underscore_split_out.exp.json +++ b/testdata/d2oracle/TestMove/underscore_split_out.exp.json @@ -191,6 +191,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -240,6 +243,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -287,6 +293,9 @@ "value": "b" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -365,6 +374,9 @@ "value": "c" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -412,6 +424,9 @@ "value": "e" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -459,6 +474,9 @@ "value": "f" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/underscore_transplant.exp.json b/testdata/d2oracle/TestMove/underscore_transplant.exp.json index 58f9589e44..f20a88510c 100644 --- a/testdata/d2oracle/TestMove/underscore_transplant.exp.json +++ b/testdata/d2oracle/TestMove/underscore_transplant.exp.json @@ -93,6 +93,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -142,6 +145,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -189,6 +195,9 @@ "value": "b" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -236,6 +245,9 @@ "value": "c" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/unique_name.exp.json b/testdata/d2oracle/TestMove/unique_name.exp.json index 6d3a8542d2..0e8f1a7deb 100644 --- a/testdata/d2oracle/TestMove/unique_name.exp.json +++ b/testdata/d2oracle/TestMove/unique_name.exp.json @@ -150,6 +150,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -230,6 +233,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -308,6 +314,9 @@ "value": "b" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -355,6 +364,9 @@ "value": "b 2" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -402,6 +414,9 @@ "value": "c" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/unique_name_with_references.exp.json b/testdata/d2oracle/TestMove/unique_name_with_references.exp.json index 2543b2824f..50590ed0f6 100644 --- a/testdata/d2oracle/TestMove/unique_name_with_references.exp.json +++ b/testdata/d2oracle/TestMove/unique_name_with_references.exp.json @@ -173,6 +173,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -208,6 +211,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -288,6 +294,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -335,6 +344,9 @@ "value": "b" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -413,6 +425,9 @@ "value": "b 2" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -460,6 +475,9 @@ "value": "d" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -507,6 +525,9 @@ "value": "c" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestRename/arrows.exp.json b/testdata/d2oracle/TestRename/arrows.exp.json index e41966b64f..561ea620fe 100644 --- a/testdata/d2oracle/TestRename/arrows.exp.json +++ b/testdata/d2oracle/TestRename/arrows.exp.json @@ -64,6 +64,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -99,6 +102,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -148,6 +154,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -195,6 +204,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestRename/arrows_chain.exp.json b/testdata/d2oracle/TestRename/arrows_chain.exp.json index f39e8e3317..724b1440ec 100644 --- a/testdata/d2oracle/TestRename/arrows_chain.exp.json +++ b/testdata/d2oracle/TestRename/arrows_chain.exp.json @@ -138,6 +138,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -173,6 +176,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -207,6 +213,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -241,6 +250,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -290,6 +302,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -357,6 +372,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -424,6 +442,9 @@ "value": "z" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -471,6 +492,9 @@ "value": "q" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestRename/arrows_complex.exp.json b/testdata/d2oracle/TestRename/arrows_complex.exp.json index ceaeb1939b..5b177253ac 100644 --- a/testdata/d2oracle/TestRename/arrows_complex.exp.json +++ b/testdata/d2oracle/TestRename/arrows_complex.exp.json @@ -118,6 +118,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -153,6 +156,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -213,6 +219,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -271,6 +280,9 @@ "value": "b" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -318,6 +330,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -365,6 +380,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestRename/arrows_trim_common.exp.json b/testdata/d2oracle/TestRename/arrows_trim_common.exp.json index a8b23a0e90..acc93f278e 100644 --- a/testdata/d2oracle/TestRename/arrows_trim_common.exp.json +++ b/testdata/d2oracle/TestRename/arrows_trim_common.exp.json @@ -154,6 +154,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -189,6 +192,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -223,6 +229,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -257,6 +266,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -306,6 +318,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -353,6 +368,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -420,6 +438,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -487,6 +508,9 @@ "value": "z" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -534,6 +558,9 @@ "value": "q" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json b/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json index 10857e4ecf..fd248fadff 100644 --- a/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json +++ b/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json @@ -204,6 +204,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -239,6 +242,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -273,6 +279,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -307,6 +316,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -522,6 +534,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -580,6 +595,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -669,6 +687,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -758,6 +779,9 @@ "value": "z" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -816,6 +840,9 @@ "value": "q)" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestRename/complex_edge_1.exp.json b/testdata/d2oracle/TestRename/complex_edge_1.exp.json index 3da52bb896..a85a550515 100644 --- a/testdata/d2oracle/TestRename/complex_edge_1.exp.json +++ b/testdata/d2oracle/TestRename/complex_edge_1.exp.json @@ -118,6 +118,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -153,6 +156,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -213,6 +219,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -271,6 +280,9 @@ "value": "ooo" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -318,6 +330,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -365,6 +380,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestRename/complex_edge_2.exp.json b/testdata/d2oracle/TestRename/complex_edge_2.exp.json index 86105711f2..76a9c9bae9 100644 --- a/testdata/d2oracle/TestRename/complex_edge_2.exp.json +++ b/testdata/d2oracle/TestRename/complex_edge_2.exp.json @@ -118,6 +118,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -153,6 +156,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -213,6 +219,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -271,6 +280,9 @@ "value": "b" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -318,6 +330,9 @@ "value": "papa" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -365,6 +380,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestRename/conflict.exp.json b/testdata/d2oracle/TestRename/conflict.exp.json index a09bd86154..b9f467a0aa 100644 --- a/testdata/d2oracle/TestRename/conflict.exp.json +++ b/testdata/d2oracle/TestRename/conflict.exp.json @@ -64,6 +64,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -113,6 +116,9 @@ "value": "la 2" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -160,6 +166,9 @@ "value": "la" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestRename/conflict_2.exp.json b/testdata/d2oracle/TestRename/conflict_2.exp.json index 087cd96a71..9fde0282a8 100644 --- a/testdata/d2oracle/TestRename/conflict_2.exp.json +++ b/testdata/d2oracle/TestRename/conflict_2.exp.json @@ -115,6 +115,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -186,6 +189,9 @@ "value": "1" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -255,6 +261,9 @@ "value": "2" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -324,6 +333,9 @@ "value": "3" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -371,6 +383,9 @@ "value": "5 2" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -418,6 +433,9 @@ "value": "5" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestRename/conflict_with_dots.exp.json b/testdata/d2oracle/TestRename/conflict_with_dots.exp.json index 79e6458c06..d3abb68d2d 100644 --- a/testdata/d2oracle/TestRename/conflict_with_dots.exp.json +++ b/testdata/d2oracle/TestRename/conflict_with_dots.exp.json @@ -64,6 +64,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -113,6 +116,9 @@ "value": "a.b" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -160,6 +166,9 @@ "value": "a.b 2" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestRename/container.exp.json b/testdata/d2oracle/TestRename/container.exp.json index ebcfb5eaa9..dd9dad2391 100644 --- a/testdata/d2oracle/TestRename/container.exp.json +++ b/testdata/d2oracle/TestRename/container.exp.json @@ -743,6 +743,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -781,6 +784,9 @@ "value": "furbling, v.:" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -815,6 +821,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -849,6 +858,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -883,6 +895,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -917,6 +932,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -951,6 +969,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -985,6 +1006,9 @@ "value": "furbling, v.:" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -1275,6 +1299,9 @@ "value": "ok" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -1563,6 +1590,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -1840,6 +1870,9 @@ "value": "label" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -1960,6 +1993,9 @@ "value": "p" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -2080,6 +2116,9 @@ "value": "k" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -2169,6 +2208,9 @@ "value": "l" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -2258,6 +2300,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -2305,6 +2350,9 @@ "value": "q" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -2372,6 +2420,9 @@ "value": "+" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -2419,6 +2470,9 @@ "value": "i" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -2466,6 +2520,9 @@ "value": "more" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -2535,6 +2592,9 @@ "value": "ok" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -2604,6 +2664,9 @@ "value": "q" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -2673,6 +2736,9 @@ "value": "z" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -2731,6 +2797,9 @@ "value": "p" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -2789,6 +2858,9 @@ "value": "k" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestRename/edges.exp.json b/testdata/d2oracle/TestRename/edges.exp.json index 206fb1380b..fadd287af1 100644 --- a/testdata/d2oracle/TestRename/edges.exp.json +++ b/testdata/d2oracle/TestRename/edges.exp.json @@ -408,6 +408,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -443,6 +446,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -477,6 +483,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -511,6 +520,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -545,6 +557,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -579,6 +594,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -613,6 +631,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -786,6 +807,9 @@ "value": "q" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -977,6 +1001,9 @@ "value": "label" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -1066,6 +1093,9 @@ "value": "p" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -1155,6 +1185,9 @@ "value": "k" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -1244,6 +1277,9 @@ "value": "l" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -1333,6 +1369,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -1380,6 +1419,9 @@ "value": "q" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -1447,6 +1489,9 @@ "value": "+" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestRename/flat.exp.json b/testdata/d2oracle/TestRename/flat.exp.json index 45509c8eab..b80c914ac1 100644 --- a/testdata/d2oracle/TestRename/flat.exp.json +++ b/testdata/d2oracle/TestRename/flat.exp.json @@ -41,6 +41,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -90,6 +93,9 @@ "value": "---" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestRename/generated.exp.json b/testdata/d2oracle/TestRename/generated.exp.json index f2e7999e46..2397dac9b1 100644 --- a/testdata/d2oracle/TestRename/generated.exp.json +++ b/testdata/d2oracle/TestRename/generated.exp.json @@ -41,6 +41,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -90,6 +93,9 @@ "value": "Square" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestRename/near.exp.json b/testdata/d2oracle/TestRename/near.exp.json index 18b2327440..73fb0cbcb2 100644 --- a/testdata/d2oracle/TestRename/near.exp.json +++ b/testdata/d2oracle/TestRename/near.exp.json @@ -103,6 +103,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -152,6 +155,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": { "range": "d2/testdata/d2oracle/TestRename/near.d2,1:8:13-1:9:14", "path": [ @@ -214,6 +220,9 @@ "value": "z" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestRename/nested.exp.json b/testdata/d2oracle/TestRename/nested.exp.json index a1fbc9dc19..792993f792 100644 --- a/testdata/d2oracle/TestRename/nested.exp.json +++ b/testdata/d2oracle/TestRename/nested.exp.json @@ -170,6 +170,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -316,6 +319,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -460,6 +466,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -604,6 +613,9 @@ "value": "z" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -748,6 +760,9 @@ "value": "q" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -859,6 +874,9 @@ "value": "nerve-gift-jingler" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/base.exp.json b/testdata/d2oracle/TestSet/base.exp.json index 937c0c25ef..9a76259af7 100644 --- a/testdata/d2oracle/TestSet/base.exp.json +++ b/testdata/d2oracle/TestSet/base.exp.json @@ -41,6 +41,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -90,6 +93,9 @@ "value": "square" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/block_string_multiline.exp.json b/testdata/d2oracle/TestSet/block_string_multiline.exp.json index 9ef7f779cf..93209336ab 100644 --- a/testdata/d2oracle/TestSet/block_string_multiline.exp.json +++ b/testdata/d2oracle/TestSet/block_string_multiline.exp.json @@ -48,6 +48,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -97,6 +100,9 @@ "value": "# header\nHe has not acquired a fortune; the fortune has acquired him.\nHe has not acquired a fortune; the fortune has acquired him." }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "language": "markdown", "shape": { diff --git a/testdata/d2oracle/TestSet/block_string_oneline.exp.json b/testdata/d2oracle/TestSet/block_string_oneline.exp.json index e34f67274c..53c4e9f8e2 100644 --- a/testdata/d2oracle/TestSet/block_string_oneline.exp.json +++ b/testdata/d2oracle/TestSet/block_string_oneline.exp.json @@ -48,6 +48,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -97,6 +100,9 @@ "value": "|||what's up|||" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "language": "markdown", "shape": { diff --git a/testdata/d2oracle/TestSet/edge.exp.json b/testdata/d2oracle/TestSet/edge.exp.json index 7dd362d35d..e3df8d481c 100644 --- a/testdata/d2oracle/TestSet/edge.exp.json +++ b/testdata/d2oracle/TestSet/edge.exp.json @@ -74,6 +74,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -109,6 +112,9 @@ "value": "two" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -158,6 +164,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -205,6 +214,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/edge_append_style.exp.json b/testdata/d2oracle/TestSet/edge_append_style.exp.json index df73c9e8cd..6e714f5cda 100644 --- a/testdata/d2oracle/TestSet/edge_append_style.exp.json +++ b/testdata/d2oracle/TestSet/edge_append_style.exp.json @@ -109,6 +109,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -148,6 +151,9 @@ "value": "true" } }, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -197,6 +203,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -244,6 +253,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/edge_chain.exp.json b/testdata/d2oracle/TestSet/edge_chain.exp.json index 38a955f54d..e3239e310a 100644 --- a/testdata/d2oracle/TestSet/edge_chain.exp.json +++ b/testdata/d2oracle/TestSet/edge_chain.exp.json @@ -201,6 +201,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -239,6 +242,9 @@ "value": "QOTD:\n \"It's been Monday all week today.\"" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -273,6 +279,9 @@ "value": "wsup" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -322,6 +331,9 @@ "value": "oreo" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -389,6 +401,9 @@ "value": "q" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -476,6 +491,9 @@ "value": "z" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -523,6 +541,9 @@ "value": "p" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json b/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json index 352c03065e..b476120130 100644 --- a/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json +++ b/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json @@ -184,6 +184,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -226,6 +229,9 @@ "value": "true" } }, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -260,6 +266,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -329,6 +338,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -416,6 +428,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -463,6 +478,9 @@ "value": "z" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json b/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json index 4da734c2fc..18fda95d21 100644 --- a/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json +++ b/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json @@ -268,6 +268,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -303,6 +306,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -350,6 +356,9 @@ "value": "true" } }, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -399,6 +408,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -506,6 +518,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -593,6 +608,9 @@ "value": "z" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json b/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json index ec5796b6a6..23bbfebf36 100644 --- a/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json +++ b/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json @@ -224,6 +224,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -266,6 +269,9 @@ "value": "0.4" } }, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -300,6 +306,9 @@ "value": "wsup" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -349,6 +358,9 @@ "value": "oreo" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -416,6 +428,9 @@ "value": "q" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -503,6 +518,9 @@ "value": "z" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -550,6 +568,9 @@ "value": "p" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/edge_index_case.exp.json b/testdata/d2oracle/TestSet/edge_index_case.exp.json index 658fde41fa..681628c3bc 100644 --- a/testdata/d2oracle/TestSet/edge_index_case.exp.json +++ b/testdata/d2oracle/TestSet/edge_index_case.exp.json @@ -178,6 +178,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -213,6 +216,9 @@ "value": "two" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -247,6 +253,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -296,6 +305,9 @@ "value": "Square" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -343,6 +355,9 @@ "value": "Square" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -390,6 +405,9 @@ "value": "Square 2" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -437,6 +455,9 @@ "value": "z" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -484,6 +505,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -531,6 +555,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/edge_index_nested.exp.json b/testdata/d2oracle/TestSet/edge_index_nested.exp.json index 3c4f39bc9e..61abf2a7c6 100644 --- a/testdata/d2oracle/TestSet/edge_index_nested.exp.json +++ b/testdata/d2oracle/TestSet/edge_index_nested.exp.json @@ -103,6 +103,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -138,6 +141,9 @@ "value": "QOTD" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -187,6 +193,9 @@ "value": "oreo" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -234,6 +243,9 @@ "value": "q" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -281,6 +293,9 @@ "value": "z" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/edge_key_and_key.exp.json b/testdata/d2oracle/TestSet/edge_key_and_key.exp.json index de50d761df..0c67a35535 100644 --- a/testdata/d2oracle/TestSet/edge_key_and_key.exp.json +++ b/testdata/d2oracle/TestSet/edge_key_and_key.exp.json @@ -154,6 +154,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -193,6 +196,9 @@ "value": "true" } }, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -304,6 +310,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -362,6 +371,9 @@ "value": "b" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -420,6 +432,9 @@ "value": "c" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/edge_label.exp.json b/testdata/d2oracle/TestSet/edge_label.exp.json index f723ae78ec..c128c1edab 100644 --- a/testdata/d2oracle/TestSet/edge_label.exp.json +++ b/testdata/d2oracle/TestSet/edge_label.exp.json @@ -119,6 +119,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -158,6 +161,9 @@ "value": "true" } }, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -207,6 +213,9 @@ "value": "a" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -254,6 +263,9 @@ "value": "b" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/edge_merge_style.exp.json b/testdata/d2oracle/TestSet/edge_merge_style.exp.json index 005921a4e3..362369272c 100644 --- a/testdata/d2oracle/TestSet/edge_merge_style.exp.json +++ b/testdata/d2oracle/TestSet/edge_merge_style.exp.json @@ -156,6 +156,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -198,6 +201,9 @@ "value": "true" } }, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -247,6 +253,9 @@ "value": "x" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -294,6 +303,9 @@ "value": "y" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json b/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json index 4cb7db16e5..47b4cd2024 100644 --- a/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json +++ b/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json @@ -103,6 +103,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -138,6 +141,9 @@ "value": "yo" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -187,6 +193,9 @@ "value": "oreo" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -234,6 +243,9 @@ "value": "q" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -281,6 +293,9 @@ "value": "z" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json b/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json index e1940b0cb1..1d87751a6e 100644 --- a/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json +++ b/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json @@ -149,6 +149,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -188,6 +191,9 @@ "value": "0.4" } }, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -237,6 +243,9 @@ "value": "oreo" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -284,6 +293,9 @@ "value": "q" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -331,6 +343,9 @@ "value": "z" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/expanded_map_style.exp.json b/testdata/d2oracle/TestSet/expanded_map_style.exp.json index 313881f23d..f94931f8eb 100644 --- a/testdata/d2oracle/TestSet/expanded_map_style.exp.json +++ b/testdata/d2oracle/TestSet/expanded_map_style.exp.json @@ -105,6 +105,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -158,6 +161,9 @@ "value": "0.2" } }, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/icon.exp.json b/testdata/d2oracle/TestSet/icon.exp.json index 512580e727..b8c17bf84d 100644 --- a/testdata/d2oracle/TestSet/icon.exp.json +++ b/testdata/d2oracle/TestSet/icon.exp.json @@ -80,6 +80,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -141,6 +144,9 @@ "Fragment": "", "RawFragment": "" }, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/inline_style.exp.json b/testdata/d2oracle/TestSet/inline_style.exp.json index 5bf597a345..a8a0603f5c 100644 --- a/testdata/d2oracle/TestSet/inline_style.exp.json +++ b/testdata/d2oracle/TestSet/inline_style.exp.json @@ -131,6 +131,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -187,6 +190,9 @@ "value": "red" } }, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/label.exp.json b/testdata/d2oracle/TestSet/label.exp.json index 1f5153d22a..8d1d173ffb 100644 --- a/testdata/d2oracle/TestSet/label.exp.json +++ b/testdata/d2oracle/TestSet/label.exp.json @@ -51,6 +51,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -100,6 +103,9 @@ "value": "Always try to do things in chronological order; it's less confusing that way." }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/label_primary.exp.json b/testdata/d2oracle/TestSet/label_primary.exp.json index 39dc2bf458..1957ba8caf 100644 --- a/testdata/d2oracle/TestSet/label_primary.exp.json +++ b/testdata/d2oracle/TestSet/label_primary.exp.json @@ -99,6 +99,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -134,6 +137,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -183,6 +189,9 @@ "value": "QOTD: \"It's been Monday all week today.\"" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -230,6 +239,9 @@ "value": "q" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -277,6 +289,9 @@ "value": "z" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/label_replace.exp.json b/testdata/d2oracle/TestSet/label_replace.exp.json index 52c0452b28..01db3f34d6 100644 --- a/testdata/d2oracle/TestSet/label_replace.exp.json +++ b/testdata/d2oracle/TestSet/label_replace.exp.json @@ -51,6 +51,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -100,6 +103,9 @@ "value": "Always try to do things in chronological order; it's less confusing that way." }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/label_unset.exp.json b/testdata/d2oracle/TestSet/label_unset.exp.json index 9a9cbe0d61..2e5501e7ed 100644 --- a/testdata/d2oracle/TestSet/label_unset.exp.json +++ b/testdata/d2oracle/TestSet/label_unset.exp.json @@ -41,6 +41,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -90,6 +93,9 @@ "value": "square" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/map_key_missing.exp.json b/testdata/d2oracle/TestSet/map_key_missing.exp.json index 86d7f6a1a7..ed8297ab43 100644 --- a/testdata/d2oracle/TestSet/map_key_missing.exp.json +++ b/testdata/d2oracle/TestSet/map_key_missing.exp.json @@ -97,6 +97,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -132,6 +135,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -201,6 +207,9 @@ "value": "Never offend people with style when you can offend them with substance." }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -248,6 +257,9 @@ "value": "b" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/nested_alex.exp.json b/testdata/d2oracle/TestSet/nested_alex.exp.json index 8b3ed2f811..440c4886ba 100644 --- a/testdata/d2oracle/TestSet/nested_alex.exp.json +++ b/testdata/d2oracle/TestSet/nested_alex.exp.json @@ -169,6 +169,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -204,6 +207,9 @@ "value": "asdf" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -253,6 +259,9 @@ "value": "do" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -300,6 +309,9 @@ "value": "test" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" @@ -367,6 +379,9 @@ "value": "How much of their influence on you is a result of your influence on them?\nA conference is a gathering of important people who singly can do nothing" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/new_style.exp.json b/testdata/d2oracle/TestSet/new_style.exp.json index acb2cadbad..493b9eb552 100644 --- a/testdata/d2oracle/TestSet/new_style.exp.json +++ b/testdata/d2oracle/TestSet/new_style.exp.json @@ -87,6 +87,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -140,6 +143,9 @@ "value": "0.2" } }, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/replace_shape.exp.json b/testdata/d2oracle/TestSet/replace_shape.exp.json index 76ff7277dd..48399cd6be 100644 --- a/testdata/d2oracle/TestSet/replace_shape.exp.json +++ b/testdata/d2oracle/TestSet/replace_shape.exp.json @@ -62,6 +62,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -122,6 +125,9 @@ "value": "square" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "circle" diff --git a/testdata/d2oracle/TestSet/replace_style.exp.json b/testdata/d2oracle/TestSet/replace_style.exp.json index 5c1ca8d605..fa73689915 100644 --- a/testdata/d2oracle/TestSet/replace_style.exp.json +++ b/testdata/d2oracle/TestSet/replace_style.exp.json @@ -69,6 +69,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -144,6 +147,9 @@ "value": "0.2" } }, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/replace_style_edgecase.exp.json b/testdata/d2oracle/TestSet/replace_style_edgecase.exp.json index 0b4762d816..c055d1cf88 100644 --- a/testdata/d2oracle/TestSet/replace_style_edgecase.exp.json +++ b/testdata/d2oracle/TestSet/replace_style_edgecase.exp.json @@ -124,6 +124,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -244,6 +247,9 @@ "value": "orange" } }, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/shape.exp.json b/testdata/d2oracle/TestSet/shape.exp.json index 52c35106fd..6f646b5fb8 100644 --- a/testdata/d2oracle/TestSet/shape.exp.json +++ b/testdata/d2oracle/TestSet/shape.exp.json @@ -80,6 +80,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -129,6 +132,9 @@ "value": "square" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "square" diff --git a/testdata/d2oracle/TestSet/shape_nested_style_set.exp.json b/testdata/d2oracle/TestSet/shape_nested_style_set.exp.json index d4db3fa521..98b27ae710 100644 --- a/testdata/d2oracle/TestSet/shape_nested_style_set.exp.json +++ b/testdata/d2oracle/TestSet/shape_nested_style_set.exp.json @@ -87,6 +87,9 @@ "value": "" }, "style": {}, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "" @@ -140,6 +143,9 @@ "value": "0.4" } }, + "link": { + "value": "" + }, "near_key": null, "shape": { "value": "rectangle" From 39e6f73b11fd56c2a4b15635a8966b02dcddb04f Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Sun, 5 Feb 2023 11:04:38 -0800 Subject: [PATCH 03/17] add failing test --- d2compiler/compile_test.go | 17 + .../TestCompile/link-board-mixed.exp.json | 788 ++++++++++++++++++ 2 files changed, 805 insertions(+) create mode 100644 testdata/d2compiler/TestCompile/link-board-mixed.exp.json diff --git a/d2compiler/compile_test.go b/d2compiler/compile_test.go index 50c1ef32e5..d642ef2cbc 100644 --- a/d2compiler/compile_test.go +++ b/d2compiler/compile_test.go @@ -1904,6 +1904,23 @@ Chinchillas_Collectibles.chinchilla -> Chinchillas.id`, text: `x.link: layers.x layers: { x +}`, + }, + { + name: "link-board-mixed", + text: `question: How does the cat go? +question.link: layers.cat + +layers: { + cat: { + the cat -> meeeowwww: goes + } +} + +scenarios: { + green: { + question.style.fill: green + } }`, }, { diff --git a/testdata/d2compiler/TestCompile/link-board-mixed.exp.json b/testdata/d2compiler/TestCompile/link-board-mixed.exp.json new file mode 100644 index 0000000000..2212669e9f --- /dev/null +++ b/testdata/d2compiler/TestCompile/link-board-mixed.exp.json @@ -0,0 +1,788 @@ +{ + "graph": { + "name": "", + "ast": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,0:0:0-11:1:137", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,0:0:0-0:30:30", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,0:0:0-0:8:8", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,0:0:0-0:8:8", + "value": [ + { + "string": "question", + "raw_string": "question" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "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?" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,1:15:46-1:25:56", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,1:0:31-1:13:44", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,1:0:31-1:8:39", + "value": [ + { + "string": "question", + "raw_string": "question" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,1:9:40-1:13:44", + "value": [ + { + "string": "link", + "raw_string": "link" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,1:15:46-1:25:56", + "value": [ + { + "string": "layers.cat", + "raw_string": "layers.cat" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,3:0:58-7:1:113", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,3:0:58-3:6:64", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,3:0:58-3:6:64", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,3:8:66-7:0:112", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,4:2:70-6:3:111", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,4:2:70-4:5:73", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,4:2:70-4:5:73", + "value": [ + { + "string": "cat", + "raw_string": "cat" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,4:7:75-6:2:110", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:4:81-5:30:107", + "edges": [ + { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:4:81-5:24:101", + "src": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:4:81-5:12:89", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:4:81-5:11:88", + "value": [ + { + "string": "the cat", + "raw_string": "the cat" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:14:91-5:24:101", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:15:92-5:24:101", + "value": [ + { + "string": "meeeowwww", + "raw_string": "meeeowwww" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:26:103-5:30:107", + "value": [ + { + "string": "goes", + "raw_string": "goes" + } + ] + } + } + } + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,9:0:115-11:1:137", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,9:0:115-9:9:124", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,9:0:115-9:9:124", + "value": [ + { + "string": "scenarios", + "raw_string": "scenarios" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,9:11:126-11:0:136", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,10:2:130-10:7:135", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,10:2:130-10:7:135", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,10:2:130-10:7:135", + "value": [ + { + "string": "green", + "raw_string": "green" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + ] + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "label_dimensions": { + "width": 0, + "height": 0 + }, + "attributes": { + "label": { + "value": "" + }, + "style": {}, + "link": { + "value": "" + }, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": { + "value": "" + } + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "question", + "id_val": "question", + "label_dimensions": { + "width": 0, + "height": 0 + }, + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,0:0:0-0:8:8", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,0:0:0-0:8:8", + "value": [ + { + "string": "question", + "raw_string": "question" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,1:0:31-1:13:44", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,1:0:31-1:8:39", + "value": [ + { + "string": "question", + "raw_string": "question" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,1:9:40-1:13:44", + "value": [ + { + "string": "link", + "raw_string": "link" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "How does the cat go?" + }, + "style": {}, + "link": { + "value": "layers.cat" + }, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": { + "value": "" + } + }, + "zIndex": 0 + } + ], + "layers": [ + { + "name": "cat", + "ast": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,0:0:0-11:1:137", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,0:0:0-0:30:30", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,0:0:0-0:8:8", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,0:0:0-0:8:8", + "value": [ + { + "string": "question", + "raw_string": "question" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "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?" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,1:15:46-1:25:56", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,1:0:31-1:13:44", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,1:0:31-1:8:39", + "value": [ + { + "string": "question", + "raw_string": "question" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,1:9:40-1:13:44", + "value": [ + { + "string": "link", + "raw_string": "link" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,1:15:46-1:25:56", + "value": [ + { + "string": "layers.cat", + "raw_string": "layers.cat" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,3:0:58-7:1:113", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,3:0:58-3:6:64", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,3:0:58-3:6:64", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,3:8:66-7:0:112", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,4:2:70-6:3:111", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,4:2:70-4:5:73", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,4:2:70-4:5:73", + "value": [ + { + "string": "cat", + "raw_string": "cat" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,4:7:75-6:2:110", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:4:81-5:30:107", + "edges": [ + { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:4:81-5:24:101", + "src": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:4:81-5:12:89", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:4:81-5:11:88", + "value": [ + { + "string": "the cat", + "raw_string": "the cat" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:14:91-5:24:101", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:15:92-5:24:101", + "value": [ + { + "string": "meeeowwww", + "raw_string": "meeeowwww" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:26:103-5:30:107", + "value": [ + { + "string": "goes", + "raw_string": "goes" + } + ] + } + } + } + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,9:0:115-11:1:137", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,9:0:115-9:9:124", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,9:0:115-9:9:124", + "value": [ + { + "string": "scenarios", + "raw_string": "scenarios" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,9:11:126-11:0:136", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,10:2:130-10:7:135", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,10:2:130-10:7:135", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,10:2:130-10:7:135", + "value": [ + { + "string": "green", + "raw_string": "green" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + ] + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "label_dimensions": { + "width": 0, + "height": 0 + }, + "attributes": { + "label": { + "value": "" + }, + "style": {}, + "link": { + "value": "" + }, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": { + "value": "" + } + }, + "zIndex": 0 + }, + "edges": [ + { + "index": 0, + "minWidth": 0, + "minHeight": 0, + "label_dimensions": { + "width": 0, + "height": 0 + }, + "isCurve": false, + "src_arrow": false, + "dst_arrow": true, + "references": [ + { + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "goes" + }, + "style": {}, + "link": { + "value": "" + }, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": { + "value": "" + } + }, + "zIndex": 0 + } + ], + "objects": [ + { + "id": "the cat", + "id_val": "the cat", + "label_dimensions": { + "width": 0, + "height": 0 + }, + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:4:81-5:12:89", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:4:81-5:11:88", + "value": [ + { + "string": "the cat", + "raw_string": "the cat" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "the cat" + }, + "style": {}, + "link": { + "value": "" + }, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": { + "value": "" + } + }, + "zIndex": 0 + }, + { + "id": "meeeowwww", + "id_val": "meeeowwww", + "label_dimensions": { + "width": 0, + "height": 0 + }, + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:14:91-5:24:101", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:15:92-5:24:101", + "value": [ + { + "string": "meeeowwww", + "raw_string": "meeeowwww" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "meeeowwww" + }, + "style": {}, + "link": { + "value": "" + }, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": { + "value": "" + } + }, + "zIndex": 0 + } + ] + } + ] + }, + "err": null +} From f5e911478639587112b2ba0747f6b67f859842bd Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Tue, 28 Feb 2023 14:30:25 -0800 Subject: [PATCH 04/17] fix --- d2compiler/compile.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/d2compiler/compile.go b/d2compiler/compile.go index 4d83c5cf9c..157500317e 100644 --- a/d2compiler/compile.go +++ b/d2compiler/compile.go @@ -71,7 +71,6 @@ func (c *compiler) compileBoard(g *d2graph.Graph, ir *d2ir.Map) *d2graph.Graph { c.compileBoardsField(g, ir, "layers") c.compileBoardsField(g, ir, "scenarios") c.compileBoardsField(g, ir, "steps") - if d2ir.ParentMap(ir).CopyBase(nil).Equal(ir.CopyBase(nil)) { if len(g.Layers) > 0 || len(g.Scenarios) > 0 || len(g.Steps) > 0 { g.IsFolderOnly = true @@ -719,7 +718,7 @@ func (c *compiler) validateNear(g *d2graph.Graph) { func (c *compiler) validateBoardLink(g *d2graph.Graph, ir *d2ir.Map) { for _, obj := range g.Objects { - if obj.Attributes.Link.Value == "" { + if obj.Attributes.Link == nil { continue } From d007471d89e5fa71c29f3c0ba83d8aab333f05f8 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Tue, 28 Feb 2023 14:31:18 -0800 Subject: [PATCH 05/17] tests --- .../TestCompile/basic_icon.exp.json | 6 - .../TestCompile/basic_sequence.exp.json | 6 - .../TestCompile/basic_shape.exp.json | 6 - .../TestCompile/basic_style.exp.json | 6 - .../TestCompile/class_paren.exp.json | 6 - .../TestCompile/class_style.exp.json | 6 - .../TestCompile/constraint_label.exp.json | 6 - .../TestCompile/default_direction.exp.json | 6 - .../TestCompile/dimension_with_style.exp.json | 6 - .../dimensions_on_nonimage.exp.json | 6 - testdata/d2compiler/TestCompile/edge.exp.json | 12 - .../edge_arrowhead_fields.exp.json | 18 - .../TestCompile/edge_chain.exp.json | 18 - .../TestCompile/edge_chain_map.exp.json | 18 - .../TestCompile/edge_column_index.exp.json | 12 - .../TestCompile/edge_exclusive_style.exp.json | 12 - .../TestCompile/edge_flat_arrowhead.exp.json | 15 - .../edge_flat_label_arrowhead.exp.json | 15 - .../TestCompile/edge_in_column.exp.json | 777 ------------------ .../TestCompile/edge_index.exp.json | 12 - .../TestCompile/edge_index_map.exp.json | 12 - .../TestCompile/edge_index_nested.exp.json | 15 - .../edge_index_nested_cross_scope.exp.json | 15 - .../edge_key_group_flat_nested.exp.json | 15 - ..._key_group_flat_nested_underscore.exp.json | 15 - ..._group_map_flat_nested_underscore.exp.json | 15 - ...e_key_group_map_nested_underscore.exp.json | 15 - .../TestCompile/edge_label_map.exp.json | 12 - .../d2compiler/TestCompile/edge_map.exp.json | 12 - .../TestCompile/edge_map_arrowhead.exp.json | 15 - .../TestCompile/edge_map_group_flat.exp.json | 12 - .../edge_map_group_semiflat.exp.json | 12 - .../TestCompile/edge_map_nested.exp.json | 12 - .../TestCompile/edge_map_nested_flat.exp.json | 12 - .../TestCompile/edge_mixed_arrowhead.exp.json | 18 - .../edge_non_shape_arrowhead.exp.json | 15 - .../edge_semiflat_arrowhead.exp.json | 15 - .../TestCompile/escaped_id.exp.json | 6 - .../TestCompile/image_style.exp.json | 6 - .../TestCompile/link-board-nested.exp.json | 12 +- .../TestCompile/link-board-ok.exp.json | 6 +- .../TestCompile/near_constant.exp.json | 6 - .../TestCompile/nested_sql.exp.json | 9 - testdata/d2compiler/TestCompile/null.exp.json | 6 - .../d2compiler/TestCompile/path_link.exp.json | 5 +- .../reserved_icon_near_style.exp.json | 9 - .../TestCompile/root_direction.exp.json | 3 - .../TestCompile/root_sequence.exp.json | 3 - .../TestCompile/self-referencing.exp.json | 9 - .../TestCompile/sequence_container.exp.json | 30 - .../TestCompile/sequence_container_2.exp.json | 30 - .../sequence_grouped_note.exp.json | 15 - .../TestCompile/sequence_scoping.exp.json | 33 - .../TestCompile/set_direction.exp.json | 6 - .../single_dimension_on_circle.exp.json | 6 - .../TestCompile/sql-regression.exp.json | 12 - .../d2compiler/TestCompile/sql_paren.exp.json | 6 - .../TestCompile/stroke-width.exp.json | 6 - .../table_connection_attr.exp.json | 12 - .../TestCompile/table_style.exp.json | 6 - .../TestCompile/table_style_map.exp.json | 6 - .../TestCompile/underscore_edge.exp.json | 12 - .../underscore_edge_chain.exp.json | 18 - .../underscore_edge_existing.exp.json | 18 - .../underscore_edge_index.exp.json | 15 - .../underscore_edge_nested.exp.json | 15 - .../underscore_parent_create.exp.json | 9 - .../underscore_parent_not_root.exp.json | 12 - .../underscore_parent_preference_1.exp.json | 9 - .../underscore_parent_preference_2.exp.json | 9 - .../underscore_parent_squared.exp.json | 12 - .../underscore_unresolved_obj.exp.json | 9 - .../TestCompile/unescaped_id_cr.exp.json | 6 - .../d2compiler/TestCompile/url_link.exp.json | 5 +- .../TestCompile/wrong_column_index.exp.json | 12 - .../TestCompile2/boards/recursive.exp.json | 30 - .../TestCompile2/boards/root.exp.json | 18 - testdata/d2oracle/TestCreate/base.exp.json | 6 - .../d2oracle/TestCreate/container.exp.json | 9 - .../TestCreate/container_edge.exp.json | 15 - .../TestCreate/container_edge_label.exp.json | 15 - testdata/d2oracle/TestCreate/edge.exp.json | 12 - .../d2oracle/TestCreate/edge_nested.exp.json | 15 - .../d2oracle/TestCreate/edge_scope.exp.json | 15 - .../TestCreate/edge_scope_flat.exp.json | 15 - .../TestCreate/edge_scope_nested.exp.json | 18 - .../d2oracle/TestCreate/edge_unique.exp.json | 30 - testdata/d2oracle/TestCreate/gen_key.exp.json | 9 - .../d2oracle/TestCreate/gen_key_n.exp.json | 45 - .../TestCreate/gen_key_nested.exp.json | 18 - .../TestCreate/gen_key_scope.exp.json | 18 - .../TestCreate/gen_key_suffix.exp.json | 9 - .../TestCreate/make_scope_multiline.exp.json | 9 - .../make_scope_multiline_spacing_1.exp.json | 15 - .../make_scope_multiline_spacing_2.exp.json | 15 - testdata/d2oracle/TestCreate/nested.exp.json | 12 - testdata/d2oracle/TestCreate/scope.exp.json | 15 - .../TestDelete/breakup_arrowhead.exp.json | 6 - .../d2oracle/TestDelete/children.exp.json | 15 - .../TestDelete/children_conflicts.exp.json | 9 - .../children_edge_conflicts.exp.json | 15 - .../children_edges_flat_conflicts.exp.json | 24 - .../children_flat_conflicts.exp.json | 9 - .../children_multiple_conflicts.exp.json | 18 - .../children_nested_conflicts.exp.json | 12 - ...ldren_nested_referenced_conflicts.exp.json | 12 - .../children_no_self_conflict.exp.json | 6 - .../TestDelete/children_order.exp.json | 15 - .../children_referenced_conflicts.exp.json | 9 - .../TestDelete/children_scope.exp.json | 21 - .../TestDelete/container_near.exp.json | 12 - .../d2oracle/TestDelete/delete_icon.exp.json | 8 +- .../d2oracle/TestDelete/delete_link.exp.json | 6 - .../d2oracle/TestDelete/delete_near.exp.json | 9 - .../delete_needed_flat_near.exp.json | 9 - .../delete_redundant_flat_near.exp.json | 9 - .../TestDelete/delete_tooltip.exp.json | 6 - .../edge_both_identical_childs.exp.json | 18 - .../d2oracle/TestDelete/edge_common.exp.json | 12 - .../TestDelete/edge_common_2.exp.json | 12 - .../TestDelete/edge_common_3.exp.json | 12 - .../TestDelete/edge_common_4.exp.json | 12 - .../TestDelete/edge_conflict.exp.json | 18 - .../TestDelete/edge_decrement.exp.json | 21 - .../d2oracle/TestDelete/edge_first.exp.json | 30 - .../TestDelete/edge_flat_style.exp.json | 6 - .../TestDelete/edge_identical_child.exp.json | 21 - .../TestDelete/edge_key_style.exp.json | 12 - .../d2oracle/TestDelete/edge_last.exp.json | 36 - .../TestDelete/edge_map_style.exp.json | 12 - .../d2oracle/TestDelete/edge_middle.exp.json | 36 - .../d2oracle/TestDelete/empty_map.exp.json | 9 - testdata/d2oracle/TestDelete/flat.exp.json | 3 - .../TestDelete/flat_reserved.exp.json | 12 - .../TestDelete/hoist_children.exp.json | 9 - .../TestDelete/hoist_edge_children.exp.json | 15 - .../TestDelete/key_with_edges.exp.json | 12 - .../TestDelete/key_with_edges_2.exp.json | 9 - .../TestDelete/key_with_edges_3.exp.json | 9 - .../TestDelete/key_with_edges_4.exp.json | 12 - .../d2oracle/TestDelete/multi_near.exp.json | 15 - .../multi_path_map_conflict.exp.json | 12 - .../multi_path_map_no_conflict.exp.json | 12 - .../multiple_flat_middle_container.exp.json | 12 - .../TestDelete/multiple_flat_style.exp.json | 6 - .../TestDelete/multiple_map_styles.exp.json | 6 - testdata/d2oracle/TestDelete/near.exp.json | 6 - testdata/d2oracle/TestDelete/nested.exp.json | 12 - .../d2oracle/TestDelete/nested_2.exp.json | 12 - .../TestDelete/nested_edge_key_style.exp.json | 15 - .../TestDelete/nested_flat_style.exp.json | 6 - .../TestDelete/nested_reserved.exp.json | 12 - .../nested_underscore_update.exp.json | 9 - .../d2oracle/TestDelete/node_in_edge.exp.json | 27 - .../TestDelete/node_in_edge_last.exp.json | 33 - .../only_delete_edge_reserved.exp.json | 12 - .../only_delete_obj_reserved.exp.json | 12 - testdata/d2oracle/TestDelete/order_1.exp.json | 15 - testdata/d2oracle/TestDelete/order_2.exp.json | 9 - testdata/d2oracle/TestDelete/order_3.exp.json | 9 - testdata/d2oracle/TestDelete/order_4.exp.json | 6 - testdata/d2oracle/TestDelete/order_5.exp.json | 24 - testdata/d2oracle/TestDelete/order_6.exp.json | 15 - testdata/d2oracle/TestDelete/order_7.exp.json | 18 - testdata/d2oracle/TestDelete/order_8.exp.json | 18 - .../d2oracle/TestDelete/shape_class.exp.json | 6 - .../TestDelete/shape_sql_table.exp.json | 15 - .../TestDelete/singular_flat_style.exp.json | 6 - .../TestDelete/singular_map_style.exp.json | 6 - .../underscore_no_conflict.exp.json | 12 - .../TestDelete/underscore_remove.exp.json | 24 - .../TestMove/append_multiple_styles.exp.json | 9 - testdata/d2oracle/TestMove/basic.exp.json | 6 - .../d2oracle/TestMove/basic_nested.exp.json | 9 - .../TestMove/basic_out_of_container.exp.json | 9 - .../TestMove/between_containers.exp.json | 12 - .../TestMove/chain_connected_nested.exp.json | 18 - ..._connected_nested_no_extra_create.exp.json | 21 - .../TestMove/connected_nested.exp.json | 15 - .../d2oracle/TestMove/container_near.exp.json | 21 - .../TestMove/edge_across_containers.exp.json | 18 - .../d2oracle/TestMove/edge_basic.exp.json | 12 - .../TestMove/edge_chain_basic.exp.json | 18 - .../TestMove/edge_chain_circular.exp.json | 18 - .../edge_chain_into_container.exp.json | 21 - .../edge_chain_out_container.exp.json | 21 - .../d2oracle/TestMove/edge_conflict.exp.json | 21 - .../TestMove/edge_into_container.exp.json | 18 - .../TestMove/edge_nested_basic.exp.json | 15 - .../TestMove/edge_out_of_container.exp.json | 15 - .../d2oracle/TestMove/extend_map.exp.json | 15 - .../TestMove/extend_stationary_path.exp.json | 12 - .../TestMove/flat_between_containers.exp.json | 12 - .../d2oracle/TestMove/flat_merge.exp.json | 15 - .../TestMove/flat_middle_container.exp.json | 15 - .../TestMove/flat_nested_merge.exp.json | 33 - .../flat_nested_merge_multiple_refs.exp.json | 27 - .../flat_reparent_with_map_value.exp.json | 9 - ...lat_reparent_with_mixed_map_value.exp.json | 12 - .../flat_reparent_with_value.exp.json | 9 - .../d2oracle/TestMove/flat_style.exp.json | 9 - .../TestMove/full_edge_slice.exp.json | 21 - .../d2oracle/TestMove/full_slice.exp.json | 12 - testdata/d2oracle/TestMove/gnarly_1.exp.json | 48 -- .../hoist_container_children.exp.json | 15 - .../into_container_existing_map.exp.json | 12 - .../into_container_nonexisting_map.exp.json | 9 - .../into_container_with_flat_keys.exp.json | 9 - .../into_container_with_flat_style.exp.json | 9 - .../d2oracle/TestMove/map_transplant.exp.json | 15 - .../d2oracle/TestMove/map_with_label.exp.json | 12 - .../TestMove/merge_nested_maps.exp.json | 27 - .../d2oracle/TestMove/merge_reserved.exp.json | 21 - .../TestMove/middle_container.exp.json | 12 - .../TestMove/move_container_children.exp.json | 18 - .../move_container_conflict_children.exp.json | 18 - .../move_into_key_with_value.exp.json | 9 - .../TestMove/move_out_of_edge.exp.json | 24 - .../TestMove/move_out_of_nested_edge.exp.json | 24 - .../TestMove/multiple_nesting_levels.exp.json | 24 - testdata/d2oracle/TestMove/near.exp.json | 9 - .../d2oracle/TestMove/nhooyr_one.exp.json | 15 - .../d2oracle/TestMove/nhooyr_two.exp.json | 24 - .../d2oracle/TestMove/parentheses.exp.json | 15 - .../TestMove/partial_edge_slice.exp.json | 15 - .../d2oracle/TestMove/partial_slice.exp.json | 9 - testdata/d2oracle/TestMove/rename_2.exp.json | 18 - testdata/d2oracle/TestMove/reuse_map.exp.json | 18 - .../d2oracle/TestMove/slice_style.exp.json | 9 - .../TestMove/underscore_children.exp.json | 9 - .../underscore_edge_children.exp.json | 15 - .../underscore_edge_container_1.exp.json | 15 - .../underscore_edge_container_2.exp.json | 15 - .../underscore_edge_container_3.exp.json | 15 - .../underscore_edge_container_4.exp.json | 15 - .../underscore_edge_container_5.exp.json | 15 - .../TestMove/underscore_edge_split.exp.json | 21 - .../TestMove/underscore_merge.exp.json | 12 - .../TestMove/underscore_split.exp.json | 15 - .../TestMove/underscore_split_out.exp.json | 18 - .../TestMove/underscore_transplant.exp.json | 12 - .../d2oracle/TestMove/unique_name.exp.json | 15 - .../unique_name_with_references.exp.json | 21 - testdata/d2oracle/TestRename/arrows.exp.json | 12 - .../d2oracle/TestRename/arrows_chain.exp.json | 24 - .../TestRename/arrows_complex.exp.json | 18 - .../TestRename/arrows_trim_common.exp.json | 27 - .../TestRename/arrows_trim_common_2.exp.json | 27 - .../TestRename/complex_edge_1.exp.json | 18 - .../TestRename/complex_edge_2.exp.json | 18 - .../d2oracle/TestRename/conflict.exp.json | 9 - .../d2oracle/TestRename/conflict_2.exp.json | 18 - .../TestRename/conflict_with_dots.exp.json | 9 - .../d2oracle/TestRename/container.exp.json | 72 -- testdata/d2oracle/TestRename/edges.exp.json | 45 - testdata/d2oracle/TestRename/flat.exp.json | 6 - .../d2oracle/TestRename/generated.exp.json | 6 - testdata/d2oracle/TestRename/near.exp.json | 9 - testdata/d2oracle/TestRename/nested.exp.json | 18 - testdata/d2oracle/TestSet/base.exp.json | 6 - .../TestSet/block_string_multiline.exp.json | 6 - .../TestSet/block_string_oneline.exp.json | 6 - testdata/d2oracle/TestSet/edge.exp.json | 12 - .../TestSet/edge_append_style.exp.json | 12 - testdata/d2oracle/TestSet/edge_chain.exp.json | 21 - .../TestSet/edge_chain_append_style.exp.json | 18 - .../edge_chain_existing_style.exp.json | 18 - .../TestSet/edge_chain_nested_set.exp.json | 21 - .../d2oracle/TestSet/edge_index_case.exp.json | 27 - .../TestSet/edge_index_nested.exp.json | 15 - .../TestSet/edge_key_and_key.exp.json | 15 - testdata/d2oracle/TestSet/edge_label.exp.json | 12 - .../TestSet/edge_merge_style.exp.json | 12 - .../TestSet/edge_nested_label_set.exp.json | 15 - .../TestSet/edge_nested_style_set.exp.json | 15 - .../TestSet/expanded_map_style.exp.json | 6 - testdata/d2oracle/TestSet/icon.exp.json | 6 - .../d2oracle/TestSet/inline_style.exp.json | 6 - testdata/d2oracle/TestSet/label.exp.json | 6 - .../d2oracle/TestSet/label_primary.exp.json | 15 - .../d2oracle/TestSet/label_replace.exp.json | 6 - .../d2oracle/TestSet/label_unset.exp.json | 6 - .../d2oracle/TestSet/map_key_missing.exp.json | 12 - .../d2oracle/TestSet/nested_alex.exp.json | 15 - testdata/d2oracle/TestSet/new_style.exp.json | 6 - .../d2oracle/TestSet/replace_shape.exp.json | 6 - .../d2oracle/TestSet/replace_style.exp.json | 6 - .../TestSet/replace_style_edgecase.exp.json | 6 - testdata/d2oracle/TestSet/shape.exp.json | 6 - .../TestSet/shape_nested_style_set.exp.json | 6 - 290 files changed, 9 insertions(+), 4779 deletions(-) diff --git a/testdata/d2compiler/TestCompile/basic_icon.exp.json b/testdata/d2compiler/TestCompile/basic_icon.exp.json index 448df439b3..7a8cdb0486 100644 --- a/testdata/d2compiler/TestCompile/basic_icon.exp.json +++ b/testdata/d2compiler/TestCompile/basic_icon.exp.json @@ -86,9 +86,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -150,9 +147,6 @@ "Fragment": "", "RawFragment": "" }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/basic_sequence.exp.json b/testdata/d2compiler/TestCompile/basic_sequence.exp.json index 9ecebd2e68..676d6ae9b2 100644 --- a/testdata/d2compiler/TestCompile/basic_sequence.exp.json +++ b/testdata/d2compiler/TestCompile/basic_sequence.exp.json @@ -81,9 +81,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -133,9 +130,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "sequence_diagram" diff --git a/testdata/d2compiler/TestCompile/basic_shape.exp.json b/testdata/d2compiler/TestCompile/basic_shape.exp.json index af71e80da4..794e3ba97e 100644 --- a/testdata/d2compiler/TestCompile/basic_shape.exp.json +++ b/testdata/d2compiler/TestCompile/basic_shape.exp.json @@ -81,9 +81,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -133,9 +130,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "circle" diff --git a/testdata/d2compiler/TestCompile/basic_style.exp.json b/testdata/d2compiler/TestCompile/basic_style.exp.json index ae15a5a11b..0db1b4c66e 100644 --- a/testdata/d2compiler/TestCompile/basic_style.exp.json +++ b/testdata/d2compiler/TestCompile/basic_style.exp.json @@ -88,9 +88,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -144,9 +141,6 @@ "value": "0.4" } }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/class_paren.exp.json b/testdata/d2compiler/TestCompile/class_paren.exp.json index 3b04c57b4d..450f61d620 100644 --- a/testdata/d2compiler/TestCompile/class_paren.exp.json +++ b/testdata/d2compiler/TestCompile/class_paren.exp.json @@ -180,9 +180,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -253,9 +250,6 @@ "value": "shape" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "class" diff --git a/testdata/d2compiler/TestCompile/class_style.exp.json b/testdata/d2compiler/TestCompile/class_style.exp.json index 327ab6b1fa..c8a11220a5 100644 --- a/testdata/d2compiler/TestCompile/class_style.exp.json +++ b/testdata/d2compiler/TestCompile/class_style.exp.json @@ -154,9 +154,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -220,9 +217,6 @@ "value": "0.4" } }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "class" diff --git a/testdata/d2compiler/TestCompile/constraint_label.exp.json b/testdata/d2compiler/TestCompile/constraint_label.exp.json index 14c1559bc3..79e7fd2830 100644 --- a/testdata/d2compiler/TestCompile/constraint_label.exp.json +++ b/testdata/d2compiler/TestCompile/constraint_label.exp.json @@ -114,9 +114,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -166,9 +163,6 @@ "value": "bar" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/default_direction.exp.json b/testdata/d2compiler/TestCompile/default_direction.exp.json index af045b0076..fa0120ac58 100644 --- a/testdata/d2compiler/TestCompile/default_direction.exp.json +++ b/testdata/d2compiler/TestCompile/default_direction.exp.json @@ -42,9 +42,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -94,9 +91,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/dimension_with_style.exp.json b/testdata/d2compiler/TestCompile/dimension_with_style.exp.json index c0d4d18fdb..391a94b8bf 100644 --- a/testdata/d2compiler/TestCompile/dimension_with_style.exp.json +++ b/testdata/d2compiler/TestCompile/dimension_with_style.exp.json @@ -116,9 +116,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -172,9 +169,6 @@ "value": "true" } }, - "link": { - "value": "" - }, "width": { "value": "200" }, diff --git a/testdata/d2compiler/TestCompile/dimensions_on_nonimage.exp.json b/testdata/d2compiler/TestCompile/dimensions_on_nonimage.exp.json index 87d8a8ff4d..028a12b834 100644 --- a/testdata/d2compiler/TestCompile/dimensions_on_nonimage.exp.json +++ b/testdata/d2compiler/TestCompile/dimensions_on_nonimage.exp.json @@ -144,9 +144,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -196,9 +193,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "width": { "value": "200" }, diff --git a/testdata/d2compiler/TestCompile/edge.exp.json b/testdata/d2compiler/TestCompile/edge.exp.json index 41086f63fd..87005d17f3 100644 --- a/testdata/d2compiler/TestCompile/edge.exp.json +++ b/testdata/d2compiler/TestCompile/edge.exp.json @@ -65,9 +65,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -103,9 +100,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -155,9 +149,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -205,9 +196,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json b/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json index 495ac7cd21..b30abffa36 100644 --- a/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json +++ b/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json @@ -244,9 +244,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -276,9 +273,6 @@ "value": "Reisner's Rule of Conceptual Inertia" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "diamond" @@ -300,9 +294,6 @@ "value": "true" } }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -324,9 +315,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -376,9 +364,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -426,9 +411,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_chain.exp.json b/testdata/d2compiler/TestCompile/edge_chain.exp.json index 607d5801d4..93f38391ba 100644 --- a/testdata/d2compiler/TestCompile/edge_chain.exp.json +++ b/testdata/d2compiler/TestCompile/edge_chain.exp.json @@ -112,9 +112,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -150,9 +147,6 @@ "value": "The kids will love our inflatable slides" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -187,9 +181,6 @@ "value": "The kids will love our inflatable slides" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -239,9 +230,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -309,9 +297,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -359,9 +344,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_chain_map.exp.json b/testdata/d2compiler/TestCompile/edge_chain_map.exp.json index d1f436dd46..d9f3b76488 100644 --- a/testdata/d2compiler/TestCompile/edge_chain_map.exp.json +++ b/testdata/d2compiler/TestCompile/edge_chain_map.exp.json @@ -141,9 +141,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -179,9 +176,6 @@ "value": "Space: the final frontier. These are the voyages of the starship Enterprise." }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -216,9 +210,6 @@ "value": "Space: the final frontier. These are the voyages of the starship Enterprise." }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -268,9 +259,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -338,9 +326,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -388,9 +373,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_column_index.exp.json b/testdata/d2compiler/TestCompile/edge_column_index.exp.json index c6645463d6..2af478ac89 100644 --- a/testdata/d2compiler/TestCompile/edge_column_index.exp.json +++ b/testdata/d2compiler/TestCompile/edge_column_index.exp.json @@ -343,9 +343,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -383,9 +380,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -526,9 +520,6 @@ "value": "src" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "sql_table" @@ -667,9 +658,6 @@ "value": "dst" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "sql_table" diff --git a/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json b/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json index de31547fa9..829b33077a 100644 --- a/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json +++ b/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json @@ -110,9 +110,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -152,9 +149,6 @@ "value": "true" } }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -204,9 +198,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -254,9 +245,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json index ea736f843e..72fe990875 100644 --- a/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json @@ -153,9 +153,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -185,9 +182,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "diamond" @@ -213,9 +207,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -285,9 +276,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -355,9 +343,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json index 02965c6de8..40c0516d08 100644 --- a/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json @@ -121,9 +121,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -153,9 +150,6 @@ "value": "yo" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -178,9 +172,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -230,9 +221,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -280,9 +268,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_in_column.exp.json b/testdata/d2compiler/TestCompile/edge_in_column.exp.json index b13a69ba1d..4a390573c1 100644 --- a/testdata/d2compiler/TestCompile/edge_in_column.exp.json +++ b/testdata/d2compiler/TestCompile/edge_in_column.exp.json @@ -1,792 +1,15 @@ { -<<<<<<< HEAD - "graph": { - "name": "", - "ast": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,0:0:0-3:1:39", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,0:0:0-3:1:39", - "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,0:3:3-3:0:38", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,1:2:7-1:18:23", - "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,1:2:7-1:7:12", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,1:2:7-1:7:12", - "value": [ - { - "string": "shape", - "raw_string": "shape" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,1:9:14-1:18:23", - "value": [ - { - "string": "sql_table", - "raw_string": "sql_table" - } - ] - } - } - } - }, - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,2:2:26-2:13:37", - "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,2:2:26-2:3:27", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,2:2:26-2:3:27", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,2:5:29-2:12:36", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,2:6:30-2:12:36", - "edges": [ - { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,2:6:30-2:12:36", - "src": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,2:6:30-2:8:32", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,2:6:30-2:7:31", - "value": [ - { - "string": "p", - "raw_string": "p" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,2:10:34-2:12:36", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,2:11:35-2:12:36", - "value": [ - { - "string": "q", - "raw_string": "q" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } - ] - } - } - } - } - ] - } - } - } - } - ] - }, - "root": { - "id": "", - "id_val": "", - "label_dimensions": { - "width": 0, - "height": 0 - }, - "attributes": { - "label": { - "value": "" - }, - "style": {}, - "link": { - "value": "" - }, - "near_key": null, - "shape": { - "value": "" - }, - "direction": { - "value": "" - }, - "constraint": { - "value": "" - } - }, - "zIndex": 0 - }, - "edges": [ -||||||| 0da4e150 - "graph": { - "name": "", - "ast": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,0:0:0-3:1:39", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,0:0:0-3:1:39", - "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,0:3:3-3:0:38", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,1:2:7-1:18:23", - "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,1:2:7-1:7:12", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,1:2:7-1:7:12", - "value": [ - { - "string": "shape", - "raw_string": "shape" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,1:9:14-1:18:23", - "value": [ - { - "string": "sql_table", - "raw_string": "sql_table" - } - ] - } - } - } - }, - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,2:2:26-2:13:37", - "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,2:2:26-2:3:27", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,2:2:26-2:3:27", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,2:5:29-2:12:36", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,2:6:30-2:12:36", - "edges": [ - { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,2:6:30-2:12:36", - "src": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,2:6:30-2:8:32", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,2:6:30-2:7:31", - "value": [ - { - "string": "p", - "raw_string": "p" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,2:10:34-2:12:36", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,2:11:35-2:12:36", - "value": [ - { - "string": "q", - "raw_string": "q" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "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": [ -======= "graph": null, "err": { "ioerr": null, "errs": [ ->>>>>>> master - { -<<<<<<< HEAD - "index": 0, - "minWidth": 0, - "minHeight": 0, - "label_dimensions": { - "width": 0, - "height": 0 - }, - "isCurve": false, - "src_arrow": false, - "dst_arrow": true, - "references": [ - { - "map_key_edge_index": 0 - } - ], - "attributes": { - "label": { - "value": "" - }, - "style": {}, - "link": { - "value": "" - }, - "near_key": null, - "shape": { - "value": "" - }, - "direction": { - "value": "" - }, - "constraint": { - "value": "" - } - }, - "zIndex": 0 - } - ], - "objects": [ { - "id": "x", - "id_val": "x", - "label_dimensions": { - "width": 0, - "height": 0 - }, - "references": [ - { - "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "key_path_index": 0, - "map_key_edge_index": -1 - } - ], - "sql_table": { - "columns": [ - { - "name": { - "label": "x", - "fontSize": 0, - "fontFamily": "", - "language": "", - "color": "", - "italic": false, - "bold": false, - "underline": false, - "labelWidth": 0, - "labelHeight": 0 - }, - "type": { - "label": "", - "fontSize": 0, - "fontFamily": "", - "language": "", - "color": "", - "italic": false, - "bold": false, - "underline": false, - "labelWidth": 0, - "labelHeight": 0 - }, - "constraint": "", - "reference": "" - } - ] - }, - "attributes": { - "label": { - "value": "x" - }, - "style": {}, - "link": { - "value": "" - }, - "near_key": null, - "shape": { - "value": "sql_table" - }, - "direction": { - "value": "" - }, - "constraint": { - "value": "" - } - }, - "zIndex": 0 -||||||| 0da4e150 - "index": 0, - "minWidth": 0, - "minHeight": 0, - "label_dimensions": { - "width": 0, - "height": 0 - }, - "isCurve": false, - "src_arrow": false, - "dst_arrow": true, - "references": [ - { - "map_key_edge_index": 0 - } - ], - "attributes": { - "label": { - "value": "" - }, - "style": {}, - "near_key": null, - "shape": { - "value": "" - }, - "direction": { - "value": "" - }, - "constraint": { - "value": "" - } - }, - "zIndex": 0 - } - ], - "objects": [ - { - "id": "x", - "id_val": "x", - "label_dimensions": { - "width": 0, - "height": 0 - }, - "references": [ - { - "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "key_path_index": 0, - "map_key_edge_index": -1 - } - ], - "sql_table": { - "columns": [ - { - "name": { - "label": "x", - "fontSize": 0, - "fontFamily": "", - "language": "", - "color": "", - "italic": false, - "bold": false, - "underline": false, - "labelWidth": 0, - "labelHeight": 0 - }, - "type": { - "label": "", - "fontSize": 0, - "fontFamily": "", - "language": "", - "color": "", - "italic": false, - "bold": false, - "underline": false, - "labelWidth": 0, - "labelHeight": 0 - }, - "constraint": "", - "reference": "" - } - ] - }, - "attributes": { - "label": { - "value": "x" - }, - "style": {}, - "near_key": null, - "shape": { - "value": "sql_table" - }, - "direction": { - "value": "" - }, - "constraint": { - "value": "" - } - }, - "zIndex": 0 -======= "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,2:6:30-2:7:31", "errmsg": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2:3:7: sql_table columns cannot have children" ->>>>>>> master - }, - { -<<<<<<< HEAD - "id": "p", - "id_val": "p", - "label_dimensions": { - "width": 0, - "height": 0 - }, - "references": [ - { - "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,2:6:30-2:8:32", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,2:6:30-2:7:31", - "value": [ - { - "string": "p", - "raw_string": "p" - } - ] - } - } - ] - }, - "key_path_index": 0, - "map_key_edge_index": 0 - } - ], - "attributes": { - "label": { - "value": "p" - }, - "style": {}, - "link": { - "value": "" - }, - "near_key": null, - "shape": { - "value": "rectangle" - }, - "direction": { - "value": "" - }, - "constraint": { - "value": "" - } - }, - "zIndex": 0 - }, - { - "id": "q", - "id_val": "q", - "label_dimensions": { - "width": 0, - "height": 0 - }, - "references": [ - { - "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,2:10:34-2:12:36", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,2:11:35-2:12:36", - "value": [ - { - "string": "q", - "raw_string": "q" - } - ] - } - } - ] - }, - "key_path_index": 0, - "map_key_edge_index": 0 - } - ], - "attributes": { - "label": { - "value": "q" - }, - "style": {}, - "link": { - "value": "" - }, - "near_key": null, - "shape": { - "value": "rectangle" - }, - "direction": { - "value": "" - }, - "constraint": { - "value": "" - } - }, - "zIndex": 0 -||||||| 0da4e150 - "id": "p", - "id_val": "p", - "label_dimensions": { - "width": 0, - "height": 0 - }, - "references": [ - { - "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,2:6:30-2:8:32", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,2:6:30-2:7:31", - "value": [ - { - "string": "p", - "raw_string": "p" - } - ] - } - } - ] - }, - "key_path_index": 0, - "map_key_edge_index": 0 - } - ], - "attributes": { - "label": { - "value": "p" - }, - "style": {}, - "near_key": null, - "shape": { - "value": "rectangle" - }, - "direction": { - "value": "" - }, - "constraint": { - "value": "" - } - }, - "zIndex": 0 }, { - "id": "q", - "id_val": "q", - "label_dimensions": { - "width": 0, - "height": 0 - }, - "references": [ - { - "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,2:10:34-2:12:36", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,2:11:35-2:12:36", - "value": [ - { - "string": "q", - "raw_string": "q" - } - ] - } - } - ] - }, - "key_path_index": 0, - "map_key_edge_index": 0 - } - ], - "attributes": { - "label": { - "value": "q" - }, - "style": {}, - "near_key": null, - "shape": { - "value": "rectangle" - }, - "direction": { - "value": "" - }, - "constraint": { - "value": "" - } - }, - "zIndex": 0 -======= "range": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2,2:11:35-2:12:36", "errmsg": "d2/testdata/d2compiler/TestCompile/edge_in_column.d2:3:12: sql_table columns cannot have children" ->>>>>>> master } ] } diff --git a/testdata/d2compiler/TestCompile/edge_index.exp.json b/testdata/d2compiler/TestCompile/edge_index.exp.json index cd4adae889..8f8477966d 100644 --- a/testdata/d2compiler/TestCompile/edge_index.exp.json +++ b/testdata/d2compiler/TestCompile/edge_index.exp.json @@ -136,9 +136,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -177,9 +174,6 @@ "value": "two" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -249,9 +243,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -319,9 +310,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_index_map.exp.json b/testdata/d2compiler/TestCompile/edge_index_map.exp.json index 9d51f65ba3..a39b54f40d 100644 --- a/testdata/d2compiler/TestCompile/edge_index_map.exp.json +++ b/testdata/d2compiler/TestCompile/edge_index_map.exp.json @@ -155,9 +155,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -196,9 +193,6 @@ "value": "Space: the final frontier. These are the voyages of the starship Enterprise." }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -268,9 +262,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -338,9 +329,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_index_nested.exp.json b/testdata/d2compiler/TestCompile/edge_index_nested.exp.json index f2e8cbdf8b..ccd156c580 100644 --- a/testdata/d2compiler/TestCompile/edge_index_nested.exp.json +++ b/testdata/d2compiler/TestCompile/edge_index_nested.exp.json @@ -165,9 +165,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -206,9 +203,6 @@ "value": "two" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -258,9 +252,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -328,9 +319,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -398,9 +386,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json b/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json index b0840d83ac..906ff7221a 100644 --- a/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json +++ b/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json @@ -181,9 +181,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -222,9 +219,6 @@ "value": "two" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -294,9 +288,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -364,9 +355,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -434,9 +422,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.exp.json b/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.exp.json index b8c905f861..2672b1d9f6 100644 --- a/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.exp.json +++ b/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.exp.json @@ -194,9 +194,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -239,9 +236,6 @@ "value": "0.4" } }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -311,9 +305,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -381,9 +372,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -451,9 +439,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.exp.json b/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.exp.json index cb7d94a81c..b71616dca2 100644 --- a/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.exp.json +++ b/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.exp.json @@ -200,9 +200,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -245,9 +242,6 @@ "value": "0.4" } }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -297,9 +291,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -347,9 +338,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -397,9 +385,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.exp.json b/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.exp.json index e2aa20c875..0c97a89655 100644 --- a/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.exp.json +++ b/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.exp.json @@ -213,9 +213,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -258,9 +255,6 @@ "value": "0.4" } }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -310,9 +304,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -360,9 +351,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -410,9 +398,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.exp.json b/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.exp.json index 499269e1f8..1566cc1cd3 100644 --- a/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.exp.json +++ b/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.exp.json @@ -231,9 +231,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -276,9 +273,6 @@ "value": "0.4" } }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -328,9 +322,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -378,9 +369,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -428,9 +416,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_label_map.exp.json b/testdata/d2compiler/TestCompile/edge_label_map.exp.json index beae838be8..267fcd7551 100644 --- a/testdata/d2compiler/TestCompile/edge_label_map.exp.json +++ b/testdata/d2compiler/TestCompile/edge_label_map.exp.json @@ -121,9 +121,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -163,9 +160,6 @@ "value": "0.5" } }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -215,9 +209,6 @@ "value": "hey y9" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -265,9 +256,6 @@ "value": "qwer" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_map.exp.json b/testdata/d2compiler/TestCompile/edge_map.exp.json index 28a6b6fee7..38c27848e6 100644 --- a/testdata/d2compiler/TestCompile/edge_map.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map.exp.json @@ -104,9 +104,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -142,9 +139,6 @@ "value": "Space: the final frontier. These are the voyages of the starship Enterprise." }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -194,9 +188,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -244,9 +235,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json index b3c85e3a5e..dee1063005 100644 --- a/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json @@ -133,9 +133,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -165,9 +162,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "diamond" @@ -190,9 +184,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -242,9 +233,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -292,9 +280,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json b/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json index a8e8c19a34..3be6035010 100644 --- a/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json @@ -149,9 +149,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -194,9 +191,6 @@ "value": "0.4" } }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -266,9 +260,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -336,9 +327,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json b/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json index c01257a6b1..c2c30b2eaa 100644 --- a/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json @@ -167,9 +167,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -212,9 +209,6 @@ "value": "0.4" } }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -284,9 +278,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -354,9 +345,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_map_nested.exp.json b/testdata/d2compiler/TestCompile/edge_map_nested.exp.json index 77f9d68e94..866afcedd7 100644 --- a/testdata/d2compiler/TestCompile/edge_map_nested.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_nested.exp.json @@ -129,9 +129,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -171,9 +168,6 @@ "value": "0.4" } }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -223,9 +217,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -273,9 +264,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json b/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json index 4fc99381d0..61d6ac3717 100644 --- a/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json @@ -111,9 +111,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -153,9 +150,6 @@ "value": "0.4" } }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -205,9 +199,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -255,9 +246,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json index 268f23191d..98543d75c4 100644 --- a/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json @@ -221,9 +221,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -253,9 +250,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "diamond" @@ -273,9 +267,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "diamond" @@ -300,9 +291,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -372,9 +360,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -442,9 +427,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json index b34f2651e0..4f81963ec5 100644 --- a/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json @@ -115,9 +115,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -147,9 +144,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "triangle" @@ -172,9 +166,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -224,9 +215,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -274,9 +262,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json index 493d7fe030..537e5cea51 100644 --- a/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json @@ -171,9 +171,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -203,9 +200,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "diamond" @@ -231,9 +225,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -303,9 +294,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -373,9 +361,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/escaped_id.exp.json b/testdata/d2compiler/TestCompile/escaped_id.exp.json index 027509fde5..de942475c3 100644 --- a/testdata/d2compiler/TestCompile/escaped_id.exp.json +++ b/testdata/d2compiler/TestCompile/escaped_id.exp.json @@ -42,9 +42,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -94,9 +91,6 @@ "value": "b\nb" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/image_style.exp.json b/testdata/d2compiler/TestCompile/image_style.exp.json index 84ba55e1ee..0702d187b3 100644 --- a/testdata/d2compiler/TestCompile/image_style.exp.json +++ b/testdata/d2compiler/TestCompile/image_style.exp.json @@ -163,9 +163,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -231,9 +228,6 @@ "Fragment": "", "RawFragment": "" }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "image" diff --git a/testdata/d2compiler/TestCompile/link-board-nested.exp.json b/testdata/d2compiler/TestCompile/link-board-nested.exp.json index 4cac13579b..4b6819f02a 100644 --- a/testdata/d2compiler/TestCompile/link-board-nested.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-nested.exp.json @@ -1,12 +1,13 @@ { "graph": { "name": "", + "isFolderOnly": false, "ast": { "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:0:0-7:1:75", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:8:8-0:25:25", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:0:0-0:25:25", "key": { "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:0:0-0:6:6", "path": [ @@ -172,9 +173,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -255,12 +253,13 @@ "layers": [ { "name": "x", + "isFolderOnly": false, "ast": { "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:0:0-7:1:75", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:8:8-0:25:25", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:0:0-0:25:25", "key": { "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:0:0-0:6:6", "path": [ @@ -426,9 +425,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" diff --git a/testdata/d2compiler/TestCompile/link-board-ok.exp.json b/testdata/d2compiler/TestCompile/link-board-ok.exp.json index b6e66ee2f7..eb07427b94 100644 --- a/testdata/d2compiler/TestCompile/link-board-ok.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-ok.exp.json @@ -1,12 +1,13 @@ { "graph": { "name": "", + "isFolderOnly": false, "ast": { "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,0:0:0-3:1:32", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,0:8:8-0:16:16", + "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,0:0:0-0:16:16", "key": { "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,0:0:0-0:6:6", "path": [ @@ -114,9 +115,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" diff --git a/testdata/d2compiler/TestCompile/near_constant.exp.json b/testdata/d2compiler/TestCompile/near_constant.exp.json index f10911516e..c19123bcf9 100644 --- a/testdata/d2compiler/TestCompile/near_constant.exp.json +++ b/testdata/d2compiler/TestCompile/near_constant.exp.json @@ -63,9 +63,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -126,9 +123,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": { "range": "d2/testdata/d2compiler/TestCompile/near_constant.d2,0:8:8-0:18:18", "path": [ diff --git a/testdata/d2compiler/TestCompile/nested_sql.exp.json b/testdata/d2compiler/TestCompile/nested_sql.exp.json index 35f41085d5..3e8e30ad2a 100644 --- a/testdata/d2compiler/TestCompile/nested_sql.exp.json +++ b/testdata/d2compiler/TestCompile/nested_sql.exp.json @@ -176,9 +176,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -228,9 +225,6 @@ "value": "outer" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -338,9 +332,6 @@ "value": "table" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "sql_table" diff --git a/testdata/d2compiler/TestCompile/null.exp.json b/testdata/d2compiler/TestCompile/null.exp.json index 701c46cc6a..bff5163035 100644 --- a/testdata/d2compiler/TestCompile/null.exp.json +++ b/testdata/d2compiler/TestCompile/null.exp.json @@ -42,9 +42,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -94,9 +91,6 @@ "value": "null" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/path_link.exp.json b/testdata/d2compiler/TestCompile/path_link.exp.json index 9a5080163a..9c08d24ad3 100644 --- a/testdata/d2compiler/TestCompile/path_link.exp.json +++ b/testdata/d2compiler/TestCompile/path_link.exp.json @@ -31,7 +31,7 @@ "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/path_link.d2,1:8:13-1:39:44", + "range": "d2/testdata/d2compiler/TestCompile/path_link.d2,1:2:7-1:39:44", "key": { "range": "d2/testdata/d2compiler/TestCompile/path_link.d2,1:2:7-1:6:11", "path": [ @@ -81,9 +81,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" diff --git a/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json b/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json index 2fa5276f82..b8e63235ae 100644 --- a/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json +++ b/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json @@ -276,9 +276,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -381,9 +378,6 @@ "Fragment": "", "RawFragment": "" }, - "link": { - "value": "" - }, "near_key": { "range": "d2/testdata/d2compiler/TestCompile/reserved_icon_near_style.d2,6:8:90-6:9:91", "path": [ @@ -446,9 +440,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/root_direction.exp.json b/testdata/d2compiler/TestCompile/root_direction.exp.json index 64d54aa364..9e491c7cce 100644 --- a/testdata/d2compiler/TestCompile/root_direction.exp.json +++ b/testdata/d2compiler/TestCompile/root_direction.exp.json @@ -52,9 +52,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" diff --git a/testdata/d2compiler/TestCompile/root_sequence.exp.json b/testdata/d2compiler/TestCompile/root_sequence.exp.json index 22936afce8..185ef79ada 100644 --- a/testdata/d2compiler/TestCompile/root_sequence.exp.json +++ b/testdata/d2compiler/TestCompile/root_sequence.exp.json @@ -52,9 +52,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "sequence_diagram" diff --git a/testdata/d2compiler/TestCompile/self-referencing.exp.json b/testdata/d2compiler/TestCompile/self-referencing.exp.json index 242faaa003..1c38808f25 100644 --- a/testdata/d2compiler/TestCompile/self-referencing.exp.json +++ b/testdata/d2compiler/TestCompile/self-referencing.exp.json @@ -65,9 +65,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -103,9 +100,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -175,9 +169,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/sequence_container.exp.json b/testdata/d2compiler/TestCompile/sequence_container.exp.json index 6fda1fe675..3c70617f7a 100644 --- a/testdata/d2compiler/TestCompile/sequence_container.exp.json +++ b/testdata/d2compiler/TestCompile/sequence_container.exp.json @@ -261,9 +261,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "sequence_diagram" @@ -299,9 +296,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -336,9 +330,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -452,9 +443,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -566,9 +554,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -680,9 +665,6 @@ "value": "q" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -794,9 +776,6 @@ "value": "j" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -908,9 +887,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -1022,9 +998,6 @@ "value": "p" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -1072,9 +1045,6 @@ "value": "ok" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/sequence_container_2.exp.json b/testdata/d2compiler/TestCompile/sequence_container_2.exp.json index 4c5f0f419b..7c673a875a 100644 --- a/testdata/d2compiler/TestCompile/sequence_container_2.exp.json +++ b/testdata/d2compiler/TestCompile/sequence_container_2.exp.json @@ -239,9 +239,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "sequence_diagram" @@ -277,9 +274,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -393,9 +387,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -507,9 +498,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -621,9 +609,6 @@ "value": "q" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -671,9 +656,6 @@ "value": "ok" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -743,9 +725,6 @@ "value": "j" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -815,9 +794,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -887,9 +863,6 @@ "value": "p" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -937,9 +910,6 @@ "value": "meow" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/sequence_grouped_note.exp.json b/testdata/d2compiler/TestCompile/sequence_grouped_note.exp.json index 22f06ed688..1efddcb4cd 100644 --- a/testdata/d2compiler/TestCompile/sequence_grouped_note.exp.json +++ b/testdata/d2compiler/TestCompile/sequence_grouped_note.exp.json @@ -161,9 +161,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "sequence_diagram" @@ -213,9 +210,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -294,9 +288,6 @@ "value": "d" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -344,9 +335,6 @@ "value": "choo" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -405,9 +393,6 @@ "value": "this note" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/sequence_scoping.exp.json b/testdata/d2compiler/TestCompile/sequence_scoping.exp.json index e193fbcef0..cf90fb88d1 100644 --- a/testdata/d2compiler/TestCompile/sequence_scoping.exp.json +++ b/testdata/d2compiler/TestCompile/sequence_scoping.exp.json @@ -349,9 +349,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -387,9 +384,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -424,9 +418,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -461,9 +452,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -513,9 +501,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "sequence_diagram" @@ -614,9 +599,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -788,9 +770,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -838,9 +817,6 @@ "value": "group" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -899,9 +875,6 @@ "value": "t1" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -1033,9 +1006,6 @@ "value": "t1" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -1105,9 +1075,6 @@ "value": "t2" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/set_direction.exp.json b/testdata/d2compiler/TestCompile/set_direction.exp.json index 20fb3dd0d6..672c6a4b38 100644 --- a/testdata/d2compiler/TestCompile/set_direction.exp.json +++ b/testdata/d2compiler/TestCompile/set_direction.exp.json @@ -81,9 +81,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -133,9 +130,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/single_dimension_on_circle.exp.json b/testdata/d2compiler/TestCompile/single_dimension_on_circle.exp.json index 2ae8b8ec08..4d9f5da50a 100644 --- a/testdata/d2compiler/TestCompile/single_dimension_on_circle.exp.json +++ b/testdata/d2compiler/TestCompile/single_dimension_on_circle.exp.json @@ -115,9 +115,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -167,9 +164,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "height": { "value": "230" }, diff --git a/testdata/d2compiler/TestCompile/sql-regression.exp.json b/testdata/d2compiler/TestCompile/sql-regression.exp.json index 992f540bc8..5bf8088442 100644 --- a/testdata/d2compiler/TestCompile/sql-regression.exp.json +++ b/testdata/d2compiler/TestCompile/sql-regression.exp.json @@ -218,9 +218,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -274,9 +271,6 @@ "value": "lemonchiffon" } }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -356,9 +350,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "sql_table" @@ -406,9 +397,6 @@ "value": "d" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/sql_paren.exp.json b/testdata/d2compiler/TestCompile/sql_paren.exp.json index 768d71a99a..1fe4cb57d4 100644 --- a/testdata/d2compiler/TestCompile/sql_paren.exp.json +++ b/testdata/d2compiler/TestCompile/sql_paren.exp.json @@ -157,9 +157,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -269,9 +266,6 @@ "value": "shape" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "sql_table" diff --git a/testdata/d2compiler/TestCompile/stroke-width.exp.json b/testdata/d2compiler/TestCompile/stroke-width.exp.json index 96d264414f..d69521ac6b 100644 --- a/testdata/d2compiler/TestCompile/stroke-width.exp.json +++ b/testdata/d2compiler/TestCompile/stroke-width.exp.json @@ -88,9 +88,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -144,9 +141,6 @@ "value": "0" } }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/table_connection_attr.exp.json b/testdata/d2compiler/TestCompile/table_connection_attr.exp.json index e4822fafc3..4e37dbe961 100644 --- a/testdata/d2compiler/TestCompile/table_connection_attr.exp.json +++ b/testdata/d2compiler/TestCompile/table_connection_attr.exp.json @@ -302,9 +302,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -346,9 +343,6 @@ "value": "true" } }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -461,9 +455,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "sql_table" @@ -574,9 +565,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "sql_table" diff --git a/testdata/d2compiler/TestCompile/table_style.exp.json b/testdata/d2compiler/TestCompile/table_style.exp.json index 3acb5fadce..c121ac01fa 100644 --- a/testdata/d2compiler/TestCompile/table_style.exp.json +++ b/testdata/d2compiler/TestCompile/table_style.exp.json @@ -154,9 +154,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -242,9 +239,6 @@ "value": "0.4" } }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "sql_table" diff --git a/testdata/d2compiler/TestCompile/table_style_map.exp.json b/testdata/d2compiler/TestCompile/table_style_map.exp.json index d97de3e963..ede7c0ad44 100644 --- a/testdata/d2compiler/TestCompile/table_style_map.exp.json +++ b/testdata/d2compiler/TestCompile/table_style_map.exp.json @@ -205,9 +205,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -296,9 +293,6 @@ "value": "blue" } }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "sql_table" diff --git a/testdata/d2compiler/TestCompile/underscore_edge.exp.json b/testdata/d2compiler/TestCompile/underscore_edge.exp.json index 27737c5c6f..f19ce6a8cf 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge.exp.json @@ -116,9 +116,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -154,9 +151,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -237,9 +231,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -298,9 +289,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json index 52aafa69eb..d7ce10dcb4 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json @@ -175,9 +175,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -213,9 +210,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -250,9 +244,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -364,9 +355,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -425,9 +413,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -486,9 +471,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json index 8d26dce2c9..ff3b0c66b1 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json @@ -182,9 +182,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -220,9 +217,6 @@ "value": "Can you imagine how life could be improved if we could do away with" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -257,9 +251,6 @@ "value": "Well, it's garish, ugly, and derelicts have used it for a toilet." }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -340,9 +331,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -421,9 +409,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -471,9 +456,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json index 571b1c0c10..27b8f3d1be 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json @@ -187,9 +187,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -228,9 +225,6 @@ "value": "Well, it's garish, ugly, and derelicts have used it for a toilet." }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -280,9 +274,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -330,9 +321,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -380,9 +368,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json index 3a53d38620..37ff7be189 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json @@ -156,9 +156,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -194,9 +191,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -246,9 +240,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -327,9 +318,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -399,9 +387,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/underscore_parent_create.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_create.exp.json index 728fda5f16..380951b20d 100644 --- a/testdata/d2compiler/TestCompile/underscore_parent_create.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_parent_create.exp.json @@ -82,9 +82,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -134,9 +131,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -195,9 +189,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/underscore_parent_not_root.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_not_root.exp.json index d9c54f3bc8..3972b42e86 100644 --- a/testdata/d2compiler/TestCompile/underscore_parent_not_root.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_parent_not_root.exp.json @@ -111,9 +111,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -163,9 +160,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -213,9 +207,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -274,9 +265,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/underscore_parent_preference_1.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_preference_1.exp.json index 7dd19e101a..44b01dc8f2 100644 --- a/testdata/d2compiler/TestCompile/underscore_parent_preference_1.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_parent_preference_1.exp.json @@ -125,9 +125,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -177,9 +174,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -258,9 +252,6 @@ "value": "But it's real. And if it's real it can be affected ... we may not be able" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/underscore_parent_preference_2.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_preference_2.exp.json index 72269fddec..97b34c3e4b 100644 --- a/testdata/d2compiler/TestCompile/underscore_parent_preference_2.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_parent_preference_2.exp.json @@ -125,9 +125,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -208,9 +205,6 @@ "value": "All we are given is possibilities -- to make ourselves one thing or another." }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -258,9 +252,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/underscore_parent_squared.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_squared.exp.json index a2b6bd3525..e059d59126 100644 --- a/testdata/d2compiler/TestCompile/underscore_parent_squared.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_parent_squared.exp.json @@ -122,9 +122,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -174,9 +171,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -224,9 +218,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -296,9 +287,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/underscore_unresolved_obj.exp.json b/testdata/d2compiler/TestCompile/underscore_unresolved_obj.exp.json index 6044064a09..21964b724b 100644 --- a/testdata/d2compiler/TestCompile/underscore_unresolved_obj.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_unresolved_obj.exp.json @@ -82,9 +82,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -134,9 +131,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -195,9 +189,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/unescaped_id_cr.exp.json b/testdata/d2compiler/TestCompile/unescaped_id_cr.exp.json index c0bdbb33ae..40c3c1246c 100644 --- a/testdata/d2compiler/TestCompile/unescaped_id_cr.exp.json +++ b/testdata/d2compiler/TestCompile/unescaped_id_cr.exp.json @@ -42,9 +42,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -94,9 +91,6 @@ "value": "b\rb" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/url_link.exp.json b/testdata/d2compiler/TestCompile/url_link.exp.json index 0f0835271f..f800be68e1 100644 --- a/testdata/d2compiler/TestCompile/url_link.exp.json +++ b/testdata/d2compiler/TestCompile/url_link.exp.json @@ -31,7 +31,7 @@ "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/url_link.d2,1:8:13-1:26:31", + "range": "d2/testdata/d2compiler/TestCompile/url_link.d2,1:2:7-1:26:31", "key": { "range": "d2/testdata/d2compiler/TestCompile/url_link.d2,1:2:7-1:6:11", "path": [ @@ -81,9 +81,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" diff --git a/testdata/d2compiler/TestCompile/wrong_column_index.exp.json b/testdata/d2compiler/TestCompile/wrong_column_index.exp.json index fe3eadda94..5b4caf80af 100644 --- a/testdata/d2compiler/TestCompile/wrong_column_index.exp.json +++ b/testdata/d2compiler/TestCompile/wrong_column_index.exp.json @@ -703,9 +703,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -743,9 +740,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -998,9 +992,6 @@ "value": "Chinchillas" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "sql_table" @@ -1167,9 +1158,6 @@ "value": "Chinchillas_Collectibles" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "sql_table" diff --git a/testdata/d2compiler/TestCompile2/boards/recursive.exp.json b/testdata/d2compiler/TestCompile2/boards/recursive.exp.json index d3e58d020e..6d2c25d9ea 100644 --- a/testdata/d2compiler/TestCompile2/boards/recursive.exp.json +++ b/testdata/d2compiler/TestCompile2/boards/recursive.exp.json @@ -308,9 +308,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -360,9 +357,6 @@ "value": "base" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -687,9 +681,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -739,9 +730,6 @@ "value": "santa" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -1066,9 +1054,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -1118,9 +1103,6 @@ "value": "clause" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -1445,9 +1427,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -1497,9 +1476,6 @@ "value": "reindeer" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -1824,9 +1800,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -1876,9 +1849,6 @@ "value": "montana" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/boards/root.exp.json b/testdata/d2compiler/TestCompile2/boards/root.exp.json index 4a81bc91ec..d5578d6ffd 100644 --- a/testdata/d2compiler/TestCompile2/boards/root.exp.json +++ b/testdata/d2compiler/TestCompile2/boards/root.exp.json @@ -175,9 +175,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -227,9 +224,6 @@ "value": "base" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -421,9 +415,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -473,9 +464,6 @@ "value": "santa" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -667,9 +655,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -719,9 +704,6 @@ "value": "clause" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/base.exp.json b/testdata/d2oracle/TestCreate/base.exp.json index 222412066a..b1773f3e53 100644 --- a/testdata/d2oracle/TestCreate/base.exp.json +++ b/testdata/d2oracle/TestCreate/base.exp.json @@ -42,9 +42,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -94,9 +91,6 @@ "value": "square" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/container.exp.json b/testdata/d2oracle/TestCreate/container.exp.json index 9ea06ade30..45c84a2b9f 100644 --- a/testdata/d2oracle/TestCreate/container.exp.json +++ b/testdata/d2oracle/TestCreate/container.exp.json @@ -71,9 +71,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -123,9 +120,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -173,9 +167,6 @@ "value": "q" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/container_edge.exp.json b/testdata/d2oracle/TestCreate/container_edge.exp.json index 1773d68a00..99fa9987fa 100644 --- a/testdata/d2oracle/TestCreate/container_edge.exp.json +++ b/testdata/d2oracle/TestCreate/container_edge.exp.json @@ -94,9 +94,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -132,9 +129,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -184,9 +178,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -234,9 +225,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -284,9 +272,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/container_edge_label.exp.json b/testdata/d2oracle/TestCreate/container_edge_label.exp.json index 733cbcb076..874f701c9f 100644 --- a/testdata/d2oracle/TestCreate/container_edge_label.exp.json +++ b/testdata/d2oracle/TestCreate/container_edge_label.exp.json @@ -104,9 +104,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -142,9 +139,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -194,9 +188,6 @@ "value": "zoom" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -244,9 +235,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -294,9 +282,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/edge.exp.json b/testdata/d2oracle/TestCreate/edge.exp.json index f2a721f899..7c756f94e5 100644 --- a/testdata/d2oracle/TestCreate/edge.exp.json +++ b/testdata/d2oracle/TestCreate/edge.exp.json @@ -65,9 +65,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -103,9 +100,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -155,9 +149,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -205,9 +196,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/edge_nested.exp.json b/testdata/d2oracle/TestCreate/edge_nested.exp.json index 743d8470fe..ebd1c4a1fa 100644 --- a/testdata/d2oracle/TestCreate/edge_nested.exp.json +++ b/testdata/d2oracle/TestCreate/edge_nested.exp.json @@ -81,9 +81,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -119,9 +116,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -171,9 +165,6 @@ "value": "container" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -221,9 +212,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -271,9 +259,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/edge_scope.exp.json b/testdata/d2oracle/TestCreate/edge_scope.exp.json index 883f4c149d..82f59fb8ee 100644 --- a/testdata/d2oracle/TestCreate/edge_scope.exp.json +++ b/testdata/d2oracle/TestCreate/edge_scope.exp.json @@ -94,9 +94,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -132,9 +129,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -184,9 +178,6 @@ "value": "container" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -234,9 +225,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -284,9 +272,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json b/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json index c8d1af1cfb..0981b56e5c 100644 --- a/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json +++ b/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json @@ -94,9 +94,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -132,9 +129,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -184,9 +178,6 @@ "value": "container" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -234,9 +225,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -284,9 +272,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json b/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json index bb99c3bdbe..6f03dd3e58 100644 --- a/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json +++ b/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json @@ -105,9 +105,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -143,9 +140,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -206,9 +200,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -267,9 +258,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -317,9 +305,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -367,9 +352,6 @@ "value": "q" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/edge_unique.exp.json b/testdata/d2oracle/TestCreate/edge_unique.exp.json index d89bf8ff54..3feaad7e5e 100644 --- a/testdata/d2oracle/TestCreate/edge_unique.exp.json +++ b/testdata/d2oracle/TestCreate/edge_unique.exp.json @@ -251,9 +251,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -289,9 +286,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -326,9 +320,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -363,9 +354,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -400,9 +388,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -452,9 +437,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -502,9 +484,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -592,9 +571,6 @@ "value": "hello" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -682,9 +658,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -772,9 +745,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/gen_key.exp.json b/testdata/d2oracle/TestCreate/gen_key.exp.json index 3f3565208b..6b59db7f6f 100644 --- a/testdata/d2oracle/TestCreate/gen_key.exp.json +++ b/testdata/d2oracle/TestCreate/gen_key.exp.json @@ -65,9 +65,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -117,9 +114,6 @@ "value": "square" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -167,9 +161,6 @@ "value": "square 2" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/gen_key_n.exp.json b/testdata/d2oracle/TestCreate/gen_key_n.exp.json index d2d3dd48de..a6a3ab175b 100644 --- a/testdata/d2oracle/TestCreate/gen_key_n.exp.json +++ b/testdata/d2oracle/TestCreate/gen_key_n.exp.json @@ -323,9 +323,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -397,9 +394,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -469,9 +463,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -541,9 +532,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -591,9 +579,6 @@ "value": "square" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -641,9 +626,6 @@ "value": "square 2" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -691,9 +673,6 @@ "value": "square 3" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -741,9 +720,6 @@ "value": "square 4" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -791,9 +767,6 @@ "value": "square 5" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -841,9 +814,6 @@ "value": "square 6" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -891,9 +861,6 @@ "value": "square 7" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -941,9 +908,6 @@ "value": "square 8" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -991,9 +955,6 @@ "value": "square 9" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -1041,9 +1002,6 @@ "value": "square 10" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -1091,9 +1049,6 @@ "value": "square 11" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/gen_key_nested.exp.json b/testdata/d2oracle/TestCreate/gen_key_nested.exp.json index a79569841e..dd647a29ee 100644 --- a/testdata/d2oracle/TestCreate/gen_key_nested.exp.json +++ b/testdata/d2oracle/TestCreate/gen_key_nested.exp.json @@ -131,9 +131,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -269,9 +266,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -405,9 +399,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -541,9 +532,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -624,9 +612,6 @@ "value": "square" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -707,9 +692,6 @@ "value": "square 2" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/gen_key_scope.exp.json b/testdata/d2oracle/TestCreate/gen_key_scope.exp.json index 02112c6454..fdff715299 100644 --- a/testdata/d2oracle/TestCreate/gen_key_scope.exp.json +++ b/testdata/d2oracle/TestCreate/gen_key_scope.exp.json @@ -116,9 +116,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -190,9 +187,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -262,9 +256,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -334,9 +325,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -384,9 +372,6 @@ "value": "square" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -434,9 +419,6 @@ "value": "square 2" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/gen_key_suffix.exp.json b/testdata/d2oracle/TestCreate/gen_key_suffix.exp.json index 993dcf2c71..9e45e674f8 100644 --- a/testdata/d2oracle/TestCreate/gen_key_suffix.exp.json +++ b/testdata/d2oracle/TestCreate/gen_key_suffix.exp.json @@ -65,9 +65,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -117,9 +114,6 @@ "value": "x " }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -167,9 +161,6 @@ "value": "x 2" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/make_scope_multiline.exp.json b/testdata/d2oracle/TestCreate/make_scope_multiline.exp.json index e7954b6b96..9e6166137d 100644 --- a/testdata/d2oracle/TestCreate/make_scope_multiline.exp.json +++ b/testdata/d2oracle/TestCreate/make_scope_multiline.exp.json @@ -104,9 +104,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -156,9 +153,6 @@ "value": "rawr" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "circle" @@ -206,9 +200,6 @@ "value": "orange" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.exp.json b/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.exp.json index 8b6043cd24..1a6d18fc7b 100644 --- a/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.exp.json +++ b/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.exp.json @@ -150,9 +150,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -202,9 +199,6 @@ "value": "before" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -252,9 +246,6 @@ "value": "rawr" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "circle" @@ -302,9 +293,6 @@ "value": "orange" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -352,9 +340,6 @@ "value": "after" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.exp.json b/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.exp.json index d6f650f329..5c35c062ad 100644 --- a/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.exp.json +++ b/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.exp.json @@ -150,9 +150,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -202,9 +199,6 @@ "value": "before" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -252,9 +246,6 @@ "value": "rawr" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "circle" @@ -302,9 +293,6 @@ "value": "orange" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -352,9 +340,6 @@ "value": "after" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/nested.exp.json b/testdata/d2oracle/TestCreate/nested.exp.json index 5110c9abf2..13a0e5338e 100644 --- a/testdata/d2oracle/TestCreate/nested.exp.json +++ b/testdata/d2oracle/TestCreate/nested.exp.json @@ -64,9 +64,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -138,9 +135,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -210,9 +204,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -282,9 +273,6 @@ "value": "square" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/scope.exp.json b/testdata/d2oracle/TestCreate/scope.exp.json index 7a804162c3..9639bbf246 100644 --- a/testdata/d2oracle/TestCreate/scope.exp.json +++ b/testdata/d2oracle/TestCreate/scope.exp.json @@ -93,9 +93,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -167,9 +164,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -239,9 +233,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -311,9 +302,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -361,9 +349,6 @@ "value": "square" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/breakup_arrowhead.exp.json b/testdata/d2oracle/TestDelete/breakup_arrowhead.exp.json index c24fc6d385..b87f7ada73 100644 --- a/testdata/d2oracle/TestDelete/breakup_arrowhead.exp.json +++ b/testdata/d2oracle/TestDelete/breakup_arrowhead.exp.json @@ -42,9 +42,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -94,9 +91,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/children.exp.json b/testdata/d2oracle/TestDelete/children.exp.json index a27344f1f1..d72aac1bc4 100644 --- a/testdata/d2oracle/TestDelete/children.exp.json +++ b/testdata/d2oracle/TestDelete/children.exp.json @@ -88,9 +88,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -126,9 +123,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -178,9 +172,6 @@ "value": "what's up" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -228,9 +219,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -278,9 +266,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/children_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_conflicts.exp.json index 48eb8b1fd1..aa46010d5d 100644 --- a/testdata/d2oracle/TestDelete/children_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_conflicts.exp.json @@ -65,9 +65,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -117,9 +114,6 @@ "value": "x 2" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -167,9 +161,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json index 53be16eee6..06b1721b92 100644 --- a/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json @@ -121,9 +121,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -159,9 +156,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -231,9 +225,6 @@ "value": "hi" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -281,9 +272,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -331,9 +319,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json index ef04e03632..017b88f808 100644 --- a/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json @@ -214,9 +214,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -252,9 +249,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -289,9 +283,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -361,9 +352,6 @@ "value": "hi" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -431,9 +419,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -501,9 +486,6 @@ "value": "ey" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -551,9 +533,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -601,9 +580,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/children_flat_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_flat_conflicts.exp.json index 165be0f7aa..72b006c081 100644 --- a/testdata/d2oracle/TestDelete/children_flat_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_flat_conflicts.exp.json @@ -98,9 +98,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -170,9 +167,6 @@ "value": "hi" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -220,9 +214,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json index 317777b8cc..6dd312311e 100644 --- a/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json @@ -190,9 +190,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -228,9 +225,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -320,9 +314,6 @@ "value": "hi" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -390,9 +381,6 @@ "value": "y 2" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -440,9 +428,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -490,9 +475,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/children_nested_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_nested_conflicts.exp.json index 97a1804d69..42ec7a6736 100644 --- a/testdata/d2oracle/TestDelete/children_nested_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_nested_conflicts.exp.json @@ -94,9 +94,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -146,9 +143,6 @@ "value": "x 2" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -196,9 +190,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -246,9 +237,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/children_nested_referenced_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_nested_referenced_conflicts.exp.json index 4e1388f9b1..d093f337bd 100644 --- a/testdata/d2oracle/TestDelete/children_nested_referenced_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_nested_referenced_conflicts.exp.json @@ -153,9 +153,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -267,9 +264,6 @@ "value": "hi" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -359,9 +353,6 @@ "value": "hey" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -409,9 +400,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/children_no_self_conflict.exp.json b/testdata/d2oracle/TestDelete/children_no_self_conflict.exp.json index 66e9e92edb..fe35fb0a45 100644 --- a/testdata/d2oracle/TestDelete/children_no_self_conflict.exp.json +++ b/testdata/d2oracle/TestDelete/children_no_self_conflict.exp.json @@ -42,9 +42,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -94,9 +91,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/children_order.exp.json b/testdata/d2oracle/TestDelete/children_order.exp.json index 5e349d80c2..824bdeaf7a 100644 --- a/testdata/d2oracle/TestDelete/children_order.exp.json +++ b/testdata/d2oracle/TestDelete/children_order.exp.json @@ -117,9 +117,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -169,9 +166,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -219,9 +213,6 @@ "value": "before" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -269,9 +260,6 @@ "value": "congo" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -319,9 +307,6 @@ "value": "after" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/children_referenced_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_referenced_conflicts.exp.json index 8a7e05ec1a..d3c25dc9f6 100644 --- a/testdata/d2oracle/TestDelete/children_referenced_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_referenced_conflicts.exp.json @@ -98,9 +98,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -170,9 +167,6 @@ "value": "hi" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -220,9 +214,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/children_scope.exp.json b/testdata/d2oracle/TestDelete/children_scope.exp.json index 34edc1f7e9..7ef29ec5d8 100644 --- a/testdata/d2oracle/TestDelete/children_scope.exp.json +++ b/testdata/d2oracle/TestDelete/children_scope.exp.json @@ -128,9 +128,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -166,9 +163,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -229,9 +223,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -290,9 +281,6 @@ "value": "q" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -340,9 +328,6 @@ "value": "what's up" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -390,9 +375,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -440,9 +422,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/container_near.exp.json b/testdata/d2oracle/TestDelete/container_near.exp.json index 130ea20ce1..d687451abb 100644 --- a/testdata/d2oracle/TestDelete/container_near.exp.json +++ b/testdata/d2oracle/TestDelete/container_near.exp.json @@ -166,9 +166,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -218,9 +215,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": { "range": "d2/testdata/d2oracle/TestDelete/container_near.d2,1:8:13-1:9:14", "path": [ @@ -283,9 +277,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -333,9 +324,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": { "range": "d2/testdata/d2oracle/TestDelete/container_near.d2,5:8:32-5:9:33", "path": [ diff --git a/testdata/d2oracle/TestDelete/delete_icon.exp.json b/testdata/d2oracle/TestDelete/delete_icon.exp.json index 727b94b6e6..773b7321b3 100644 --- a/testdata/d2oracle/TestDelete/delete_icon.exp.json +++ b/testdata/d2oracle/TestDelete/delete_icon.exp.json @@ -42,7 +42,7 @@ "nodes": [ { "map_key": { - "range": "d2/testdata/d2oracle/TestDelete/delete_icon.d2,1:8:15-1:26:33", + "range": "d2/testdata/d2oracle/TestDelete/delete_icon.d2,1:2:9-1:26:33", "key": { "range": "d2/testdata/d2oracle/TestDelete/delete_icon.d2,1:2:9-1:6:13", "path": [ @@ -92,9 +92,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -155,9 +152,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/delete_link.exp.json b/testdata/d2oracle/TestDelete/delete_link.exp.json index 26f8d3a449..d875355be7 100644 --- a/testdata/d2oracle/TestDelete/delete_link.exp.json +++ b/testdata/d2oracle/TestDelete/delete_link.exp.json @@ -42,9 +42,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -94,9 +91,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/delete_near.exp.json b/testdata/d2oracle/TestDelete/delete_near.exp.json index d8168eb365..db51e96edc 100644 --- a/testdata/d2oracle/TestDelete/delete_near.exp.json +++ b/testdata/d2oracle/TestDelete/delete_near.exp.json @@ -65,9 +65,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -117,9 +114,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -167,9 +161,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/delete_needed_flat_near.exp.json b/testdata/d2oracle/TestDelete/delete_needed_flat_near.exp.json index 143999c3bf..3487837b13 100644 --- a/testdata/d2oracle/TestDelete/delete_needed_flat_near.exp.json +++ b/testdata/d2oracle/TestDelete/delete_needed_flat_near.exp.json @@ -65,9 +65,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -117,9 +114,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -167,9 +161,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/delete_redundant_flat_near.exp.json b/testdata/d2oracle/TestDelete/delete_redundant_flat_near.exp.json index eb0f570864..1880ac0132 100644 --- a/testdata/d2oracle/TestDelete/delete_redundant_flat_near.exp.json +++ b/testdata/d2oracle/TestDelete/delete_redundant_flat_near.exp.json @@ -65,9 +65,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -117,9 +114,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -167,9 +161,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/delete_tooltip.exp.json b/testdata/d2oracle/TestDelete/delete_tooltip.exp.json index ac942bc219..494ab611eb 100644 --- a/testdata/d2oracle/TestDelete/delete_tooltip.exp.json +++ b/testdata/d2oracle/TestDelete/delete_tooltip.exp.json @@ -42,9 +42,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -94,9 +91,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json b/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json index f3eb8f3a41..40895df520 100644 --- a/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json +++ b/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json @@ -98,9 +98,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -136,9 +133,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -241,9 +235,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -313,9 +304,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -385,9 +373,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -446,9 +431,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/edge_common.exp.json b/testdata/d2oracle/TestDelete/edge_common.exp.json index 6aa8191a92..953bfb7b16 100644 --- a/testdata/d2oracle/TestDelete/edge_common.exp.json +++ b/testdata/d2oracle/TestDelete/edge_common.exp.json @@ -65,9 +65,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -103,9 +100,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -155,9 +149,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -205,9 +196,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/edge_common_2.exp.json b/testdata/d2oracle/TestDelete/edge_common_2.exp.json index 1a3f281203..c3c56a3c05 100644 --- a/testdata/d2oracle/TestDelete/edge_common_2.exp.json +++ b/testdata/d2oracle/TestDelete/edge_common_2.exp.json @@ -65,9 +65,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -103,9 +100,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -155,9 +149,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -205,9 +196,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/edge_common_3.exp.json b/testdata/d2oracle/TestDelete/edge_common_3.exp.json index 312be578b2..6bca4cd50f 100644 --- a/testdata/d2oracle/TestDelete/edge_common_3.exp.json +++ b/testdata/d2oracle/TestDelete/edge_common_3.exp.json @@ -87,9 +87,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -181,9 +178,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -242,9 +236,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -303,9 +294,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/edge_common_4.exp.json b/testdata/d2oracle/TestDelete/edge_common_4.exp.json index 26464a45ec..f085d59f78 100644 --- a/testdata/d2oracle/TestDelete/edge_common_4.exp.json +++ b/testdata/d2oracle/TestDelete/edge_common_4.exp.json @@ -87,9 +87,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -181,9 +178,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -242,9 +236,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -303,9 +294,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/edge_conflict.exp.json b/testdata/d2oracle/TestDelete/edge_conflict.exp.json index 3156898f1a..d14b781c5a 100644 --- a/testdata/d2oracle/TestDelete/edge_conflict.exp.json +++ b/testdata/d2oracle/TestDelete/edge_conflict.exp.json @@ -110,9 +110,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -148,9 +145,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -242,9 +236,6 @@ "value": "y 2" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -303,9 +294,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -364,9 +352,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -414,9 +399,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/edge_decrement.exp.json b/testdata/d2oracle/TestDelete/edge_decrement.exp.json index 6b772b87c5..5275b19bd1 100644 --- a/testdata/d2oracle/TestDelete/edge_decrement.exp.json +++ b/testdata/d2oracle/TestDelete/edge_decrement.exp.json @@ -447,9 +447,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -488,9 +485,6 @@ "value": "zero" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -528,9 +522,6 @@ "value": "one" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -568,9 +559,6 @@ "value": "three" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -608,9 +596,6 @@ "value": "four" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -800,9 +785,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -990,9 +972,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/edge_first.exp.json b/testdata/d2oracle/TestDelete/edge_first.exp.json index 9581cbba5c..5ba7ba319d 100644 --- a/testdata/d2oracle/TestDelete/edge_first.exp.json +++ b/testdata/d2oracle/TestDelete/edge_first.exp.json @@ -176,9 +176,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -214,9 +211,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -251,9 +245,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -325,9 +316,6 @@ "value": "l" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -397,9 +385,6 @@ "value": "p" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -469,9 +454,6 @@ "value": "d" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -519,9 +501,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -569,9 +548,6 @@ "value": "p" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -639,9 +615,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -689,9 +662,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/edge_flat_style.exp.json b/testdata/d2oracle/TestDelete/edge_flat_style.exp.json index 44f31e332a..8fe956cea0 100644 --- a/testdata/d2oracle/TestDelete/edge_flat_style.exp.json +++ b/testdata/d2oracle/TestDelete/edge_flat_style.exp.json @@ -42,9 +42,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -94,9 +91,6 @@ "value": "B" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/edge_identical_child.exp.json b/testdata/d2oracle/TestDelete/edge_identical_child.exp.json index 97943eac7c..ec3514d0e2 100644 --- a/testdata/d2oracle/TestDelete/edge_identical_child.exp.json +++ b/testdata/d2oracle/TestDelete/edge_identical_child.exp.json @@ -98,9 +98,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -136,9 +133,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -210,9 +204,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -282,9 +273,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -354,9 +342,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -415,9 +400,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -476,9 +458,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/edge_key_style.exp.json b/testdata/d2oracle/TestDelete/edge_key_style.exp.json index 14b305db0d..a3a9d2cd70 100644 --- a/testdata/d2oracle/TestDelete/edge_key_style.exp.json +++ b/testdata/d2oracle/TestDelete/edge_key_style.exp.json @@ -65,9 +65,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -103,9 +100,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -155,9 +149,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -205,9 +196,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/edge_last.exp.json b/testdata/d2oracle/TestDelete/edge_last.exp.json index 7055a8f950..c49abada85 100644 --- a/testdata/d2oracle/TestDelete/edge_last.exp.json +++ b/testdata/d2oracle/TestDelete/edge_last.exp.json @@ -213,9 +213,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -251,9 +248,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -288,9 +282,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -325,9 +316,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -399,9 +387,6 @@ "value": "l" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -471,9 +456,6 @@ "value": "p" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -543,9 +525,6 @@ "value": "d" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -593,9 +572,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -663,9 +639,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -733,9 +706,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -783,9 +753,6 @@ "value": "q" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -833,9 +800,6 @@ "value": "p" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/edge_map_style.exp.json b/testdata/d2oracle/TestDelete/edge_map_style.exp.json index ee63f75697..c7bf64faf6 100644 --- a/testdata/d2oracle/TestDelete/edge_map_style.exp.json +++ b/testdata/d2oracle/TestDelete/edge_map_style.exp.json @@ -65,9 +65,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -103,9 +100,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -155,9 +149,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -205,9 +196,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/edge_middle.exp.json b/testdata/d2oracle/TestDelete/edge_middle.exp.json index 9fd4eb8660..af0a96fcec 100644 --- a/testdata/d2oracle/TestDelete/edge_middle.exp.json +++ b/testdata/d2oracle/TestDelete/edge_middle.exp.json @@ -199,9 +199,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -237,9 +234,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -274,9 +268,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -311,9 +302,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -385,9 +373,6 @@ "value": "l" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -457,9 +442,6 @@ "value": "p" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -529,9 +511,6 @@ "value": "d" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -579,9 +558,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -649,9 +625,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -699,9 +672,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -749,9 +719,6 @@ "value": "q" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -799,9 +766,6 @@ "value": "p" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/empty_map.exp.json b/testdata/d2oracle/TestDelete/empty_map.exp.json index e2e2144e7c..c32d34aa92 100644 --- a/testdata/d2oracle/TestDelete/empty_map.exp.json +++ b/testdata/d2oracle/TestDelete/empty_map.exp.json @@ -71,9 +71,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -123,9 +120,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -173,9 +167,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/flat.exp.json b/testdata/d2oracle/TestDelete/flat.exp.json index 095f473a25..f116acb979 100644 --- a/testdata/d2oracle/TestDelete/flat.exp.json +++ b/testdata/d2oracle/TestDelete/flat.exp.json @@ -18,9 +18,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" diff --git a/testdata/d2oracle/TestDelete/flat_reserved.exp.json b/testdata/d2oracle/TestDelete/flat_reserved.exp.json index 30ecb264be..563fd9dfc5 100644 --- a/testdata/d2oracle/TestDelete/flat_reserved.exp.json +++ b/testdata/d2oracle/TestDelete/flat_reserved.exp.json @@ -65,9 +65,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -103,9 +100,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -155,9 +149,6 @@ "value": "A" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -205,9 +196,6 @@ "value": "B" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/hoist_children.exp.json b/testdata/d2oracle/TestDelete/hoist_children.exp.json index 24b76489cb..063460fb9e 100644 --- a/testdata/d2oracle/TestDelete/hoist_children.exp.json +++ b/testdata/d2oracle/TestDelete/hoist_children.exp.json @@ -71,9 +71,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -123,9 +120,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -173,9 +167,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json b/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json index e6fe78569b..5e5a55ac1d 100644 --- a/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json +++ b/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json @@ -88,9 +88,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -126,9 +123,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -178,9 +172,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -228,9 +219,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -278,9 +266,6 @@ "value": "d" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/key_with_edges.exp.json b/testdata/d2oracle/TestDelete/key_with_edges.exp.json index f3da1716ac..9e07002983 100644 --- a/testdata/d2oracle/TestDelete/key_with_edges.exp.json +++ b/testdata/d2oracle/TestDelete/key_with_edges.exp.json @@ -87,9 +87,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -181,9 +178,6 @@ "value": "hello" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -242,9 +236,6 @@ "value": "meow" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -303,9 +294,6 @@ "value": "bark" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/key_with_edges_2.exp.json b/testdata/d2oracle/TestDelete/key_with_edges_2.exp.json index f73454b355..0cd835b7fa 100644 --- a/testdata/d2oracle/TestDelete/key_with_edges_2.exp.json +++ b/testdata/d2oracle/TestDelete/key_with_edges_2.exp.json @@ -53,9 +53,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -116,9 +113,6 @@ "value": "hello" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -177,9 +171,6 @@ "value": "bark" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/key_with_edges_3.exp.json b/testdata/d2oracle/TestDelete/key_with_edges_3.exp.json index ce7e30e1b0..d505707b4a 100644 --- a/testdata/d2oracle/TestDelete/key_with_edges_3.exp.json +++ b/testdata/d2oracle/TestDelete/key_with_edges_3.exp.json @@ -53,9 +53,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -116,9 +113,6 @@ "value": "hello" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -177,9 +171,6 @@ "value": "bark" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/key_with_edges_4.exp.json b/testdata/d2oracle/TestDelete/key_with_edges_4.exp.json index 1e1b07b62c..0d14081580 100644 --- a/testdata/d2oracle/TestDelete/key_with_edges_4.exp.json +++ b/testdata/d2oracle/TestDelete/key_with_edges_4.exp.json @@ -87,9 +87,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -181,9 +178,6 @@ "value": "hello" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -242,9 +236,6 @@ "value": "meow" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -303,9 +294,6 @@ "value": "bark" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/multi_near.exp.json b/testdata/d2oracle/TestDelete/multi_near.exp.json index 4b8879ad71..e41f9e3ec4 100644 --- a/testdata/d2oracle/TestDelete/multi_near.exp.json +++ b/testdata/d2oracle/TestDelete/multi_near.exp.json @@ -189,9 +189,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -241,9 +238,6 @@ "value": "API" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -291,9 +285,6 @@ "value": "Bluefish" }, "style": {}, - "link": { - "value": "" - }, "near_key": { "range": "d2/testdata/d2oracle/TestDelete/multi_near.d2,2:8:24-2:11:27", "path": [ @@ -356,9 +347,6 @@ "value": "Yo" }, "style": {}, - "link": { - "value": "" - }, "near_key": { "range": "d2/testdata/d2oracle/TestDelete/multi_near.d2,5:8:44-5:12:48", "path": [ @@ -421,9 +409,6 @@ "value": "Blah" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/multi_path_map_conflict.exp.json b/testdata/d2oracle/TestDelete/multi_path_map_conflict.exp.json index ca5340accb..f17fdd8628 100644 --- a/testdata/d2oracle/TestDelete/multi_path_map_conflict.exp.json +++ b/testdata/d2oracle/TestDelete/multi_path_map_conflict.exp.json @@ -123,9 +123,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -195,9 +192,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -245,9 +239,6 @@ "value": "z 2" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -295,9 +286,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/multi_path_map_no_conflict.exp.json b/testdata/d2oracle/TestDelete/multi_path_map_no_conflict.exp.json index a6ab1b9b58..d507d52273 100644 --- a/testdata/d2oracle/TestDelete/multi_path_map_no_conflict.exp.json +++ b/testdata/d2oracle/TestDelete/multi_path_map_no_conflict.exp.json @@ -94,9 +94,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -146,9 +143,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -196,9 +190,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -246,9 +237,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/multiple_flat_middle_container.exp.json b/testdata/d2oracle/TestDelete/multiple_flat_middle_container.exp.json index d07464c536..cd609a383b 100644 --- a/testdata/d2oracle/TestDelete/multiple_flat_middle_container.exp.json +++ b/testdata/d2oracle/TestDelete/multiple_flat_middle_container.exp.json @@ -87,9 +87,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -181,9 +178,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -242,9 +236,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -303,9 +294,6 @@ "value": "d" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/multiple_flat_style.exp.json b/testdata/d2oracle/TestDelete/multiple_flat_style.exp.json index 2fe8d0bb5a..7c3ad54fbe 100644 --- a/testdata/d2oracle/TestDelete/multiple_flat_style.exp.json +++ b/testdata/d2oracle/TestDelete/multiple_flat_style.exp.json @@ -70,9 +70,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -148,9 +145,6 @@ "value": "0.4" } }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/multiple_map_styles.exp.json b/testdata/d2oracle/TestDelete/multiple_map_styles.exp.json index 1ab76c9235..bff7c808d4 100644 --- a/testdata/d2oracle/TestDelete/multiple_map_styles.exp.json +++ b/testdata/d2oracle/TestDelete/multiple_map_styles.exp.json @@ -106,9 +106,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -162,9 +159,6 @@ "value": "0.4" } }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/near.exp.json b/testdata/d2oracle/TestDelete/near.exp.json index 51adee36a3..dfcbdba6c2 100644 --- a/testdata/d2oracle/TestDelete/near.exp.json +++ b/testdata/d2oracle/TestDelete/near.exp.json @@ -42,9 +42,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -94,9 +91,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/nested.exp.json b/testdata/d2oracle/TestDelete/nested.exp.json index 4b0882b537..3b67399a7e 100644 --- a/testdata/d2oracle/TestDelete/nested.exp.json +++ b/testdata/d2oracle/TestDelete/nested.exp.json @@ -64,9 +64,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -138,9 +135,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -210,9 +204,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -282,9 +273,6 @@ "value": "d" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/nested_2.exp.json b/testdata/d2oracle/TestDelete/nested_2.exp.json index 4136ea74b6..eb85fd9568 100644 --- a/testdata/d2oracle/TestDelete/nested_2.exp.json +++ b/testdata/d2oracle/TestDelete/nested_2.exp.json @@ -64,9 +64,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -138,9 +135,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -210,9 +204,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -282,9 +273,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json b/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json index 21053dbdad..56686e4620 100644 --- a/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json +++ b/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json @@ -94,9 +94,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -132,9 +129,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -184,9 +178,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -234,9 +225,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -284,9 +272,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/nested_flat_style.exp.json b/testdata/d2oracle/TestDelete/nested_flat_style.exp.json index ff03dc8316..8c3c28001e 100644 --- a/testdata/d2oracle/TestDelete/nested_flat_style.exp.json +++ b/testdata/d2oracle/TestDelete/nested_flat_style.exp.json @@ -42,9 +42,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -94,9 +91,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/nested_reserved.exp.json b/testdata/d2oracle/TestDelete/nested_reserved.exp.json index c7989547ff..629f232ba2 100644 --- a/testdata/d2oracle/TestDelete/nested_reserved.exp.json +++ b/testdata/d2oracle/TestDelete/nested_reserved.exp.json @@ -98,9 +98,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -203,9 +200,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -306,9 +300,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -378,9 +369,6 @@ "value": "jingle" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/nested_underscore_update.exp.json b/testdata/d2oracle/TestDelete/nested_underscore_update.exp.json index 69267f041c..aa3e1c0832 100644 --- a/testdata/d2oracle/TestDelete/nested_underscore_update.exp.json +++ b/testdata/d2oracle/TestDelete/nested_underscore_update.exp.json @@ -82,9 +82,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -134,9 +131,6 @@ "value": "books" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -195,9 +189,6 @@ "value": "pipe" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/node_in_edge.exp.json b/testdata/d2oracle/TestDelete/node_in_edge.exp.json index 96edc3a98d..0c55e65433 100644 --- a/testdata/d2oracle/TestDelete/node_in_edge.exp.json +++ b/testdata/d2oracle/TestDelete/node_in_edge.exp.json @@ -163,9 +163,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -201,9 +198,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -238,9 +232,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -290,9 +281,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -340,9 +328,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -390,9 +375,6 @@ "value": "q" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -440,9 +422,6 @@ "value": "p" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -490,9 +469,6 @@ "value": "ok" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -540,9 +516,6 @@ "value": "what's up" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json b/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json index 8ece8587b9..59fc5db5e5 100644 --- a/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json +++ b/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json @@ -202,9 +202,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -240,9 +237,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -277,9 +271,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -314,9 +305,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -366,9 +354,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -436,9 +421,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -506,9 +488,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -556,9 +535,6 @@ "value": "q" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -617,9 +593,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -678,9 +651,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -728,9 +698,6 @@ "value": "what's up" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json b/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json index 9cc9c7d382..6836d20b75 100644 --- a/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json +++ b/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json @@ -161,9 +161,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -199,9 +196,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -275,9 +269,6 @@ "value": "#000e3d" } }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -345,9 +336,6 @@ "value": "B" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json b/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json index 2f1fe933e6..562a4955f2 100644 --- a/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json +++ b/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json @@ -161,9 +161,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -203,9 +200,6 @@ "value": "#2b50c2" } }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -275,9 +269,6 @@ "value": "A" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -345,9 +336,6 @@ "value": "B" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/order_1.exp.json b/testdata/d2oracle/TestDelete/order_1.exp.json index d94b6c448f..a6b002f3e6 100644 --- a/testdata/d2oracle/TestDelete/order_1.exp.json +++ b/testdata/d2oracle/TestDelete/order_1.exp.json @@ -88,9 +88,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -126,9 +123,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -178,9 +172,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -228,9 +219,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -278,9 +266,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/order_2.exp.json b/testdata/d2oracle/TestDelete/order_2.exp.json index 621e5abe66..31461ae7b6 100644 --- a/testdata/d2oracle/TestDelete/order_2.exp.json +++ b/testdata/d2oracle/TestDelete/order_2.exp.json @@ -65,9 +65,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -117,9 +114,6 @@ "value": "p" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -167,9 +161,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/order_3.exp.json b/testdata/d2oracle/TestDelete/order_3.exp.json index dc38dce882..ed8eae7368 100644 --- a/testdata/d2oracle/TestDelete/order_3.exp.json +++ b/testdata/d2oracle/TestDelete/order_3.exp.json @@ -65,9 +65,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -117,9 +114,6 @@ "value": "p" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -167,9 +161,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/order_4.exp.json b/testdata/d2oracle/TestDelete/order_4.exp.json index 3f92383c6b..7775c60d5c 100644 --- a/testdata/d2oracle/TestDelete/order_4.exp.json +++ b/testdata/d2oracle/TestDelete/order_4.exp.json @@ -42,9 +42,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -94,9 +91,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/order_5.exp.json b/testdata/d2oracle/TestDelete/order_5.exp.json index 16189c3a64..6baa9b67d4 100644 --- a/testdata/d2oracle/TestDelete/order_5.exp.json +++ b/testdata/d2oracle/TestDelete/order_5.exp.json @@ -140,9 +140,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -178,9 +175,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -215,9 +209,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -267,9 +258,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -317,9 +305,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -367,9 +352,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -417,9 +399,6 @@ "value": "q" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -467,9 +446,6 @@ "value": "p" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/order_6.exp.json b/testdata/d2oracle/TestDelete/order_6.exp.json index cd55bf44e9..8ad11ae8f9 100644 --- a/testdata/d2oracle/TestDelete/order_6.exp.json +++ b/testdata/d2oracle/TestDelete/order_6.exp.json @@ -116,9 +116,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -210,9 +207,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -260,9 +254,6 @@ "value": "lol" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -332,9 +323,6 @@ "value": "p" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -404,9 +392,6 @@ "value": "q" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/order_7.exp.json b/testdata/d2oracle/TestDelete/order_7.exp.json index 65fd109cfa..25f8403797 100644 --- a/testdata/d2oracle/TestDelete/order_7.exp.json +++ b/testdata/d2oracle/TestDelete/order_7.exp.json @@ -127,9 +127,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -232,9 +229,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -282,9 +276,6 @@ "value": "lol" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -365,9 +356,6 @@ "value": "p" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -448,9 +436,6 @@ "value": "q" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -531,9 +516,6 @@ "value": "more" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/order_8.exp.json b/testdata/d2oracle/TestDelete/order_8.exp.json index 836059fadf..7b88c05e1a 100644 --- a/testdata/d2oracle/TestDelete/order_8.exp.json +++ b/testdata/d2oracle/TestDelete/order_8.exp.json @@ -134,9 +134,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -186,9 +183,6 @@ "value": "bark" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -236,9 +230,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -286,9 +277,6 @@ "value": "zebra" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -336,9 +324,6 @@ "value": "q" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -386,9 +371,6 @@ "value": "kang" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/shape_class.exp.json b/testdata/d2oracle/TestDelete/shape_class.exp.json index abb74d6d06..9cffa89e83 100644 --- a/testdata/d2oracle/TestDelete/shape_class.exp.json +++ b/testdata/d2oracle/TestDelete/shape_class.exp.json @@ -42,9 +42,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -94,9 +91,6 @@ "value": "github.com/terrastruct/d2parser.git" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/shape_sql_table.exp.json b/testdata/d2oracle/TestDelete/shape_sql_table.exp.json index 4605e0480b..d864976389 100644 --- a/testdata/d2oracle/TestDelete/shape_sql_table.exp.json +++ b/testdata/d2oracle/TestDelete/shape_sql_table.exp.json @@ -262,9 +262,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -300,9 +297,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -352,9 +346,6 @@ "value": "cloud" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -485,9 +476,6 @@ "value": "disks" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "sql_table" @@ -535,9 +523,6 @@ "value": "AWS S3 Vancouver" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/singular_flat_style.exp.json b/testdata/d2oracle/TestDelete/singular_flat_style.exp.json index 69195897eb..ef7b7af9db 100644 --- a/testdata/d2oracle/TestDelete/singular_flat_style.exp.json +++ b/testdata/d2oracle/TestDelete/singular_flat_style.exp.json @@ -42,9 +42,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -94,9 +91,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/singular_map_style.exp.json b/testdata/d2oracle/TestDelete/singular_map_style.exp.json index 919892ffce..66ac504132 100644 --- a/testdata/d2oracle/TestDelete/singular_map_style.exp.json +++ b/testdata/d2oracle/TestDelete/singular_map_style.exp.json @@ -42,9 +42,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -94,9 +91,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/underscore_no_conflict.exp.json b/testdata/d2oracle/TestDelete/underscore_no_conflict.exp.json index ca43b4ef81..67c1be91f4 100644 --- a/testdata/d2oracle/TestDelete/underscore_no_conflict.exp.json +++ b/testdata/d2oracle/TestDelete/underscore_no_conflict.exp.json @@ -105,9 +105,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -157,9 +154,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -218,9 +212,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -268,9 +259,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/underscore_remove.exp.json b/testdata/d2oracle/TestDelete/underscore_remove.exp.json index 59c752b6ce..df4d7620de 100644 --- a/testdata/d2oracle/TestDelete/underscore_remove.exp.json +++ b/testdata/d2oracle/TestDelete/underscore_remove.exp.json @@ -134,9 +134,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -172,9 +169,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -209,9 +203,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -261,9 +252,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -311,9 +299,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -361,9 +346,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -411,9 +393,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -461,9 +440,6 @@ "value": "d" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/append_multiple_styles.exp.json b/testdata/d2oracle/TestMove/append_multiple_styles.exp.json index cc6ea66642..7a0b72a220 100644 --- a/testdata/d2oracle/TestMove/append_multiple_styles.exp.json +++ b/testdata/d2oracle/TestMove/append_multiple_styles.exp.json @@ -226,9 +226,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -278,9 +275,6 @@ "value": "d" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -355,9 +349,6 @@ "value": "red" } }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/basic.exp.json b/testdata/d2oracle/TestMove/basic.exp.json index d5bc304f0f..b15b540e39 100644 --- a/testdata/d2oracle/TestMove/basic.exp.json +++ b/testdata/d2oracle/TestMove/basic.exp.json @@ -42,9 +42,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -94,9 +91,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/basic_nested.exp.json b/testdata/d2oracle/TestMove/basic_nested.exp.json index eedb7f0b14..62e1977000 100644 --- a/testdata/d2oracle/TestMove/basic_nested.exp.json +++ b/testdata/d2oracle/TestMove/basic_nested.exp.json @@ -71,9 +71,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -123,9 +120,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -173,9 +167,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/basic_out_of_container.exp.json b/testdata/d2oracle/TestMove/basic_out_of_container.exp.json index 2c7374d42f..22381d85e1 100644 --- a/testdata/d2oracle/TestMove/basic_out_of_container.exp.json +++ b/testdata/d2oracle/TestMove/basic_out_of_container.exp.json @@ -65,9 +65,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -117,9 +114,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -167,9 +161,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/between_containers.exp.json b/testdata/d2oracle/TestMove/between_containers.exp.json index a2afc38ce3..65a69a9bf3 100644 --- a/testdata/d2oracle/TestMove/between_containers.exp.json +++ b/testdata/d2oracle/TestMove/between_containers.exp.json @@ -94,9 +94,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -146,9 +143,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -196,9 +190,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -246,9 +237,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/chain_connected_nested.exp.json b/testdata/d2oracle/TestMove/chain_connected_nested.exp.json index 895fc45264..c3a49a0d4d 100644 --- a/testdata/d2oracle/TestMove/chain_connected_nested.exp.json +++ b/testdata/d2oracle/TestMove/chain_connected_nested.exp.json @@ -125,9 +125,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -163,9 +160,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -200,9 +194,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -272,9 +263,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -342,9 +330,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -392,9 +377,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.exp.json b/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.exp.json index c13d5bc269..b769353e05 100644 --- a/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.exp.json +++ b/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.exp.json @@ -113,9 +113,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -151,9 +148,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -188,9 +182,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -251,9 +242,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -312,9 +300,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -382,9 +367,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -432,9 +414,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/connected_nested.exp.json b/testdata/d2oracle/TestMove/connected_nested.exp.json index 083ed1186a..47015323e3 100644 --- a/testdata/d2oracle/TestMove/connected_nested.exp.json +++ b/testdata/d2oracle/TestMove/connected_nested.exp.json @@ -88,9 +88,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -126,9 +123,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -178,9 +172,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -228,9 +219,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -278,9 +266,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/container_near.exp.json b/testdata/d2oracle/TestMove/container_near.exp.json index 2f81f37664..64a272e471 100644 --- a/testdata/d2oracle/TestMove/container_near.exp.json +++ b/testdata/d2oracle/TestMove/container_near.exp.json @@ -196,9 +196,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -248,9 +245,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -298,9 +292,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": { "range": "d2/testdata/d2oracle/TestMove/container_near.d2,2:10:22-2:15:27", "path": [ @@ -396,9 +387,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -457,9 +445,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -507,9 +492,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -557,9 +539,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/edge_across_containers.exp.json b/testdata/d2oracle/TestMove/edge_across_containers.exp.json index 148750b0a2..f06a052bec 100644 --- a/testdata/d2oracle/TestMove/edge_across_containers.exp.json +++ b/testdata/d2oracle/TestMove/edge_across_containers.exp.json @@ -139,9 +139,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -177,9 +174,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -229,9 +223,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -321,9 +312,6 @@ "value": "d" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -393,9 +381,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -443,9 +428,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/edge_basic.exp.json b/testdata/d2oracle/TestMove/edge_basic.exp.json index e14fa2aa91..80e4b270ed 100644 --- a/testdata/d2oracle/TestMove/edge_basic.exp.json +++ b/testdata/d2oracle/TestMove/edge_basic.exp.json @@ -65,9 +65,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -103,9 +100,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -155,9 +149,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -205,9 +196,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/edge_chain_basic.exp.json b/testdata/d2oracle/TestMove/edge_chain_basic.exp.json index 74ef1eafdb..ebe3e5c99c 100644 --- a/testdata/d2oracle/TestMove/edge_chain_basic.exp.json +++ b/testdata/d2oracle/TestMove/edge_chain_basic.exp.json @@ -102,9 +102,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -140,9 +137,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -177,9 +171,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -229,9 +220,6 @@ "value": "d" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -299,9 +287,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -349,9 +334,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/edge_chain_circular.exp.json b/testdata/d2oracle/TestMove/edge_chain_circular.exp.json index 81c8990a63..f2bd3ba19f 100644 --- a/testdata/d2oracle/TestMove/edge_chain_circular.exp.json +++ b/testdata/d2oracle/TestMove/edge_chain_circular.exp.json @@ -153,9 +153,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -191,9 +188,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -228,9 +222,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -280,9 +271,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -372,9 +360,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -442,9 +427,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json b/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json index e25272be26..ec4268b341 100644 --- a/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json +++ b/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json @@ -136,9 +136,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -174,9 +171,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -211,9 +205,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -294,9 +285,6 @@ "value": "d" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -355,9 +343,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -425,9 +410,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -475,9 +457,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json b/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json index b4b17bcd43..6638f7c319 100644 --- a/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json +++ b/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json @@ -153,9 +153,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -191,9 +188,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -228,9 +222,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -280,9 +271,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -330,9 +318,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -422,9 +407,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -472,9 +454,6 @@ "value": "d" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/edge_conflict.exp.json b/testdata/d2oracle/TestMove/edge_conflict.exp.json index e25202d102..250ef5dc89 100644 --- a/testdata/d2oracle/TestMove/edge_conflict.exp.json +++ b/testdata/d2oracle/TestMove/edge_conflict.exp.json @@ -139,9 +139,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -177,9 +174,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -271,9 +265,6 @@ "value": "y 2" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -332,9 +323,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -393,9 +381,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -443,9 +428,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -493,9 +475,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/edge_into_container.exp.json b/testdata/d2oracle/TestMove/edge_into_container.exp.json index 50f16df223..9e0d32d1af 100644 --- a/testdata/d2oracle/TestMove/edge_into_container.exp.json +++ b/testdata/d2oracle/TestMove/edge_into_container.exp.json @@ -128,9 +128,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -166,9 +163,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -249,9 +243,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -299,9 +290,6 @@ "value": "d" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -360,9 +348,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -410,9 +395,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/edge_nested_basic.exp.json b/testdata/d2oracle/TestMove/edge_nested_basic.exp.json index d971571e81..f15452aa25 100644 --- a/testdata/d2oracle/TestMove/edge_nested_basic.exp.json +++ b/testdata/d2oracle/TestMove/edge_nested_basic.exp.json @@ -94,9 +94,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -132,9 +129,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -184,9 +178,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -234,9 +225,6 @@ "value": "d" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -284,9 +272,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/edge_out_of_container.exp.json b/testdata/d2oracle/TestMove/edge_out_of_container.exp.json index faa341279a..753207e8f0 100644 --- a/testdata/d2oracle/TestMove/edge_out_of_container.exp.json +++ b/testdata/d2oracle/TestMove/edge_out_of_container.exp.json @@ -105,9 +105,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -143,9 +140,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -195,9 +189,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -256,9 +247,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -306,9 +294,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/extend_map.exp.json b/testdata/d2oracle/TestMove/extend_map.exp.json index a270d53d81..013d862d09 100644 --- a/testdata/d2oracle/TestMove/extend_map.exp.json +++ b/testdata/d2oracle/TestMove/extend_map.exp.json @@ -152,9 +152,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -224,9 +221,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -274,9 +268,6 @@ "value": "e" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -324,9 +315,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -374,9 +362,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/extend_stationary_path.exp.json b/testdata/d2oracle/TestMove/extend_stationary_path.exp.json index de52ee3a2d..bb1f992fdc 100644 --- a/testdata/d2oracle/TestMove/extend_stationary_path.exp.json +++ b/testdata/d2oracle/TestMove/extend_stationary_path.exp.json @@ -145,9 +145,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -239,9 +236,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -331,9 +325,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -423,9 +414,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/flat_between_containers.exp.json b/testdata/d2oracle/TestMove/flat_between_containers.exp.json index 1531b4b61f..5ffa855d07 100644 --- a/testdata/d2oracle/TestMove/flat_between_containers.exp.json +++ b/testdata/d2oracle/TestMove/flat_between_containers.exp.json @@ -94,9 +94,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -146,9 +143,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -196,9 +190,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -246,9 +237,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/flat_merge.exp.json b/testdata/d2oracle/TestMove/flat_merge.exp.json index 46b39334d9..6f058bf600 100644 --- a/testdata/d2oracle/TestMove/flat_merge.exp.json +++ b/testdata/d2oracle/TestMove/flat_merge.exp.json @@ -127,9 +127,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -179,9 +176,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -229,9 +223,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -279,9 +270,6 @@ "value": "meow" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -329,9 +317,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/flat_middle_container.exp.json b/testdata/d2oracle/TestMove/flat_middle_container.exp.json index 5eb36003b3..a02d287e7b 100644 --- a/testdata/d2oracle/TestMove/flat_middle_container.exp.json +++ b/testdata/d2oracle/TestMove/flat_middle_container.exp.json @@ -105,9 +105,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -168,9 +165,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -229,9 +223,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -279,9 +270,6 @@ "value": "d" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -329,9 +317,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/flat_nested_merge.exp.json b/testdata/d2oracle/TestMove/flat_nested_merge.exp.json index 9720a61e8f..dbbe76c0d0 100644 --- a/testdata/d2oracle/TestMove/flat_nested_merge.exp.json +++ b/testdata/d2oracle/TestMove/flat_nested_merge.exp.json @@ -183,9 +183,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -268,9 +265,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -351,9 +345,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -434,9 +425,6 @@ "value": "d" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -517,9 +505,6 @@ "value": "e" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -578,9 +563,6 @@ "value": "p" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -639,9 +621,6 @@ "value": "q" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -711,9 +690,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -783,9 +759,6 @@ "value": "m" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -855,9 +828,6 @@ "value": "o" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -905,9 +875,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/flat_nested_merge_multiple_refs.exp.json b/testdata/d2oracle/TestMove/flat_nested_merge_multiple_refs.exp.json index fb0af04bbc..001c5db562 100644 --- a/testdata/d2oracle/TestMove/flat_nested_merge_multiple_refs.exp.json +++ b/testdata/d2oracle/TestMove/flat_nested_merge_multiple_refs.exp.json @@ -281,9 +281,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -428,9 +425,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -584,9 +578,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -740,9 +731,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -790,9 +778,6 @@ "value": "d" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -840,9 +825,6 @@ "value": "e" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -890,9 +872,6 @@ "value": "f" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -940,9 +919,6 @@ "value": "g" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -1023,9 +999,6 @@ "value": "q" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/flat_reparent_with_map_value.exp.json b/testdata/d2oracle/TestMove/flat_reparent_with_map_value.exp.json index 0bea45bb28..dfca9d6027 100644 --- a/testdata/d2oracle/TestMove/flat_reparent_with_map_value.exp.json +++ b/testdata/d2oracle/TestMove/flat_reparent_with_map_value.exp.json @@ -104,9 +104,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -156,9 +153,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -206,9 +200,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "hexagon" diff --git a/testdata/d2oracle/TestMove/flat_reparent_with_mixed_map_value.exp.json b/testdata/d2oracle/TestMove/flat_reparent_with_mixed_map_value.exp.json index f5609d3345..ac221c5733 100644 --- a/testdata/d2oracle/TestMove/flat_reparent_with_mixed_map_value.exp.json +++ b/testdata/d2oracle/TestMove/flat_reparent_with_mixed_map_value.exp.json @@ -145,9 +145,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -197,9 +194,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -247,9 +241,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -297,9 +288,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "hexagon" diff --git a/testdata/d2oracle/TestMove/flat_reparent_with_value.exp.json b/testdata/d2oracle/TestMove/flat_reparent_with_value.exp.json index dcb36870e5..87493703a3 100644 --- a/testdata/d2oracle/TestMove/flat_reparent_with_value.exp.json +++ b/testdata/d2oracle/TestMove/flat_reparent_with_value.exp.json @@ -75,9 +75,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -127,9 +124,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -177,9 +171,6 @@ "value": "yo" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/flat_style.exp.json b/testdata/d2oracle/TestMove/flat_style.exp.json index 2f790aa886..0ee95a436d 100644 --- a/testdata/d2oracle/TestMove/flat_style.exp.json +++ b/testdata/d2oracle/TestMove/flat_style.exp.json @@ -154,9 +154,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -206,9 +203,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -327,9 +321,6 @@ "value": "black" } }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/full_edge_slice.exp.json b/testdata/d2oracle/TestMove/full_edge_slice.exp.json index 536cbf6e93..4f326348f2 100644 --- a/testdata/d2oracle/TestMove/full_edge_slice.exp.json +++ b/testdata/d2oracle/TestMove/full_edge_slice.exp.json @@ -208,9 +208,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -246,9 +243,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -283,9 +277,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -366,9 +357,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -416,9 +404,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -517,9 +502,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -598,9 +580,6 @@ "value": "d" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/full_slice.exp.json b/testdata/d2oracle/TestMove/full_slice.exp.json index 90494bfcd5..337f235908 100644 --- a/testdata/d2oracle/TestMove/full_slice.exp.json +++ b/testdata/d2oracle/TestMove/full_slice.exp.json @@ -94,9 +94,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -146,9 +143,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -196,9 +190,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -246,9 +237,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/gnarly_1.exp.json b/testdata/d2oracle/TestMove/gnarly_1.exp.json index f147a70081..6b23f4c589 100644 --- a/testdata/d2oracle/TestMove/gnarly_1.exp.json +++ b/testdata/d2oracle/TestMove/gnarly_1.exp.json @@ -352,9 +352,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -390,9 +387,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -427,9 +421,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -464,9 +455,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -538,9 +526,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -610,9 +595,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -682,9 +664,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -794,9 +773,6 @@ "value": "d" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -866,9 +842,6 @@ "value": "e" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -938,9 +911,6 @@ "value": "f" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -988,9 +958,6 @@ "value": "meow" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -1100,9 +1067,6 @@ "value": "eyy" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -1181,9 +1145,6 @@ "value": "q" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -1242,9 +1203,6 @@ "value": "p" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -1303,9 +1261,6 @@ "value": "q" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -1364,9 +1319,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/hoist_container_children.exp.json b/testdata/d2oracle/TestMove/hoist_container_children.exp.json index d4f476a869..c99804d097 100644 --- a/testdata/d2oracle/TestMove/hoist_container_children.exp.json +++ b/testdata/d2oracle/TestMove/hoist_container_children.exp.json @@ -117,9 +117,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -169,9 +166,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -219,9 +213,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -269,9 +260,6 @@ "value": "d" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -319,9 +307,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/into_container_existing_map.exp.json b/testdata/d2oracle/TestMove/into_container_existing_map.exp.json index 9ef59fc997..472a2ee027 100644 --- a/testdata/d2oracle/TestMove/into_container_existing_map.exp.json +++ b/testdata/d2oracle/TestMove/into_container_existing_map.exp.json @@ -94,9 +94,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -146,9 +143,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -196,9 +190,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -246,9 +237,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/into_container_nonexisting_map.exp.json b/testdata/d2oracle/TestMove/into_container_nonexisting_map.exp.json index 9e23bee321..0bde251795 100644 --- a/testdata/d2oracle/TestMove/into_container_nonexisting_map.exp.json +++ b/testdata/d2oracle/TestMove/into_container_nonexisting_map.exp.json @@ -71,9 +71,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -123,9 +120,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -173,9 +167,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/into_container_with_flat_keys.exp.json b/testdata/d2oracle/TestMove/into_container_with_flat_keys.exp.json index 6a6fc36081..53318f42da 100644 --- a/testdata/d2oracle/TestMove/into_container_with_flat_keys.exp.json +++ b/testdata/d2oracle/TestMove/into_container_with_flat_keys.exp.json @@ -205,9 +205,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -257,9 +254,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -317,9 +311,6 @@ "value": "#FFFFFF" } }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/into_container_with_flat_style.exp.json b/testdata/d2oracle/TestMove/into_container_with_flat_style.exp.json index 404a9c6756..377783a8f0 100644 --- a/testdata/d2oracle/TestMove/into_container_with_flat_style.exp.json +++ b/testdata/d2oracle/TestMove/into_container_with_flat_style.exp.json @@ -111,9 +111,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -167,9 +164,6 @@ "value": "5" } }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -217,9 +211,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/map_transplant.exp.json b/testdata/d2oracle/TestMove/map_transplant.exp.json index 319d753175..fdeece5925 100644 --- a/testdata/d2oracle/TestMove/map_transplant.exp.json +++ b/testdata/d2oracle/TestMove/map_transplant.exp.json @@ -214,9 +214,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -266,9 +263,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -316,9 +310,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -366,9 +357,6 @@ "value": "d" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -420,9 +408,6 @@ "value": "0.4" } }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/map_with_label.exp.json b/testdata/d2oracle/TestMove/map_with_label.exp.json index 517d545567..bdd5f2c3de 100644 --- a/testdata/d2oracle/TestMove/map_with_label.exp.json +++ b/testdata/d2oracle/TestMove/map_with_label.exp.json @@ -104,9 +104,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -156,9 +153,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -206,9 +200,6 @@ "value": "d" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -256,9 +247,6 @@ "value": "yo" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/merge_nested_maps.exp.json b/testdata/d2oracle/TestMove/merge_nested_maps.exp.json index 500e7dbda4..0ebaafa78f 100644 --- a/testdata/d2oracle/TestMove/merge_nested_maps.exp.json +++ b/testdata/d2oracle/TestMove/merge_nested_maps.exp.json @@ -265,9 +265,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -317,9 +314,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -471,9 +465,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -532,9 +523,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -613,9 +601,6 @@ "value": "d" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -685,9 +670,6 @@ "value": "e" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -757,9 +739,6 @@ "value": "g" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -807,9 +786,6 @@ "value": "o" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -857,9 +833,6 @@ "value": "k" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/merge_reserved.exp.json b/testdata/d2oracle/TestMove/merge_reserved.exp.json index 4f9329d200..2d2043a013 100644 --- a/testdata/d2oracle/TestMove/merge_reserved.exp.json +++ b/testdata/d2oracle/TestMove/merge_reserved.exp.json @@ -256,9 +256,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -308,9 +305,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -451,9 +445,6 @@ "value": "hi" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -512,9 +503,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -573,9 +561,6 @@ "value": "e" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -634,9 +619,6 @@ "value": "g" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -684,9 +666,6 @@ "value": "k" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/middle_container.exp.json b/testdata/d2oracle/TestMove/middle_container.exp.json index 9432a5f71d..ef2e9c413c 100644 --- a/testdata/d2oracle/TestMove/middle_container.exp.json +++ b/testdata/d2oracle/TestMove/middle_container.exp.json @@ -94,9 +94,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -146,9 +143,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -196,9 +190,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -246,9 +237,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/move_container_children.exp.json b/testdata/d2oracle/TestMove/move_container_children.exp.json index bfb7ece7a5..dc9f8d8dc6 100644 --- a/testdata/d2oracle/TestMove/move_container_children.exp.json +++ b/testdata/d2oracle/TestMove/move_container_children.exp.json @@ -140,9 +140,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -192,9 +189,6 @@ "value": "p" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -242,9 +236,6 @@ "value": "q" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -292,9 +283,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -342,9 +330,6 @@ "value": "d" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -392,9 +377,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/move_container_conflict_children.exp.json b/testdata/d2oracle/TestMove/move_container_conflict_children.exp.json index 5f1139bece..4c48518348 100644 --- a/testdata/d2oracle/TestMove/move_container_conflict_children.exp.json +++ b/testdata/d2oracle/TestMove/move_container_conflict_children.exp.json @@ -140,9 +140,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -192,9 +189,6 @@ "value": "a 2" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -242,9 +236,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -292,9 +283,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -342,9 +330,6 @@ "value": "d" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -392,9 +377,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/move_into_key_with_value.exp.json b/testdata/d2oracle/TestMove/move_into_key_with_value.exp.json index 3a7afab56a..7c657d924f 100644 --- a/testdata/d2oracle/TestMove/move_into_key_with_value.exp.json +++ b/testdata/d2oracle/TestMove/move_into_key_with_value.exp.json @@ -81,9 +81,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -133,9 +130,6 @@ "value": "meow" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -183,9 +177,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/move_out_of_edge.exp.json b/testdata/d2oracle/TestMove/move_out_of_edge.exp.json index 1a85348549..99efcb3e8d 100644 --- a/testdata/d2oracle/TestMove/move_out_of_edge.exp.json +++ b/testdata/d2oracle/TestMove/move_out_of_edge.exp.json @@ -121,9 +121,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -159,9 +156,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -222,9 +216,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -283,9 +274,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -355,9 +343,6 @@ "value": "d" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -427,9 +412,6 @@ "value": "e" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -499,9 +481,6 @@ "value": "f" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -549,9 +528,6 @@ "value": "q" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/move_out_of_nested_edge.exp.json b/testdata/d2oracle/TestMove/move_out_of_nested_edge.exp.json index 6b2472b2f9..ba86c5f1db 100644 --- a/testdata/d2oracle/TestMove/move_out_of_nested_edge.exp.json +++ b/testdata/d2oracle/TestMove/move_out_of_nested_edge.exp.json @@ -161,9 +161,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -199,9 +196,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -262,9 +256,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -323,9 +314,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -426,9 +414,6 @@ "value": "d" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -529,9 +514,6 @@ "value": "e" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -601,9 +583,6 @@ "value": "f" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -651,9 +630,6 @@ "value": "q" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/multiple_nesting_levels.exp.json b/testdata/d2oracle/TestMove/multiple_nesting_levels.exp.json index d6a478550f..45c0f7ac64 100644 --- a/testdata/d2oracle/TestMove/multiple_nesting_levels.exp.json +++ b/testdata/d2oracle/TestMove/multiple_nesting_levels.exp.json @@ -276,9 +276,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -381,9 +378,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -526,9 +520,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -691,9 +682,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -741,9 +729,6 @@ "value": "g" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -791,9 +776,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -863,9 +845,6 @@ "value": "d" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -946,9 +925,6 @@ "value": "f" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/near.exp.json b/testdata/d2oracle/TestMove/near.exp.json index 8b416ca8f8..d1aac8e9b1 100644 --- a/testdata/d2oracle/TestMove/near.exp.json +++ b/testdata/d2oracle/TestMove/near.exp.json @@ -133,9 +133,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -185,9 +182,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": { "range": "d2/testdata/d2oracle/TestMove/near.d2,1:8:13-1:11:16", "path": [ @@ -308,9 +302,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/nhooyr_one.exp.json b/testdata/d2oracle/TestMove/nhooyr_one.exp.json index 25afb96ad5..004758cd52 100644 --- a/testdata/d2oracle/TestMove/nhooyr_one.exp.json +++ b/testdata/d2oracle/TestMove/nhooyr_one.exp.json @@ -123,9 +123,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -175,9 +172,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -225,9 +219,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -275,9 +266,6 @@ "value": "d" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -325,9 +313,6 @@ "value": "q" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/nhooyr_two.exp.json b/testdata/d2oracle/TestMove/nhooyr_two.exp.json index c960f5b10a..1855b26dd8 100644 --- a/testdata/d2oracle/TestMove/nhooyr_two.exp.json +++ b/testdata/d2oracle/TestMove/nhooyr_two.exp.json @@ -169,9 +169,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -207,9 +204,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -259,9 +253,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -309,9 +300,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -359,9 +347,6 @@ "value": "meow" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -409,9 +394,6 @@ "value": "d" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -459,9 +441,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -509,9 +488,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/parentheses.exp.json b/testdata/d2oracle/TestMove/parentheses.exp.json index 5a3abfd86f..18dd78d448 100644 --- a/testdata/d2oracle/TestMove/parentheses.exp.json +++ b/testdata/d2oracle/TestMove/parentheses.exp.json @@ -104,9 +104,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -142,9 +139,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -194,9 +188,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -275,9 +266,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -336,9 +324,6 @@ "value": "y (z)" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/partial_edge_slice.exp.json b/testdata/d2oracle/TestMove/partial_edge_slice.exp.json index fc2de799ab..d65ed6f61d 100644 --- a/testdata/d2oracle/TestMove/partial_edge_slice.exp.json +++ b/testdata/d2oracle/TestMove/partial_edge_slice.exp.json @@ -111,9 +111,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -149,9 +146,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -201,9 +195,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -271,9 +262,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -321,9 +309,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/partial_slice.exp.json b/testdata/d2oracle/TestMove/partial_slice.exp.json index f86f1b7ea6..ae724b8777 100644 --- a/testdata/d2oracle/TestMove/partial_slice.exp.json +++ b/testdata/d2oracle/TestMove/partial_slice.exp.json @@ -65,9 +65,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -117,9 +114,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -167,9 +161,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/rename_2.exp.json b/testdata/d2oracle/TestMove/rename_2.exp.json index 4d7fa797f3..b8f7bd85a6 100644 --- a/testdata/d2oracle/TestMove/rename_2.exp.json +++ b/testdata/d2oracle/TestMove/rename_2.exp.json @@ -140,9 +140,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -192,9 +189,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -242,9 +236,6 @@ "value": "y 2" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -292,9 +283,6 @@ "value": "b 2" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -342,9 +330,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -392,9 +377,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/reuse_map.exp.json b/testdata/d2oracle/TestMove/reuse_map.exp.json index 752d29b850..fc588be569 100644 --- a/testdata/d2oracle/TestMove/reuse_map.exp.json +++ b/testdata/d2oracle/TestMove/reuse_map.exp.json @@ -157,9 +157,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -209,9 +206,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -290,9 +284,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -340,9 +331,6 @@ "value": "hey" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -390,9 +378,6 @@ "value": "k" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -451,9 +436,6 @@ "value": "yo" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/slice_style.exp.json b/testdata/d2oracle/TestMove/slice_style.exp.json index dbf7b317c3..5faba70e08 100644 --- a/testdata/d2oracle/TestMove/slice_style.exp.json +++ b/testdata/d2oracle/TestMove/slice_style.exp.json @@ -109,9 +109,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -161,9 +158,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -254,9 +248,6 @@ "Fragment": "", "RawFragment": "" }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/underscore_children.exp.json b/testdata/d2oracle/TestMove/underscore_children.exp.json index 31620a414e..0fcedfa8b1 100644 --- a/testdata/d2oracle/TestMove/underscore_children.exp.json +++ b/testdata/d2oracle/TestMove/underscore_children.exp.json @@ -105,9 +105,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -157,9 +154,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -238,9 +232,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/underscore_edge_children.exp.json b/testdata/d2oracle/TestMove/underscore_edge_children.exp.json index 83012671ee..1b85cac853 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_children.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_children.exp.json @@ -128,9 +128,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -166,9 +163,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -218,9 +212,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -299,9 +290,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -349,9 +337,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json index 9364f6af06..9acd8d3913 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json @@ -94,9 +94,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -132,9 +129,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -184,9 +178,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -234,9 +225,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -284,9 +272,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json index 69e593af6d..077302a940 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json @@ -105,9 +105,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -143,9 +140,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -195,9 +189,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -276,9 +267,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -337,9 +325,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json index 8e8b3eed15..7c442f9f5e 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json @@ -105,9 +105,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -143,9 +140,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -195,9 +189,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -256,9 +247,6 @@ "value": "d" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -306,9 +294,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json index bb343350a8..2732b7cfd8 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json @@ -94,9 +94,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -132,9 +129,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -184,9 +178,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -234,9 +225,6 @@ "value": "f" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -284,9 +272,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json index ca68c3286f..e91b2f8e36 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json @@ -127,9 +127,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -165,9 +162,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -217,9 +211,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -320,9 +311,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -392,9 +380,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/underscore_edge_split.exp.json b/testdata/d2oracle/TestMove/underscore_edge_split.exp.json index f0a47c4d6e..712405d97c 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_split.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_split.exp.json @@ -157,9 +157,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -195,9 +192,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -247,9 +241,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -297,9 +288,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -358,9 +346,6 @@ "value": "f" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -408,9 +393,6 @@ "value": "yo" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -458,9 +440,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/underscore_merge.exp.json b/testdata/d2oracle/TestMove/underscore_merge.exp.json index 473ded4478..9dca613fa6 100644 --- a/testdata/d2oracle/TestMove/underscore_merge.exp.json +++ b/testdata/d2oracle/TestMove/underscore_merge.exp.json @@ -137,9 +137,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -189,9 +186,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -239,9 +233,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -309,9 +300,6 @@ "value": "what" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/underscore_split.exp.json b/testdata/d2oracle/TestMove/underscore_split.exp.json index 4830652a83..d612a8983a 100644 --- a/testdata/d2oracle/TestMove/underscore_split.exp.json +++ b/testdata/d2oracle/TestMove/underscore_split.exp.json @@ -134,9 +134,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -186,9 +183,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -236,9 +230,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -297,9 +288,6 @@ "value": "f" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -347,9 +335,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/underscore_split_out.exp.json b/testdata/d2oracle/TestMove/underscore_split_out.exp.json index dba2a4378e..0772fd4cf0 100644 --- a/testdata/d2oracle/TestMove/underscore_split_out.exp.json +++ b/testdata/d2oracle/TestMove/underscore_split_out.exp.json @@ -192,9 +192,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -244,9 +241,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -294,9 +288,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -375,9 +366,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -425,9 +413,6 @@ "value": "e" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -475,9 +460,6 @@ "value": "f" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/underscore_transplant.exp.json b/testdata/d2oracle/TestMove/underscore_transplant.exp.json index 395afec1ef..5795f4ccfa 100644 --- a/testdata/d2oracle/TestMove/underscore_transplant.exp.json +++ b/testdata/d2oracle/TestMove/underscore_transplant.exp.json @@ -94,9 +94,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -146,9 +143,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -196,9 +190,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -246,9 +237,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/unique_name.exp.json b/testdata/d2oracle/TestMove/unique_name.exp.json index 7b14dfb3e6..7f3a853d25 100644 --- a/testdata/d2oracle/TestMove/unique_name.exp.json +++ b/testdata/d2oracle/TestMove/unique_name.exp.json @@ -151,9 +151,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -234,9 +231,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -315,9 +309,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -365,9 +356,6 @@ "value": "b 2" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -415,9 +403,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/unique_name_with_references.exp.json b/testdata/d2oracle/TestMove/unique_name_with_references.exp.json index aa4b375f05..d28c3b420a 100644 --- a/testdata/d2oracle/TestMove/unique_name_with_references.exp.json +++ b/testdata/d2oracle/TestMove/unique_name_with_references.exp.json @@ -174,9 +174,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -212,9 +209,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -295,9 +289,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -345,9 +336,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -426,9 +414,6 @@ "value": "b 2" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -476,9 +461,6 @@ "value": "d" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -526,9 +508,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestRename/arrows.exp.json b/testdata/d2oracle/TestRename/arrows.exp.json index f9c1e49e55..d24981b237 100644 --- a/testdata/d2oracle/TestRename/arrows.exp.json +++ b/testdata/d2oracle/TestRename/arrows.exp.json @@ -65,9 +65,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -103,9 +100,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -155,9 +149,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -205,9 +196,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestRename/arrows_chain.exp.json b/testdata/d2oracle/TestRename/arrows_chain.exp.json index 1789285a58..e4a145958e 100644 --- a/testdata/d2oracle/TestRename/arrows_chain.exp.json +++ b/testdata/d2oracle/TestRename/arrows_chain.exp.json @@ -139,9 +139,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -177,9 +174,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -214,9 +208,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -251,9 +242,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -303,9 +291,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -373,9 +358,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -443,9 +425,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -493,9 +472,6 @@ "value": "q" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestRename/arrows_complex.exp.json b/testdata/d2oracle/TestRename/arrows_complex.exp.json index f9eb8d32e8..3a0b0e7fde 100644 --- a/testdata/d2oracle/TestRename/arrows_complex.exp.json +++ b/testdata/d2oracle/TestRename/arrows_complex.exp.json @@ -119,9 +119,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -157,9 +154,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -220,9 +214,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -281,9 +272,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -331,9 +319,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -381,9 +366,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestRename/arrows_trim_common.exp.json b/testdata/d2oracle/TestRename/arrows_trim_common.exp.json index 4298619f97..82bae106f0 100644 --- a/testdata/d2oracle/TestRename/arrows_trim_common.exp.json +++ b/testdata/d2oracle/TestRename/arrows_trim_common.exp.json @@ -155,9 +155,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -193,9 +190,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -230,9 +224,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -267,9 +258,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -319,9 +307,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -369,9 +354,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -439,9 +421,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -509,9 +488,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -559,9 +535,6 @@ "value": "q" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json b/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json index 9e9dc3c23e..6db44d5f88 100644 --- a/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json +++ b/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json @@ -205,9 +205,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -243,9 +240,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -280,9 +274,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -317,9 +308,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -535,9 +523,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -596,9 +581,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -688,9 +670,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -780,9 +759,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -841,9 +817,6 @@ "value": "q)" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestRename/complex_edge_1.exp.json b/testdata/d2oracle/TestRename/complex_edge_1.exp.json index 564d69ca36..f0f162256a 100644 --- a/testdata/d2oracle/TestRename/complex_edge_1.exp.json +++ b/testdata/d2oracle/TestRename/complex_edge_1.exp.json @@ -119,9 +119,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -157,9 +154,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -220,9 +214,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -281,9 +272,6 @@ "value": "ooo" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -331,9 +319,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -381,9 +366,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestRename/complex_edge_2.exp.json b/testdata/d2oracle/TestRename/complex_edge_2.exp.json index 254b47ba0e..b01784f5fa 100644 --- a/testdata/d2oracle/TestRename/complex_edge_2.exp.json +++ b/testdata/d2oracle/TestRename/complex_edge_2.exp.json @@ -119,9 +119,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -157,9 +154,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -220,9 +214,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -281,9 +272,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -331,9 +319,6 @@ "value": "papa" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -381,9 +366,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestRename/conflict.exp.json b/testdata/d2oracle/TestRename/conflict.exp.json index c6f2ab48ed..5252e87c16 100644 --- a/testdata/d2oracle/TestRename/conflict.exp.json +++ b/testdata/d2oracle/TestRename/conflict.exp.json @@ -65,9 +65,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -117,9 +114,6 @@ "value": "la 2" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -167,9 +161,6 @@ "value": "la" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestRename/conflict_2.exp.json b/testdata/d2oracle/TestRename/conflict_2.exp.json index ef5c0653fc..9861dedd84 100644 --- a/testdata/d2oracle/TestRename/conflict_2.exp.json +++ b/testdata/d2oracle/TestRename/conflict_2.exp.json @@ -116,9 +116,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -190,9 +187,6 @@ "value": "1" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -262,9 +256,6 @@ "value": "2" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -334,9 +325,6 @@ "value": "3" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -384,9 +372,6 @@ "value": "5 2" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -434,9 +419,6 @@ "value": "5" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestRename/conflict_with_dots.exp.json b/testdata/d2oracle/TestRename/conflict_with_dots.exp.json index 254508da43..f7aeff6952 100644 --- a/testdata/d2oracle/TestRename/conflict_with_dots.exp.json +++ b/testdata/d2oracle/TestRename/conflict_with_dots.exp.json @@ -65,9 +65,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -117,9 +114,6 @@ "value": "a.b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -167,9 +161,6 @@ "value": "a.b 2" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestRename/container.exp.json b/testdata/d2oracle/TestRename/container.exp.json index 43557b7b6e..087ca3c1fa 100644 --- a/testdata/d2oracle/TestRename/container.exp.json +++ b/testdata/d2oracle/TestRename/container.exp.json @@ -744,9 +744,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -785,9 +782,6 @@ "value": "furbling, v.:" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -822,9 +816,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -859,9 +850,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -896,9 +884,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -933,9 +918,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -970,9 +952,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -1007,9 +986,6 @@ "value": "furbling, v.:" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -1300,9 +1276,6 @@ "value": "ok" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -1591,9 +1564,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -1871,9 +1841,6 @@ "value": "label" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -1994,9 +1961,6 @@ "value": "p" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -2117,9 +2081,6 @@ "value": "k" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -2209,9 +2170,6 @@ "value": "l" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -2301,9 +2259,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -2351,9 +2306,6 @@ "value": "q" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -2421,9 +2373,6 @@ "value": "+" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -2471,9 +2420,6 @@ "value": "i" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -2521,9 +2467,6 @@ "value": "more" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -2593,9 +2536,6 @@ "value": "ok" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -2665,9 +2605,6 @@ "value": "q" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -2737,9 +2674,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -2798,9 +2732,6 @@ "value": "p" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -2859,9 +2790,6 @@ "value": "k" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestRename/edges.exp.json b/testdata/d2oracle/TestRename/edges.exp.json index 52eaaedb42..58c135e786 100644 --- a/testdata/d2oracle/TestRename/edges.exp.json +++ b/testdata/d2oracle/TestRename/edges.exp.json @@ -409,9 +409,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -447,9 +444,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -484,9 +478,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -521,9 +512,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -558,9 +546,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -595,9 +580,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -632,9 +614,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -808,9 +787,6 @@ "value": "q" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -1002,9 +978,6 @@ "value": "label" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -1094,9 +1067,6 @@ "value": "p" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -1186,9 +1156,6 @@ "value": "k" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -1278,9 +1245,6 @@ "value": "l" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -1370,9 +1334,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -1420,9 +1381,6 @@ "value": "q" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -1490,9 +1448,6 @@ "value": "+" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestRename/flat.exp.json b/testdata/d2oracle/TestRename/flat.exp.json index 7529c1bfbf..7320fc13cf 100644 --- a/testdata/d2oracle/TestRename/flat.exp.json +++ b/testdata/d2oracle/TestRename/flat.exp.json @@ -42,9 +42,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -94,9 +91,6 @@ "value": "---" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestRename/generated.exp.json b/testdata/d2oracle/TestRename/generated.exp.json index b81472c714..3c579e170f 100644 --- a/testdata/d2oracle/TestRename/generated.exp.json +++ b/testdata/d2oracle/TestRename/generated.exp.json @@ -42,9 +42,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -94,9 +91,6 @@ "value": "Square" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestRename/near.exp.json b/testdata/d2oracle/TestRename/near.exp.json index 46e48cb5db..872d8157d3 100644 --- a/testdata/d2oracle/TestRename/near.exp.json +++ b/testdata/d2oracle/TestRename/near.exp.json @@ -104,9 +104,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -156,9 +153,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": { "range": "d2/testdata/d2oracle/TestRename/near.d2,1:8:13-1:9:14", "path": [ @@ -221,9 +215,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestRename/nested.exp.json b/testdata/d2oracle/TestRename/nested.exp.json index 7b8a2afdb2..23130b5ff8 100644 --- a/testdata/d2oracle/TestRename/nested.exp.json +++ b/testdata/d2oracle/TestRename/nested.exp.json @@ -171,9 +171,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -320,9 +317,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -467,9 +461,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -614,9 +605,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -761,9 +749,6 @@ "value": "q" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -875,9 +860,6 @@ "value": "nerve-gift-jingler" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/base.exp.json b/testdata/d2oracle/TestSet/base.exp.json index e71537087f..40751dbdff 100644 --- a/testdata/d2oracle/TestSet/base.exp.json +++ b/testdata/d2oracle/TestSet/base.exp.json @@ -42,9 +42,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -94,9 +91,6 @@ "value": "square" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/block_string_multiline.exp.json b/testdata/d2oracle/TestSet/block_string_multiline.exp.json index d140b1f592..ca6b20dcca 100644 --- a/testdata/d2oracle/TestSet/block_string_multiline.exp.json +++ b/testdata/d2oracle/TestSet/block_string_multiline.exp.json @@ -49,9 +49,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -101,9 +98,6 @@ "value": "# header\nHe has not acquired a fortune; the fortune has acquired him.\nHe has not acquired a fortune; the fortune has acquired him." }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "language": "markdown", "shape": { diff --git a/testdata/d2oracle/TestSet/block_string_oneline.exp.json b/testdata/d2oracle/TestSet/block_string_oneline.exp.json index 67aa09c02d..822f69bc47 100644 --- a/testdata/d2oracle/TestSet/block_string_oneline.exp.json +++ b/testdata/d2oracle/TestSet/block_string_oneline.exp.json @@ -49,9 +49,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -101,9 +98,6 @@ "value": "|||what's up|||" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "language": "markdown", "shape": { diff --git a/testdata/d2oracle/TestSet/edge.exp.json b/testdata/d2oracle/TestSet/edge.exp.json index b6833f268f..1a3dac2383 100644 --- a/testdata/d2oracle/TestSet/edge.exp.json +++ b/testdata/d2oracle/TestSet/edge.exp.json @@ -75,9 +75,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -113,9 +110,6 @@ "value": "two" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -165,9 +159,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -215,9 +206,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/edge_append_style.exp.json b/testdata/d2oracle/TestSet/edge_append_style.exp.json index ca8e4e67c2..5705a640f2 100644 --- a/testdata/d2oracle/TestSet/edge_append_style.exp.json +++ b/testdata/d2oracle/TestSet/edge_append_style.exp.json @@ -110,9 +110,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -152,9 +149,6 @@ "value": "true" } }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -204,9 +198,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -254,9 +245,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/edge_chain.exp.json b/testdata/d2oracle/TestSet/edge_chain.exp.json index b397442d62..9eeadba7e6 100644 --- a/testdata/d2oracle/TestSet/edge_chain.exp.json +++ b/testdata/d2oracle/TestSet/edge_chain.exp.json @@ -202,9 +202,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -243,9 +240,6 @@ "value": "QOTD:\n \"It's been Monday all week today.\"" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -280,9 +274,6 @@ "value": "wsup" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -332,9 +323,6 @@ "value": "oreo" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -402,9 +390,6 @@ "value": "q" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -492,9 +477,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -542,9 +524,6 @@ "value": "p" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json b/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json index f9e3502d85..f075b2f9e5 100644 --- a/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json +++ b/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json @@ -185,9 +185,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -230,9 +227,6 @@ "value": "true" } }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -267,9 +261,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -339,9 +330,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -429,9 +417,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -479,9 +464,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json b/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json index 87b0bf2bc3..0b0854fa39 100644 --- a/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json +++ b/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json @@ -269,9 +269,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -307,9 +304,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -357,9 +351,6 @@ "value": "true" } }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -409,9 +400,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -519,9 +507,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -609,9 +594,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json b/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json index ac67ea0789..58298d21c9 100644 --- a/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json +++ b/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json @@ -225,9 +225,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -270,9 +267,6 @@ "value": "0.4" } }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -307,9 +301,6 @@ "value": "wsup" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -359,9 +350,6 @@ "value": "oreo" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -429,9 +417,6 @@ "value": "q" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -519,9 +504,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -569,9 +551,6 @@ "value": "p" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/edge_index_case.exp.json b/testdata/d2oracle/TestSet/edge_index_case.exp.json index e20fd85692..3149173d35 100644 --- a/testdata/d2oracle/TestSet/edge_index_case.exp.json +++ b/testdata/d2oracle/TestSet/edge_index_case.exp.json @@ -179,9 +179,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -217,9 +214,6 @@ "value": "two" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -254,9 +248,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -306,9 +297,6 @@ "value": "Square" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -356,9 +344,6 @@ "value": "Square" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -406,9 +391,6 @@ "value": "Square 2" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -456,9 +438,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -506,9 +485,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -556,9 +532,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/edge_index_nested.exp.json b/testdata/d2oracle/TestSet/edge_index_nested.exp.json index 6d76011fee..68f7861dee 100644 --- a/testdata/d2oracle/TestSet/edge_index_nested.exp.json +++ b/testdata/d2oracle/TestSet/edge_index_nested.exp.json @@ -104,9 +104,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -142,9 +139,6 @@ "value": "QOTD" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -194,9 +188,6 @@ "value": "oreo" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -244,9 +235,6 @@ "value": "q" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -294,9 +282,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/edge_key_and_key.exp.json b/testdata/d2oracle/TestSet/edge_key_and_key.exp.json index c7ef2bc7b4..4c7fc0bce0 100644 --- a/testdata/d2oracle/TestSet/edge_key_and_key.exp.json +++ b/testdata/d2oracle/TestSet/edge_key_and_key.exp.json @@ -155,9 +155,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -197,9 +194,6 @@ "value": "true" } }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -311,9 +305,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -372,9 +363,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -433,9 +421,6 @@ "value": "c" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/edge_label.exp.json b/testdata/d2oracle/TestSet/edge_label.exp.json index 0db2b36bc5..b43925f2fc 100644 --- a/testdata/d2oracle/TestSet/edge_label.exp.json +++ b/testdata/d2oracle/TestSet/edge_label.exp.json @@ -120,9 +120,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -162,9 +159,6 @@ "value": "true" } }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -214,9 +208,6 @@ "value": "a" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -264,9 +255,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/edge_merge_style.exp.json b/testdata/d2oracle/TestSet/edge_merge_style.exp.json index 74a797871d..72a0a788e3 100644 --- a/testdata/d2oracle/TestSet/edge_merge_style.exp.json +++ b/testdata/d2oracle/TestSet/edge_merge_style.exp.json @@ -157,9 +157,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -202,9 +199,6 @@ "value": "true" } }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -254,9 +248,6 @@ "value": "x" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -304,9 +295,6 @@ "value": "y" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json b/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json index 2cdf17bfa2..f6b9d8b7ba 100644 --- a/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json +++ b/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json @@ -104,9 +104,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -142,9 +139,6 @@ "value": "yo" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -194,9 +188,6 @@ "value": "oreo" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -244,9 +235,6 @@ "value": "q" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -294,9 +282,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json b/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json index f297e4351f..9bae3fe9ee 100644 --- a/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json +++ b/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json @@ -150,9 +150,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -192,9 +189,6 @@ "value": "0.4" } }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -244,9 +238,6 @@ "value": "oreo" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -294,9 +285,6 @@ "value": "q" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -344,9 +332,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/expanded_map_style.exp.json b/testdata/d2oracle/TestSet/expanded_map_style.exp.json index f372863708..4b0dd5e66e 100644 --- a/testdata/d2oracle/TestSet/expanded_map_style.exp.json +++ b/testdata/d2oracle/TestSet/expanded_map_style.exp.json @@ -106,9 +106,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -162,9 +159,6 @@ "value": "0.2" } }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/icon.exp.json b/testdata/d2oracle/TestSet/icon.exp.json index 9198e9d7ae..554bee4a43 100644 --- a/testdata/d2oracle/TestSet/icon.exp.json +++ b/testdata/d2oracle/TestSet/icon.exp.json @@ -81,9 +81,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -145,9 +142,6 @@ "Fragment": "", "RawFragment": "" }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/inline_style.exp.json b/testdata/d2oracle/TestSet/inline_style.exp.json index 677009f9fe..d35e5f5072 100644 --- a/testdata/d2oracle/TestSet/inline_style.exp.json +++ b/testdata/d2oracle/TestSet/inline_style.exp.json @@ -132,9 +132,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -191,9 +188,6 @@ "value": "red" } }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/label.exp.json b/testdata/d2oracle/TestSet/label.exp.json index c4ae1578c2..fa0485116d 100644 --- a/testdata/d2oracle/TestSet/label.exp.json +++ b/testdata/d2oracle/TestSet/label.exp.json @@ -52,9 +52,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -104,9 +101,6 @@ "value": "Always try to do things in chronological order; it's less confusing that way." }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/label_primary.exp.json b/testdata/d2oracle/TestSet/label_primary.exp.json index c336614a13..aa680310a1 100644 --- a/testdata/d2oracle/TestSet/label_primary.exp.json +++ b/testdata/d2oracle/TestSet/label_primary.exp.json @@ -100,9 +100,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -138,9 +135,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -190,9 +184,6 @@ "value": "QOTD: \"It's been Monday all week today.\"" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -240,9 +231,6 @@ "value": "q" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -290,9 +278,6 @@ "value": "z" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/label_replace.exp.json b/testdata/d2oracle/TestSet/label_replace.exp.json index 24314551fd..c4061c8099 100644 --- a/testdata/d2oracle/TestSet/label_replace.exp.json +++ b/testdata/d2oracle/TestSet/label_replace.exp.json @@ -52,9 +52,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -104,9 +101,6 @@ "value": "Always try to do things in chronological order; it's less confusing that way." }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/label_unset.exp.json b/testdata/d2oracle/TestSet/label_unset.exp.json index 32330bce3e..b9105e16a5 100644 --- a/testdata/d2oracle/TestSet/label_unset.exp.json +++ b/testdata/d2oracle/TestSet/label_unset.exp.json @@ -42,9 +42,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -94,9 +91,6 @@ "value": "square" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/map_key_missing.exp.json b/testdata/d2oracle/TestSet/map_key_missing.exp.json index 8661ccf8b6..3a1447d10a 100644 --- a/testdata/d2oracle/TestSet/map_key_missing.exp.json +++ b/testdata/d2oracle/TestSet/map_key_missing.exp.json @@ -98,9 +98,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -136,9 +133,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -208,9 +202,6 @@ "value": "Never offend people with style when you can offend them with substance." }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -258,9 +249,6 @@ "value": "b" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/nested_alex.exp.json b/testdata/d2oracle/TestSet/nested_alex.exp.json index 67bb9769bf..ffbbad25c7 100644 --- a/testdata/d2oracle/TestSet/nested_alex.exp.json +++ b/testdata/d2oracle/TestSet/nested_alex.exp.json @@ -170,9 +170,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -208,9 +205,6 @@ "value": "asdf" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -260,9 +254,6 @@ "value": "do" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -310,9 +301,6 @@ "value": "test" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -380,9 +368,6 @@ "value": "How much of their influence on you is a result of your influence on them?\nA conference is a gathering of important people who singly can do nothing" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/new_style.exp.json b/testdata/d2oracle/TestSet/new_style.exp.json index 6a4a6bce7a..492cc2ff7b 100644 --- a/testdata/d2oracle/TestSet/new_style.exp.json +++ b/testdata/d2oracle/TestSet/new_style.exp.json @@ -88,9 +88,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -144,9 +141,6 @@ "value": "0.2" } }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/replace_shape.exp.json b/testdata/d2oracle/TestSet/replace_shape.exp.json index b1442cc0da..8b1ab7ff58 100644 --- a/testdata/d2oracle/TestSet/replace_shape.exp.json +++ b/testdata/d2oracle/TestSet/replace_shape.exp.json @@ -63,9 +63,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -126,9 +123,6 @@ "value": "square" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "circle" diff --git a/testdata/d2oracle/TestSet/replace_style.exp.json b/testdata/d2oracle/TestSet/replace_style.exp.json index 71795f0c6a..d555df5163 100644 --- a/testdata/d2oracle/TestSet/replace_style.exp.json +++ b/testdata/d2oracle/TestSet/replace_style.exp.json @@ -70,9 +70,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -148,9 +145,6 @@ "value": "0.2" } }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/replace_style_edgecase.exp.json b/testdata/d2oracle/TestSet/replace_style_edgecase.exp.json index 0264b7ac48..88e135c5ed 100644 --- a/testdata/d2oracle/TestSet/replace_style_edgecase.exp.json +++ b/testdata/d2oracle/TestSet/replace_style_edgecase.exp.json @@ -125,9 +125,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -248,9 +245,6 @@ "value": "orange" } }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/shape.exp.json b/testdata/d2oracle/TestSet/shape.exp.json index d374a73020..0e70324e8e 100644 --- a/testdata/d2oracle/TestSet/shape.exp.json +++ b/testdata/d2oracle/TestSet/shape.exp.json @@ -81,9 +81,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -133,9 +130,6 @@ "value": "square" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "square" diff --git a/testdata/d2oracle/TestSet/shape_nested_style_set.exp.json b/testdata/d2oracle/TestSet/shape_nested_style_set.exp.json index 73e57edb92..60376017b6 100644 --- a/testdata/d2oracle/TestSet/shape_nested_style_set.exp.json +++ b/testdata/d2oracle/TestSet/shape_nested_style_set.exp.json @@ -88,9 +88,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -144,9 +141,6 @@ "value": "0.4" } }, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" From 756068bef5693498c377e2f2c2e32964b8475868 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Wed, 1 Mar 2023 10:28:01 -0800 Subject: [PATCH 06/17] save --- d2compiler/compile.go | 57 +- d2compiler/compile_test.go | 19 +- d2graph/d2graph.go | 2 + .../TestCompile/link-board-mixed.exp.json | 625 +++++++++++++++++- .../TestCompile/link-board-nested.exp.json | 379 ++++++++++- .../TestCompile/link-board-not-board.exp.json | 2 +- .../TestCompile/link-board-ok.exp.json | 256 ++++++- .../d2compiler/TestCompile/path_link.exp.json | 2 +- .../d2compiler/TestCompile/url_link.exp.json | 2 +- 9 files changed, 1272 insertions(+), 72 deletions(-) diff --git a/d2compiler/compile.go b/d2compiler/compile.go index 157500317e..4d6aa31378 100644 --- a/d2compiler/compile.go +++ b/d2compiler/compile.go @@ -56,6 +56,10 @@ func compileIR(ast *d2ast.Map, m *d2ir.Map) (*d2graph.Graph, error) { if len(c.err.Errors) > 0 { return nil, c.err } + c.compileBoardLink(g, m) + if len(c.err.Errors) > 0 { + return nil, c.err + } return g, nil } @@ -76,7 +80,6 @@ func (c *compiler) compileBoard(g *d2graph.Graph, ir *d2ir.Map) *d2graph.Graph { g.IsFolderOnly = true } } - c.validateBoardLink(g, ir) return g } @@ -323,6 +326,8 @@ func (c *compiler) compileReserved(attrs *d2graph.Attributes, f *d2ir.Field) { attrs.Link = &d2graph.Scalar{} attrs.Link.Value = scalar.ScalarString() attrs.Link.MapKey = f.LastPrimaryKey() + // TODO I think these all need the rank actually + attrs.Link.MapKey.Range = scalar.GetRange() case "direction": dirs := []string{"up", "down", "right", "left"} if !go2.Contains(dirs, scalar.ScalarString()) { @@ -716,7 +721,7 @@ func (c *compiler) validateNear(g *d2graph.Graph) { } } -func (c *compiler) validateBoardLink(g *d2graph.Graph, ir *d2ir.Map) { +func (c *compiler) compileBoardLink(g *d2graph.Graph, ir *d2ir.Map) { for _, obj := range g.Objects { if obj.Attributes.Link == nil { continue @@ -728,25 +733,59 @@ func (c *compiler) validateBoardLink(g *d2graph.Graph, ir *d2ir.Map) { continue } - // If the keyword is not another board, don't validate - // Might just be linking to a local folder switch linkKey.Path[0].Unbox().ScalarString() { + // TODO underscore case "layers", "scenarios", "steps": default: continue } - b := ir.GetField(linkKey.IDA()...) - if b == nil { + obj.LinkedBoard = c.findBoard(g, ir, linkKey.IDA()) + + if obj.LinkedBoard == nil { c.errorf(obj.Attributes.Link.MapKey, "link key %#v to board not found", obj.Attributes.Link.Value) continue } - kind := d2ir.NodeBoardKind(b) - if kind == "" { - c.errorf(obj.Attributes.Link.MapKey, "internal link key %#v is not a top-level board", obj.Attributes.Link.Value) + } +} + +func (c *compiler) findBoard(g *d2graph.Graph, ir *d2ir.Map, ida []string) *d2graph.Graph { + var currType string + for _, p := range ida { + switch p { + case "layers", "scenarios", "steps": + currType = p continue } + var boards []*d2graph.Graph + switch currType { + case "layers": + boards = g.Layers + case "scenarios": + boards = g.Scenarios + case "steps": + boards = g.Steps + default: + return nil + } + currType = "" + + var board *d2graph.Graph + for i, b := range boards { + if b.Name == p { + board = boards[i] + break + } + } + + if board == nil { + return nil + } + + g = board } + + return g } func init() { diff --git a/d2compiler/compile_test.go b/d2compiler/compile_test.go index c88d53abc4..b546d9e648 100644 --- a/d2compiler/compile_test.go +++ b/d2compiler/compile_test.go @@ -2031,8 +2031,13 @@ Chinchillas_Collectibles.chinchilla -> Chinchillas.id`, name: "link-board-ok", text: `x.link: layers.x layers: { - x + x: { + y + } }`, + assertions: func(t *testing.T, g *d2graph.Graph) { + tassert.Equal(t, g.Layers[0].Name, g.Objects[0].LinkedBoard.Name) + }, }, { name: "link-board-mixed", @@ -2050,6 +2055,9 @@ scenarios: { question.style.fill: green } }`, + assertions: func(t *testing.T, g *d2graph.Graph) { + tassert.Equal(t, g.Layers[0].Name, g.Objects[0].LinkedBoard.Name) + }, }, { name: "link-board-not-found", @@ -2066,7 +2074,7 @@ layers: { y } }`, - expErr: `d2/testdata/d2compiler/TestCompile/link-board-not-board.d2:2:9: internal link key "layers.x.y" is not a top-level board`, + expErr: `d2/testdata/d2compiler/TestCompile/link-board-not-board.d2:2:9: link key "layers.x.y" to board not found`, }, { name: "link-board-nested", @@ -2074,10 +2082,15 @@ layers: { layers: { x: { layers: { - x + x: { + hello + } } } }`, + assertions: func(t *testing.T, g *d2graph.Graph) { + tassert.Equal(t, g.Layers[0].Layers[0], g.Objects[0].LinkedBoard) + }, }, } diff --git a/d2graph/d2graph.go b/d2graph/d2graph.go index 265f81c1b9..cc4401abff 100644 --- a/d2graph/d2graph.go +++ b/d2graph/d2graph.go @@ -84,6 +84,8 @@ type Object struct { LabelHeight *int `json:"labelHeight,omitempty"` IconPosition *string `json:"iconPosition,omitempty"` + LinkedBoard *Graph `json:"-"` + Class *d2target.Class `json:"class,omitempty"` SQLTable *d2target.SQLTable `json:"sql_table,omitempty"` diff --git a/testdata/d2compiler/TestCompile/link-board-mixed.exp.json b/testdata/d2compiler/TestCompile/link-board-mixed.exp.json index 2212669e9f..74ce2ccfc6 100644 --- a/testdata/d2compiler/TestCompile/link-board-mixed.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-mixed.exp.json @@ -1,8 +1,9 @@ { "graph": { "name": "", + "isFolderOnly": false, "ast": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,0:0:0-11:1:137", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,0:0:0-13:1:173", "nodes": [ { "map_key": { @@ -197,7 +198,7 @@ }, { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,9:0:115-11:1:137", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,9:0:115-13:1:173", "key": { "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,9:0:115-9:9:124", "path": [ @@ -217,11 +218,11 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,9:11:126-11:0:136", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,9:11:126-13:0:172", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,10:2:130-10:7:135", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,10:2:130-12:3:171", "key": { "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,10:2:130-10:7:135", "path": [ @@ -239,7 +240,68 @@ ] }, "primary": {}, - "value": {} + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,10:9:137-12:2:170", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:2:141-11:28:167", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:2:141-11:21:160", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:2:141-11:10:149", + "value": [ + { + "string": "question", + "raw_string": "question" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:11:150-11:16:155", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:17:156-11:21:160", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:23:162-11:28:167", + "value": [ + { + "string": "green", + "raw_string": "green" + } + ] + } + } + } + } + ] + } + } } } ] @@ -261,9 +323,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -364,8 +423,9 @@ "layers": [ { "name": "cat", + "isFolderOnly": false, "ast": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,0:0:0-11:1:137", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,0:0:0-13:1:173", "nodes": [ { "map_key": { @@ -560,7 +620,7 @@ }, { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,9:0:115-11:1:137", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,9:0:115-13:1:173", "key": { "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,9:0:115-9:9:124", "path": [ @@ -580,11 +640,11 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,9:11:126-11:0:136", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,9:11:126-13:0:172", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,10:2:130-10:7:135", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,10:2:130-12:3:171", "key": { "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,10:2:130-10:7:135", "path": [ @@ -602,7 +662,68 @@ ] }, "primary": {}, - "value": {} + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,10:9:137-12:2:170", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:2:141-11:28:167", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:2:141-11:21:160", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:2:141-11:10:149", + "value": [ + { + "string": "question", + "raw_string": "question" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:11:150-11:16:155", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:17:156-11:21:160", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:23:162-11:28:167", + "value": [ + { + "string": "green", + "raw_string": "green" + } + ] + } + } + } + } + ] + } + } } } ] @@ -624,9 +745,6 @@ "value": "" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -662,9 +780,6 @@ "value": "goes" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "" @@ -714,9 +829,6 @@ "value": "the cat" }, "style": {}, - "link": { - "value": "" - }, "near_key": null, "shape": { "value": "rectangle" @@ -764,8 +876,475 @@ "value": "meeeowwww" }, "style": {}, - "link": { + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": { "value": "" + } + }, + "zIndex": 0 + } + ] + } + ], + "scenarios": [ + { + "name": "green", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,0:0:0-13:1:173", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,0:0:0-0:30:30", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,0:0:0-0:8:8", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,0:0:0-0:8:8", + "value": [ + { + "string": "question", + "raw_string": "question" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "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?" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,1:15:46-1:25:56", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,1:0:31-1:13:44", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,1:0:31-1:8:39", + "value": [ + { + "string": "question", + "raw_string": "question" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,1:9:40-1:13:44", + "value": [ + { + "string": "link", + "raw_string": "link" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,1:15:46-1:25:56", + "value": [ + { + "string": "layers.cat", + "raw_string": "layers.cat" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,3:0:58-7:1:113", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,3:0:58-3:6:64", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,3:0:58-3:6:64", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,3:8:66-7:0:112", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,4:2:70-6:3:111", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,4:2:70-4:5:73", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,4:2:70-4:5:73", + "value": [ + { + "string": "cat", + "raw_string": "cat" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,4:7:75-6:2:110", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:4:81-5:30:107", + "edges": [ + { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:4:81-5:24:101", + "src": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:4:81-5:12:89", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:4:81-5:11:88", + "value": [ + { + "string": "the cat", + "raw_string": "the cat" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:14:91-5:24:101", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:15:92-5:24:101", + "value": [ + { + "string": "meeeowwww", + "raw_string": "meeeowwww" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:26:103-5:30:107", + "value": [ + { + "string": "goes", + "raw_string": "goes" + } + ] + } + } + } + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,9:0:115-13:1:173", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,9:0:115-9:9:124", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,9:0:115-9:9:124", + "value": [ + { + "string": "scenarios", + "raw_string": "scenarios" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,9:11:126-13:0:172", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,10:2:130-12:3:171", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,10:2:130-10:7:135", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,10:2:130-10:7:135", + "value": [ + { + "string": "green", + "raw_string": "green" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,10:9:137-12:2:170", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:2:141-11:28:167", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:2:141-11:21:160", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:2:141-11:10:149", + "value": [ + { + "string": "question", + "raw_string": "question" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:11:150-11:16:155", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:17:156-11:21:160", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:23:162-11:28:167", + "value": [ + { + "string": "green", + "raw_string": "green" + } + ] + } + } + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + }, + "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": "question", + "id_val": "question", + "label_dimensions": { + "width": 0, + "height": 0 + }, + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,0:0:0-0:8:8", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,0:0:0-0:8:8", + "value": [ + { + "string": "question", + "raw_string": "question" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,1:0:31-1:13:44", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,1:0:31-1:8:39", + "value": [ + { + "string": "question", + "raw_string": "question" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,1:9:40-1:13:44", + "value": [ + { + "string": "link", + "raw_string": "link" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:2:141-11:21:160", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:2:141-11:10:149", + "value": [ + { + "string": "question", + "raw_string": "question" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:11:150-11:16:155", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:17:156-11:21:160", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "How does the cat go?" + }, + "style": { + "fill": { + "value": "green" + } + }, + "link": { + "value": "layers.cat" }, "near_key": null, "shape": { diff --git a/testdata/d2compiler/TestCompile/link-board-nested.exp.json b/testdata/d2compiler/TestCompile/link-board-nested.exp.json index 4b6819f02a..d5b6a02cc2 100644 --- a/testdata/d2compiler/TestCompile/link-board-nested.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-nested.exp.json @@ -3,11 +3,11 @@ "name": "", "isFolderOnly": false, "ast": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:0:0-7:1:75", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:0:0-9:1:94", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:0:0-0:25:25", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:8:8-0:25:25", "key": { "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:0:0-0:6:6", "path": [ @@ -51,7 +51,7 @@ }, { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,1:0:26-7:1:75", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,1:0:26-9:1:94", "key": { "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,1:0:26-1:6:32", "path": [ @@ -71,11 +71,11 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,1:8:34-7:0:74", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,1:8:34-9:0:93", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,2:1:37-6:3:73", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,2:1:37-8:3:92", "key": { "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,2:1:37-2:2:38", "path": [ @@ -95,11 +95,11 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,2:4:40-6:2:72", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,2:4:40-8:2:91", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,3:4:46-5:5:69", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,3:4:46-7:5:88", "key": { "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,3:4:46-3:10:52", "path": [ @@ -119,17 +119,17 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,3:12:54-5:4:68", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,3:12:54-7:4:87", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,4:6:62-4:7:63", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,4:3:59-6:4:82", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,4:6:62-4:7:63", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,4:3:59-4:4:60", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,4:6:62-4:7:63", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,4:3:59-4:4:60", "value": [ { "string": "x", @@ -141,7 +141,36 @@ ] }, "primary": {}, - "value": {} + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,4:6:62-6:3:81", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,5:8:72-5:13:77", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,5:8:72-5:13:77", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,5:8:72-5:13:77", + "value": [ + { + "string": "hello", + "raw_string": "hello" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + ] + } + } } } ] @@ -253,13 +282,13 @@ "layers": [ { "name": "x", - "isFolderOnly": false, + "isFolderOnly": true, "ast": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:0:0-7:1:75", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:0:0-9:1:94", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:0:0-0:25:25", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:8:8-0:25:25", "key": { "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:0:0-0:6:6", "path": [ @@ -303,7 +332,7 @@ }, { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,1:0:26-7:1:75", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,1:0:26-9:1:94", "key": { "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,1:0:26-1:6:32", "path": [ @@ -323,11 +352,11 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,1:8:34-7:0:74", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,1:8:34-9:0:93", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,2:1:37-6:3:73", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,2:1:37-8:3:92", "key": { "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,2:1:37-2:2:38", "path": [ @@ -347,11 +376,11 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,2:4:40-6:2:72", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,2:4:40-8:2:91", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,3:4:46-5:5:69", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,3:4:46-7:5:88", "key": { "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,3:4:46-3:10:52", "path": [ @@ -371,17 +400,17 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,3:12:54-5:4:68", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,3:12:54-7:4:87", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,4:6:62-4:7:63", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,4:3:59-6:4:82", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,4:6:62-4:7:63", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,4:3:59-4:4:60", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,4:6:62-4:7:63", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,4:3:59-4:4:60", "value": [ { "string": "x", @@ -393,7 +422,36 @@ ] }, "primary": {}, - "value": {} + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,4:6:62-6:3:81", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,5:8:72-5:13:77", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,5:8:72-5:13:77", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,5:8:72-5:13:77", + "value": [ + { + "string": "hello", + "raw_string": "hello" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + ] + } + } } } ] @@ -439,7 +497,276 @@ "zIndex": 0 }, "edges": null, - "objects": null + "objects": null, + "layers": [ + { + "name": "x", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:0:0-9:1:94", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:8:8-0:25:25", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:0:0-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:2:2-0:6:6", + "value": [ + { + "string": "link", + "raw_string": "link" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:8:8-0:25:25", + "value": [ + { + "string": "layers.x.layers.x", + "raw_string": "layers.x.layers.x" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,1:0:26-9:1:94", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,1:0:26-1:6:32", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,1:0:26-1:6:32", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,1:8:34-9:0:93", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,2:1:37-8:3:92", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,2:1:37-2:2:38", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,2:1:37-2:2:38", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,2:4:40-8:2:91", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,3:4:46-7:5:88", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,3:4:46-3:10:52", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,3:4:46-3:10:52", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,3:12:54-7:4:87", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,4:3:59-6:4:82", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,4:3:59-4:4:60", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,4:3:59-4:4:60", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,4:6:62-6:3:81", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,5:8:72-5:13:77", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,5:8:72-5:13:77", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,5:8:72-5:13:77", + "value": [ + { + "string": "hello", + "raw_string": "hello" + } + ] + } + } + ] + }, + "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": "hello", + "id_val": "hello", + "label_dimensions": { + "width": 0, + "height": 0 + }, + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,5:8:72-5:13:77", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,5:8:72-5:13:77", + "value": [ + { + "string": "hello", + "raw_string": "hello" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "hello" + }, + "style": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": { + "value": "" + } + }, + "zIndex": 0 + } + ] + } + ] } ] }, diff --git a/testdata/d2compiler/TestCompile/link-board-not-board.exp.json b/testdata/d2compiler/TestCompile/link-board-not-board.exp.json index 1885fdb6d3..e37e9b481d 100644 --- a/testdata/d2compiler/TestCompile/link-board-not-board.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-not-board.exp.json @@ -5,7 +5,7 @@ "errs": [ { "range": "d2/testdata/d2compiler/TestCompile/link-board-not-board.d2,1:8:12-1:18:22", - "errmsg": "d2/testdata/d2compiler/TestCompile/link-board-not-board.d2:2:9: internal link key \"layers.x.y\" is not a top-level board" + "errmsg": "d2/testdata/d2compiler/TestCompile/link-board-not-board.d2:2:9: link key \"layers.x.y\" to board not found" } ] } diff --git a/testdata/d2compiler/TestCompile/link-board-ok.exp.json b/testdata/d2compiler/TestCompile/link-board-ok.exp.json index eb07427b94..8a8fec005e 100644 --- a/testdata/d2compiler/TestCompile/link-board-ok.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-ok.exp.json @@ -3,11 +3,11 @@ "name": "", "isFolderOnly": false, "ast": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,0:0:0-3:1:32", + "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,0:0:0-5:1:42", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,0:0:0-0:16:16", + "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,0:8:8-0:16:16", "key": { "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,0:0:0-0:6:6", "path": [ @@ -51,7 +51,7 @@ }, { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,1:0:17-3:1:32", + "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,1:0:17-5:1:42", "key": { "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,1:0:17-1:6:23", "path": [ @@ -71,17 +71,17 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,1:8:25-3:0:31", + "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,1:8:25-5:0:41", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,2:2:29-2:3:30", + "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,2:1:28-4:2:40", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,2:2:29-2:3:30", + "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,2:1:28-2:2:29", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,2:2:29-2:3:30", + "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,2:1:28-2:2:29", "value": [ { "string": "x", @@ -93,7 +93,36 @@ ] }, "primary": {}, - "value": {} + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,2:4:31-4:1:39", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,3:3:36-3:4:37", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,3:3:36-3:4:37", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,3:3:36-3:4:37", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + ] + } + } } } ] @@ -191,6 +220,217 @@ }, "zIndex": 0 } + ], + "layers": [ + { + "name": "x", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,0:0:0-5:1:42", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,0:8:8-0:16:16", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,0:0:0-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,0:2:2-0:6:6", + "value": [ + { + "string": "link", + "raw_string": "link" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,0:8:8-0:16:16", + "value": [ + { + "string": "layers.x", + "raw_string": "layers.x" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,1:0:17-5:1:42", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,1:0:17-1:6:23", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,1:0:17-1:6:23", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,1:8:25-5:0:41", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,2:1:28-4:2:40", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,2:1:28-2:2:29", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,2:1:28-2:2:29", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,2:4:31-4:1:39", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,3:3:36-3:4:37", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,3:3:36-3:4:37", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,3:3:36-3:4:37", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "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": "y", + "id_val": "y", + "label_dimensions": { + "width": 0, + "height": 0 + }, + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,3:3:36-3:4:37", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,3:3:36-3:4:37", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "y" + }, + "style": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": { + "value": "" + } + }, + "zIndex": 0 + } + ] + } ] }, "err": null diff --git a/testdata/d2compiler/TestCompile/path_link.exp.json b/testdata/d2compiler/TestCompile/path_link.exp.json index 9c08d24ad3..84a48a1de4 100644 --- a/testdata/d2compiler/TestCompile/path_link.exp.json +++ b/testdata/d2compiler/TestCompile/path_link.exp.json @@ -31,7 +31,7 @@ "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/path_link.d2,1:2:7-1:39:44", + "range": "d2/testdata/d2compiler/TestCompile/path_link.d2,1:8:13-1:39:44", "key": { "range": "d2/testdata/d2compiler/TestCompile/path_link.d2,1:2:7-1:6:11", "path": [ diff --git a/testdata/d2compiler/TestCompile/url_link.exp.json b/testdata/d2compiler/TestCompile/url_link.exp.json index f800be68e1..f7c0804cb8 100644 --- a/testdata/d2compiler/TestCompile/url_link.exp.json +++ b/testdata/d2compiler/TestCompile/url_link.exp.json @@ -31,7 +31,7 @@ "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/url_link.d2,1:2:7-1:26:31", + "range": "d2/testdata/d2compiler/TestCompile/url_link.d2,1:8:13-1:26:31", "key": { "range": "d2/testdata/d2compiler/TestCompile/url_link.d2,1:2:7-1:6:11", "path": [ From 8e074070d826ef1870fd6092da29ab3002b8f71e Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Wed, 1 Mar 2023 10:43:53 -0800 Subject: [PATCH 07/17] abs id --- d2compiler/compile.go | 1 + d2compiler/compile_test.go | 6 +++--- d2graph/d2graph.go | 25 ++++++++++++++++++++++++- 3 files changed, 28 insertions(+), 4 deletions(-) diff --git a/d2compiler/compile.go b/d2compiler/compile.go index 4d6aa31378..11765c577a 100644 --- a/d2compiler/compile.go +++ b/d2compiler/compile.go @@ -97,6 +97,7 @@ func (c *compiler) compileBoardsField(g *d2graph.Graph, ir *d2ir.Map, fieldName continue } g2 := d2graph.NewGraph() + g2.Parent = g g2.AST = g.AST c.compileBoard(g2, f.Map()) g2.Name = f.Name diff --git a/d2compiler/compile_test.go b/d2compiler/compile_test.go index b546d9e648..a5f3e50226 100644 --- a/d2compiler/compile_test.go +++ b/d2compiler/compile_test.go @@ -2036,7 +2036,7 @@ layers: { } }`, assertions: func(t *testing.T, g *d2graph.Graph) { - tassert.Equal(t, g.Layers[0].Name, g.Objects[0].LinkedBoard.Name) + tassert.Equal(t, ".layers.x", g.Objects[0].LinkedBoard.AbsID()) }, }, { @@ -2056,7 +2056,7 @@ scenarios: { } }`, assertions: func(t *testing.T, g *d2graph.Graph) { - tassert.Equal(t, g.Layers[0].Name, g.Objects[0].LinkedBoard.Name) + tassert.Equal(t, ".layers.cat", g.Objects[0].LinkedBoard.AbsID()) }, }, { @@ -2089,7 +2089,7 @@ layers: { } }`, assertions: func(t *testing.T, g *d2graph.Graph) { - tassert.Equal(t, g.Layers[0].Layers[0], g.Objects[0].LinkedBoard) + tassert.Equal(t, ".layers.x.layers.x", g.Objects[0].LinkedBoard.AbsID()) }, }, } diff --git a/d2graph/d2graph.go b/d2graph/d2graph.go index cc4401abff..1defc43dea 100644 --- a/d2graph/d2graph.go +++ b/d2graph/d2graph.go @@ -28,7 +28,8 @@ const DEFAULT_SHAPE_SIZE = 100. const MIN_SHAPE_SIZE = 5 type Graph struct { - Name string `json:"name"` + Parent *Graph `json:"-"` + Name string `json:"name"` // IsFolderOnly indicates a board or scenario itself makes no modifications from its // base. Folder only boards do not have a render and are used purely for organizing // the board tree. @@ -55,6 +56,28 @@ func NewGraph() *Graph { return d } +func (g *Graph) AbsID() string { + if g.Parent == nil { + return g.Name + } + for _, l := range g.Parent.Layers { + if l.Name == g.Name { + return g.Parent.AbsID() + ".layers." + g.Name + } + } + for _, s := range g.Parent.Scenarios { + if s.Name == g.Name { + return g.Parent.AbsID() + ".scenarios." + g.Name + } + } + for _, s := range g.Parent.Steps { + if s.Name == g.Name { + return g.Parent.AbsID() + ".steps." + g.Name + } + } + return "" +} + // TODO consider having different Scalar types // Right now we'll hold any types in Value and just convert, e.g. floats type Scalar struct { From 5c96ffe6a1c7b302d70de42af0142bf08ec60ebb Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Wed, 1 Mar 2023 11:27:18 -0800 Subject: [PATCH 08/17] save --- d2compiler/compile.go | 26 +- d2compiler/compile_test.go | 35 + .../link-board-underscore-not-found.exp.json | 12 + .../link-board-underscore.exp.json | 1084 +++++++++++++++++ 4 files changed, 1147 insertions(+), 10 deletions(-) create mode 100644 testdata/d2compiler/TestCompile/link-board-underscore-not-found.exp.json create mode 100644 testdata/d2compiler/TestCompile/link-board-underscore.exp.json diff --git a/d2compiler/compile.go b/d2compiler/compile.go index 11765c577a..2e570b589f 100644 --- a/d2compiler/compile.go +++ b/d2compiler/compile.go @@ -56,7 +56,7 @@ func compileIR(ast *d2ast.Map, m *d2ir.Map) (*d2graph.Graph, error) { if len(c.err.Errors) > 0 { return nil, c.err } - c.compileBoardLink(g, m) + c.compileBoardLink(g) if len(c.err.Errors) > 0 { return nil, c.err } @@ -722,7 +722,7 @@ func (c *compiler) validateNear(g *d2graph.Graph) { } } -func (c *compiler) compileBoardLink(g *d2graph.Graph, ir *d2ir.Map) { +func (c *compiler) compileBoardLink(g *d2graph.Graph) { for _, obj := range g.Objects { if obj.Attributes.Link == nil { continue @@ -735,24 +735,34 @@ func (c *compiler) compileBoardLink(g *d2graph.Graph, ir *d2ir.Map) { } switch linkKey.Path[0].Unbox().ScalarString() { - // TODO underscore - case "layers", "scenarios", "steps": + // Starting a link with one of the following means it is targeting a board + case "layers", "scenarios", "steps", "_": default: continue } - obj.LinkedBoard = c.findBoard(g, ir, linkKey.IDA()) + obj.LinkedBoard = c.findBoard(g, linkKey.IDA()) if obj.LinkedBoard == nil { c.errorf(obj.Attributes.Link.MapKey, "link key %#v to board not found", obj.Attributes.Link.Value) continue } } + for _, b := range append(append(g.Layers, g.Scenarios...), g.Steps...) { + c.compileBoardLink(b) + } } -func (c *compiler) findBoard(g *d2graph.Graph, ir *d2ir.Map, ida []string) *d2graph.Graph { +func (c *compiler) findBoard(g *d2graph.Graph, ida []string) *d2graph.Graph { var currType string for _, p := range ida { + if g == nil { + return nil + } + if p == "_" { + g = g.Parent + continue + } switch p { case "layers", "scenarios", "steps": currType = p @@ -779,10 +789,6 @@ func (c *compiler) findBoard(g *d2graph.Graph, ir *d2ir.Map, ida []string) *d2gr } } - if board == nil { - return nil - } - g = board } diff --git a/d2compiler/compile_test.go b/d2compiler/compile_test.go index a5f3e50226..150d6e35c8 100644 --- a/d2compiler/compile_test.go +++ b/d2compiler/compile_test.go @@ -2092,6 +2092,41 @@ layers: { tassert.Equal(t, ".layers.x.layers.x", g.Objects[0].LinkedBoard.AbsID()) }, }, + { + name: "link-board-underscore", + text: `x +layers: { + x: { + yo + layers: { + x: { + hello.link: _._.layers.x + hey.link: _ + } + } + } +}`, + assertions: func(t *testing.T, g *d2graph.Graph) { + tassert.NotNil(t, g.Layers[0].Layers[0].Objects[0].LinkedBoard) + tassert.Equal(t, ".layers.x", g.Layers[0].Layers[0].Objects[0].LinkedBoard.AbsID()) + tassert.Equal(t, ".layers.x", g.Layers[0].Layers[0].Objects[1].LinkedBoard.AbsID()) + }, + }, + { + name: "link-board-underscore-not-found", + text: `x +layers: { + x: { + yo + layers: { + x: { + hello.link: _._._ + } + } + } +}`, + expErr: `d2/testdata/d2compiler/TestCompile/link-board-underscore-not-found.d2:7:17: link key "_._._" to board not found`, + }, } for _, tc := range testCases { diff --git a/testdata/d2compiler/TestCompile/link-board-underscore-not-found.exp.json b/testdata/d2compiler/TestCompile/link-board-underscore-not-found.exp.json new file mode 100644 index 0000000000..b74ef0923c --- /dev/null +++ b/testdata/d2compiler/TestCompile/link-board-underscore-not-found.exp.json @@ -0,0 +1,12 @@ +{ + "graph": null, + "err": { + "ioerr": null, + "errs": [ + { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore-not-found.d2,6:16:62-6:21:67", + "errmsg": "d2/testdata/d2compiler/TestCompile/link-board-underscore-not-found.d2:7:17: link key \"_._._\" to board not found" + } + ] + } +} diff --git a/testdata/d2compiler/TestCompile/link-board-underscore.exp.json b/testdata/d2compiler/TestCompile/link-board-underscore.exp.json new file mode 100644 index 0000000000..4c1a80549e --- /dev/null +++ b/testdata/d2compiler/TestCompile/link-board-underscore.exp.json @@ -0,0 +1,1084 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,0:0:0-11:1:107", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,0:0:0-0:1:1", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,1:0:2-11:1:107", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,1:0:2-1:6:8", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,1:0:2-1:6:8", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,1:8:10-11:0:106", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,2:1:13-10:3:105", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,2:1:13-2:2:14", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,2:1:13-2:2:14", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,2:4:16-10:2:104", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,3:3:21-3:5:23", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,3:3:21-3:5:23", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,3:3:21-3:5:23", + "value": [ + { + "string": "yo", + "raw_string": "yo" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,4:4:28-9:5:101", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,4:4:28-4:10:34", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,4:4:28-4:10:34", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,4:12:36-9:4:100", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,5:3:41-8:4:95", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,5:3:41-5:4:42", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,5:3:41-5:4:42", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,5:6:44-8:3:94", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:16:62-6:28:74", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:4:50-6:14:60", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:4:50-6:9:55", + "value": [ + { + "string": "hello", + "raw_string": "hello" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:10:56-6:14:60", + "value": [ + { + "string": "link", + "raw_string": "link" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:16:62-6:28:74", + "value": [ + { + "string": "_._.layers.x", + "raw_string": "_._.layers.x" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:14:89-7:15:90", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:4:79-7:12:87", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:4:79-7:7:82", + "value": [ + { + "string": "hey", + "raw_string": "hey" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:8:83-7:12:87", + "value": [ + { + "string": "link", + "raw_string": "link" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:14:89-7:15:90", + "value": [ + { + "string": "_", + "raw_string": "_" + } + ] + } + } + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + }, + "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": "x", + "id_val": "x", + "label_dimensions": { + "width": 0, + "height": 0 + }, + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "x" + }, + "style": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": { + "value": "" + } + }, + "zIndex": 0 + } + ], + "layers": [ + { + "name": "x", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,0:0:0-11:1:107", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,0:0:0-0:1:1", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,1:0:2-11:1:107", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,1:0:2-1:6:8", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,1:0:2-1:6:8", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,1:8:10-11:0:106", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,2:1:13-10:3:105", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,2:1:13-2:2:14", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,2:1:13-2:2:14", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,2:4:16-10:2:104", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,3:3:21-3:5:23", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,3:3:21-3:5:23", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,3:3:21-3:5:23", + "value": [ + { + "string": "yo", + "raw_string": "yo" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,4:4:28-9:5:101", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,4:4:28-4:10:34", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,4:4:28-4:10:34", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,4:12:36-9:4:100", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,5:3:41-8:4:95", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,5:3:41-5:4:42", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,5:3:41-5:4:42", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,5:6:44-8:3:94", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:16:62-6:28:74", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:4:50-6:14:60", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:4:50-6:9:55", + "value": [ + { + "string": "hello", + "raw_string": "hello" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:10:56-6:14:60", + "value": [ + { + "string": "link", + "raw_string": "link" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:16:62-6:28:74", + "value": [ + { + "string": "_._.layers.x", + "raw_string": "_._.layers.x" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:14:89-7:15:90", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:4:79-7:12:87", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:4:79-7:7:82", + "value": [ + { + "string": "hey", + "raw_string": "hey" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:8:83-7:12:87", + "value": [ + { + "string": "link", + "raw_string": "link" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:14:89-7:15:90", + "value": [ + { + "string": "_", + "raw_string": "_" + } + ] + } + } + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + }, + "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": "yo", + "id_val": "yo", + "label_dimensions": { + "width": 0, + "height": 0 + }, + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,3:3:21-3:5:23", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,3:3:21-3:5:23", + "value": [ + { + "string": "yo", + "raw_string": "yo" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "yo" + }, + "style": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": { + "value": "" + } + }, + "zIndex": 0 + } + ], + "layers": [ + { + "name": "x", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,0:0:0-11:1:107", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,0:0:0-0:1:1", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,1:0:2-11:1:107", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,1:0:2-1:6:8", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,1:0:2-1:6:8", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,1:8:10-11:0:106", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,2:1:13-10:3:105", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,2:1:13-2:2:14", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,2:1:13-2:2:14", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,2:4:16-10:2:104", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,3:3:21-3:5:23", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,3:3:21-3:5:23", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,3:3:21-3:5:23", + "value": [ + { + "string": "yo", + "raw_string": "yo" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,4:4:28-9:5:101", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,4:4:28-4:10:34", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,4:4:28-4:10:34", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,4:12:36-9:4:100", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,5:3:41-8:4:95", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,5:3:41-5:4:42", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,5:3:41-5:4:42", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,5:6:44-8:3:94", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:16:62-6:28:74", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:4:50-6:14:60", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:4:50-6:9:55", + "value": [ + { + "string": "hello", + "raw_string": "hello" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:10:56-6:14:60", + "value": [ + { + "string": "link", + "raw_string": "link" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:16:62-6:28:74", + "value": [ + { + "string": "_._.layers.x", + "raw_string": "_._.layers.x" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:14:89-7:15:90", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:4:79-7:12:87", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:4:79-7:7:82", + "value": [ + { + "string": "hey", + "raw_string": "hey" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:8:83-7:12:87", + "value": [ + { + "string": "link", + "raw_string": "link" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:14:89-7:15:90", + "value": [ + { + "string": "_", + "raw_string": "_" + } + ] + } + } + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + }, + "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": "hello", + "id_val": "hello", + "label_dimensions": { + "width": 0, + "height": 0 + }, + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:4:50-6:14:60", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:4:50-6:9:55", + "value": [ + { + "string": "hello", + "raw_string": "hello" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:10:56-6:14:60", + "value": [ + { + "string": "link", + "raw_string": "link" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "hello" + }, + "style": {}, + "link": { + "value": "_._.layers.x" + }, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": { + "value": "" + } + }, + "zIndex": 0 + }, + { + "id": "hey", + "id_val": "hey", + "label_dimensions": { + "width": 0, + "height": 0 + }, + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:4:79-7:12:87", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:4:79-7:7:82", + "value": [ + { + "string": "hey", + "raw_string": "hey" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:8:83-7:12:87", + "value": [ + { + "string": "link", + "raw_string": "link" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "hey" + }, + "style": {}, + "link": { + "value": "_" + }, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": { + "value": "" + } + }, + "zIndex": 0 + } + ] + } + ] + } + ] + }, + "err": null +} From 9fd773bbb7d795c3227974c8ef0a9ef0e2866716 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Wed, 1 Mar 2023 11:27:58 -0800 Subject: [PATCH 09/17] save --- d2compiler/compile.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/d2compiler/compile.go b/d2compiler/compile.go index 2e570b589f..0d2529eafd 100644 --- a/d2compiler/compile.go +++ b/d2compiler/compile.go @@ -327,7 +327,7 @@ func (c *compiler) compileReserved(attrs *d2graph.Attributes, f *d2ir.Field) { attrs.Link = &d2graph.Scalar{} attrs.Link.Value = scalar.ScalarString() attrs.Link.MapKey = f.LastPrimaryKey() - // TODO I think these all need the rank actually + // TODO I think all the attributes need the range actually attrs.Link.MapKey.Range = scalar.GetRange() case "direction": dirs := []string{"up", "down", "right", "left"} From 3a9745974c6651f0037cb6a2bc4fa00948ce5851 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Wed, 1 Mar 2023 14:53:58 -0800 Subject: [PATCH 10/17] save --- d2compiler/compile.go | 80 ++- d2compiler/compile_test.go | 28 +- d2graph/d2graph.go | 2 - d2ir/compile.go | 30 + d2ir/d2ir.go | 13 +- .../link-board-key-nested.exp.json | 540 ++++++++++++++++++ .../TestCompile/link-board-mixed.exp.json | 31 +- .../TestCompile/link-board-nested.exp.json | 29 +- .../TestCompile/link-board-ok.exp.json | 20 +- .../link-board-underscore-not-found.exp.json | 4 +- .../link-board-underscore.exp.json | 58 +- .../d2compiler/TestCompile/path_link.exp.json | 11 +- .../d2compiler/TestCompile/url_link.exp.json | 11 +- 13 files changed, 712 insertions(+), 145 deletions(-) create mode 100644 testdata/d2compiler/TestCompile/link-board-key-nested.exp.json diff --git a/d2compiler/compile.go b/d2compiler/compile.go index 0d2529eafd..9afa11e6cb 100644 --- a/d2compiler/compile.go +++ b/d2compiler/compile.go @@ -56,7 +56,7 @@ func compileIR(ast *d2ast.Map, m *d2ir.Map) (*d2graph.Graph, error) { if len(c.err.Errors) > 0 { return nil, c.err } - c.compileBoardLink(g) + c.validateBoardLinks(g) if len(c.err.Errors) > 0 { return nil, c.err } @@ -722,7 +722,7 @@ func (c *compiler) validateNear(g *d2graph.Graph) { } } -func (c *compiler) compileBoardLink(g *d2graph.Graph) { +func (c *compiler) validateBoardLinks(g *d2graph.Graph) { for _, obj := range g.Objects { if obj.Attributes.Link == nil { continue @@ -734,65 +734,55 @@ func (c *compiler) compileBoardLink(g *d2graph.Graph) { continue } - switch linkKey.Path[0].Unbox().ScalarString() { - // Starting a link with one of the following means it is targeting a board - case "layers", "scenarios", "steps", "_": - default: + if linkKey.Path[0].Unbox().ScalarString() != "root" { continue } - obj.LinkedBoard = c.findBoard(g, linkKey.IDA()) - - if obj.LinkedBoard == nil { - c.errorf(obj.Attributes.Link.MapKey, "link key %#v to board not found", obj.Attributes.Link.Value) + root := g + for root.Parent != nil { + root = root.Parent + } + if !hasBoard(root, linkKey.IDA()) { + c.errorf(obj.Attributes.Link.MapKey, "link key to board not found") continue } } for _, b := range append(append(g.Layers, g.Scenarios...), g.Steps...) { - c.compileBoardLink(b) + c.validateBoardLinks(b) } } -func (c *compiler) findBoard(g *d2graph.Graph, ida []string) *d2graph.Graph { - var currType string - for _, p := range ida { - if g == nil { - return nil - } - if p == "_" { - g = g.Parent +func hasBoard(root *d2graph.Graph, ida []string) bool { + for i := 0; i < len(ida); i += 2 { + id := ida[i] + if id == "root" { continue } - switch p { - case "layers", "scenarios", "steps": - currType = p - continue + if i == len(ida)-1 { + return root.Name == id } - var boards []*d2graph.Graph - switch currType { - case "layers": - boards = g.Layers - case "scenarios": - boards = g.Scenarios - case "steps": - boards = g.Steps - default: - return nil - } - currType = "" - - var board *d2graph.Graph - for i, b := range boards { - if b.Name == p { - board = boards[i] - break + nextID := ida[i+1] + if id == "layers" { + for _, b := range root.Layers { + if b.Name == nextID { + return hasBoard(b, ida[i:]) + } + } + } else if id == "scenarios" { + for _, b := range root.Scenarios { + if b.Name == nextID { + return hasBoard(b, ida[i:]) + } + } + } else if id == "steps" { + for _, b := range root.Steps { + if b.Name == nextID { + return hasBoard(b, ida[i:]) + } } } - - g = board } - - return g + return false } func init() { diff --git a/d2compiler/compile_test.go b/d2compiler/compile_test.go index 150d6e35c8..8a6f66cd17 100644 --- a/d2compiler/compile_test.go +++ b/d2compiler/compile_test.go @@ -2036,7 +2036,7 @@ layers: { } }`, assertions: func(t *testing.T, g *d2graph.Graph) { - tassert.Equal(t, ".layers.x", g.Objects[0].LinkedBoard.AbsID()) + tassert.Equal(t, "root.layers.x", g.Objects[0].Attributes.Link.Value) }, }, { @@ -2056,7 +2056,7 @@ scenarios: { } }`, assertions: func(t *testing.T, g *d2graph.Graph) { - tassert.Equal(t, ".layers.cat", g.Objects[0].LinkedBoard.AbsID()) + tassert.Equal(t, "root.layers.cat", g.Objects[0].Attributes.Link.Value) }, }, { @@ -2089,7 +2089,21 @@ layers: { } }`, assertions: func(t *testing.T, g *d2graph.Graph) { - tassert.Equal(t, ".layers.x.layers.x", g.Objects[0].LinkedBoard.AbsID()) + tassert.Equal(t, "root.layers.x.layers.x", g.Objects[0].Attributes.Link.Value) + }, + }, + { + name: "link-board-key-nested", + text: `x: { + y.link: layers.x +} +layers: { + x: { + yo + } +}`, + assertions: func(t *testing.T, g *d2graph.Graph) { + tassert.Equal(t, "root.layers.x", g.Objects[1].Attributes.Link.Value) }, }, { @@ -2107,9 +2121,9 @@ layers: { } }`, assertions: func(t *testing.T, g *d2graph.Graph) { - tassert.NotNil(t, g.Layers[0].Layers[0].Objects[0].LinkedBoard) - tassert.Equal(t, ".layers.x", g.Layers[0].Layers[0].Objects[0].LinkedBoard.AbsID()) - tassert.Equal(t, ".layers.x", g.Layers[0].Layers[0].Objects[1].LinkedBoard.AbsID()) + tassert.NotNil(t, g.Layers[0].Layers[0].Objects[0].Attributes.Link.Value) + tassert.Equal(t, "root.layers.x", g.Layers[0].Layers[0].Objects[0].Attributes.Link.Value) + tassert.Equal(t, "root.layers.x", g.Layers[0].Layers[0].Objects[1].Attributes.Link.Value) }, }, { @@ -2125,7 +2139,7 @@ layers: { } } }`, - expErr: `d2/testdata/d2compiler/TestCompile/link-board-underscore-not-found.d2:7:17: link key "_._._" to board not found`, + expErr: `d2/testdata/d2compiler/TestCompile/link-board-underscore-not-found.d2:7:5: board referenced by link not found`, }, } diff --git a/d2graph/d2graph.go b/d2graph/d2graph.go index 1defc43dea..eb1701585a 100644 --- a/d2graph/d2graph.go +++ b/d2graph/d2graph.go @@ -107,8 +107,6 @@ type Object struct { LabelHeight *int `json:"labelHeight,omitempty"` IconPosition *string `json:"iconPosition,omitempty"` - LinkedBoard *Graph `json:"-"` - Class *d2target.Class `json:"class,omitempty"` SQLTable *d2target.SQLTable `json:"sql_table,omitempty"` diff --git a/d2ir/compile.go b/d2ir/compile.go index 167fd09721..f6e6546124 100644 --- a/d2ir/compile.go +++ b/d2ir/compile.go @@ -1,6 +1,8 @@ package d2ir import ( + "strings" + "oss.terrastruct.com/d2/d2ast" "oss.terrastruct.com/d2/d2parser" ) @@ -127,6 +129,34 @@ func (c *compiler) compileField(dst *Map, kp *d2ast.KeyPath, refctx *RefContext) } c.compileMap(f.Map(), refctx.Key.Value.Map) } else if refctx.Key.Value.ScalarBox().Unbox() != nil { + // If these are boards, we transform into absolute paths + if f.Name == "link" { + link, err := d2parser.ParseKey(refctx.Key.Value.ScalarBox().Unbox().ScalarString()) + if err == nil { + scopeID, _ := d2parser.ParseKey(refctx.ScopeMap.AbsID()) + scopeIDA := scopeID.IDA() + for i := len(scopeIDA) - 1; i > 0; i-- { + if scopeIDA[i-1] == "layers" || scopeIDA[i-1] == "scenarios" || scopeIDA[i-1] == "steps" || scopeIDA[i-1] == "root" { + scopeIDA = scopeIDA[:i+1] + break + } + } + linkIDA := link.IDA() + if len(linkIDA) > 0 { + for len(linkIDA) > 0 && linkIDA[0] == "_" { + if len(scopeIDA) <= 2 { + c.errorf(refctx.Key.Key, "board referenced by link not found") + return + } + // pop 2 off path per one underscore + scopeIDA = scopeIDA[:len(scopeIDA)-2] + linkIDA = linkIDA[1:] + } + scopeIDA = append(scopeIDA, linkIDA...) + refctx.Key.Value = d2ast.MakeValueBox(d2ast.RawString(strings.Join(scopeIDA, "."), true)) + } + } + } f.Primary_ = &Scalar{ parent: f, Value: refctx.Key.Value.ScalarBox().Unbox(), diff --git a/d2ir/d2ir.go b/d2ir/d2ir.go index 72deedb38e..ac00196523 100644 --- a/d2ir/d2ir.go +++ b/d2ir/d2ir.go @@ -158,7 +158,7 @@ type Map struct { func (m *Map) initRoot() { m.parent = &Field{ - Name: "", + Name: "root", References: []*FieldReference{{ Context: &RefContext{ ScopeMap: m, @@ -221,6 +221,17 @@ func (m *Map) Root() bool { return f.Root() } +func (m *Map) AbsID() string { + f, ok := m.parent.(*Field) + if !ok { + return "" + } + if f.parent == nil { + return f.Name + } + return f.parent.(*Map).AbsID() + "." + f.Name +} + func (f *Field) Root() bool { return f.parent == nil } diff --git a/testdata/d2compiler/TestCompile/link-board-key-nested.exp.json b/testdata/d2compiler/TestCompile/link-board-key-nested.exp.json new file mode 100644 index 0000000000..a31d63b38f --- /dev/null +++ b/testdata/d2compiler/TestCompile/link-board-key-nested.exp.json @@ -0,0 +1,540 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,0:0:0-7:1:54", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,0:0:0-2:1:25", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,0:3:3-2:0:24", + "nodes": [ + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,1:2:7-1:8:13", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,1:2:7-1:3:8", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,1:4:9-1:8:13", + "value": [ + { + "string": "link", + "raw_string": "link" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "double_quoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "root.x.layers.x" + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,3:0:26-7:1:54", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,3:0:26-3:6:32", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,3:0:26-3:6:32", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,3:8:34-7:0:53", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,4:1:37-6:3:52", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,4:1:37-4:2:38", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,4:1:37-4:2:38", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,4:4:40-6:2:51", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,5:4:46-5:6:48", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,5:4:46-5:6:48", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,5:4:46-5:6:48", + "value": [ + { + "string": "yo", + "raw_string": "yo" + } + ] + } + } + ] + }, + "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": "x", + "id_val": "x", + "label_dimensions": { + "width": 0, + "height": 0 + }, + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "x" + }, + "style": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": { + "value": "" + } + }, + "zIndex": 0 + }, + { + "id": "y", + "id_val": "y", + "label_dimensions": { + "width": 0, + "height": 0 + }, + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,1:2:7-1:8:13", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,1:2:7-1:3:8", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,1:4:9-1:8:13", + "value": [ + { + "string": "link", + "raw_string": "link" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "y" + }, + "style": {}, + "link": { + "value": "root.x.layers.x" + }, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": { + "value": "" + } + }, + "zIndex": 0 + } + ], + "layers": [ + { + "name": "x", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,0:0:0-7:1:54", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,0:0:0-2:1:25", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,0:3:3-2:0:24", + "nodes": [ + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,1:2:7-1:8:13", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,1:2:7-1:3:8", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,1:4:9-1:8:13", + "value": [ + { + "string": "link", + "raw_string": "link" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "double_quoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "root.x.layers.x" + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,3:0:26-7:1:54", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,3:0:26-3:6:32", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,3:0:26-3:6:32", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,3:8:34-7:0:53", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,4:1:37-6:3:52", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,4:1:37-4:2:38", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,4:1:37-4:2:38", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,4:4:40-6:2:51", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,5:4:46-5:6:48", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,5:4:46-5:6:48", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,5:4:46-5:6:48", + "value": [ + { + "string": "yo", + "raw_string": "yo" + } + ] + } + } + ] + }, + "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": "yo", + "id_val": "yo", + "label_dimensions": { + "width": 0, + "height": 0 + }, + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,5:4:46-5:6:48", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,5:4:46-5:6:48", + "value": [ + { + "string": "yo", + "raw_string": "yo" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "yo" + }, + "style": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": { + "value": "" + } + }, + "zIndex": 0 + } + ] + } + ] + }, + "err": null +} diff --git a/testdata/d2compiler/TestCompile/link-board-mixed.exp.json b/testdata/d2compiler/TestCompile/link-board-mixed.exp.json index 74ce2ccfc6..ef65c9ac2d 100644 --- a/testdata/d2compiler/TestCompile/link-board-mixed.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-mixed.exp.json @@ -40,7 +40,7 @@ }, { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,1:15:46-1:25:56", + "range": ",0:0:0-0:0:0", "key": { "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,1:0:31-1:13:44", "path": [ @@ -70,12 +70,11 @@ }, "primary": {}, "value": { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,1:15:46-1:25:56", + "double_quoted_string": { + "range": ",0:0:0-0:0:0", "value": [ { - "string": "layers.cat", - "raw_string": "layers.cat" + "string": "root.layers.cat" } ] } @@ -404,7 +403,7 @@ }, "style": {}, "link": { - "value": "layers.cat" + "value": "root.layers.cat" }, "near_key": null, "shape": { @@ -462,7 +461,7 @@ }, { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,1:15:46-1:25:56", + "range": ",0:0:0-0:0:0", "key": { "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,1:0:31-1:13:44", "path": [ @@ -492,12 +491,11 @@ }, "primary": {}, "value": { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,1:15:46-1:25:56", + "double_quoted_string": { + "range": ",0:0:0-0:0:0", "value": [ { - "string": "layers.cat", - "raw_string": "layers.cat" + "string": "root.layers.cat" } ] } @@ -934,7 +932,7 @@ }, { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,1:15:46-1:25:56", + "range": ",0:0:0-0:0:0", "key": { "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,1:0:31-1:13:44", "path": [ @@ -964,12 +962,11 @@ }, "primary": {}, "value": { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,1:15:46-1:25:56", + "double_quoted_string": { + "range": ",0:0:0-0:0:0", "value": [ { - "string": "layers.cat", - "raw_string": "layers.cat" + "string": "root.layers.cat" } ] } @@ -1344,7 +1341,7 @@ } }, "link": { - "value": "layers.cat" + "value": "root.layers.cat" }, "near_key": null, "shape": { diff --git a/testdata/d2compiler/TestCompile/link-board-nested.exp.json b/testdata/d2compiler/TestCompile/link-board-nested.exp.json index d5b6a02cc2..5f29264940 100644 --- a/testdata/d2compiler/TestCompile/link-board-nested.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-nested.exp.json @@ -7,7 +7,7 @@ "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:8:8-0:25:25", + "range": ",0:0:0-0:0:0", "key": { "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:0:0-0:6:6", "path": [ @@ -37,12 +37,11 @@ }, "primary": {}, "value": { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:8:8-0:25:25", + "double_quoted_string": { + "range": ",0:0:0-0:0:0", "value": [ { - "string": "layers.x.layers.x", - "raw_string": "layers.x.layers.x" + "string": "root.layers.x.layers.x" } ] } @@ -263,7 +262,7 @@ }, "style": {}, "link": { - "value": "layers.x.layers.x" + "value": "root.layers.x.layers.x" }, "near_key": null, "shape": { @@ -288,7 +287,7 @@ "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:8:8-0:25:25", + "range": ",0:0:0-0:0:0", "key": { "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:0:0-0:6:6", "path": [ @@ -318,12 +317,11 @@ }, "primary": {}, "value": { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:8:8-0:25:25", + "double_quoted_string": { + "range": ",0:0:0-0:0:0", "value": [ { - "string": "layers.x.layers.x", - "raw_string": "layers.x.layers.x" + "string": "root.layers.x.layers.x" } ] } @@ -507,7 +505,7 @@ "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:8:8-0:25:25", + "range": ",0:0:0-0:0:0", "key": { "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:0:0-0:6:6", "path": [ @@ -537,12 +535,11 @@ }, "primary": {}, "value": { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:8:8-0:25:25", + "double_quoted_string": { + "range": ",0:0:0-0:0:0", "value": [ { - "string": "layers.x.layers.x", - "raw_string": "layers.x.layers.x" + "string": "root.layers.x.layers.x" } ] } diff --git a/testdata/d2compiler/TestCompile/link-board-ok.exp.json b/testdata/d2compiler/TestCompile/link-board-ok.exp.json index 8a8fec005e..c704c8a7cd 100644 --- a/testdata/d2compiler/TestCompile/link-board-ok.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-ok.exp.json @@ -7,7 +7,7 @@ "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,0:8:8-0:16:16", + "range": ",0:0:0-0:0:0", "key": { "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,0:0:0-0:6:6", "path": [ @@ -37,12 +37,11 @@ }, "primary": {}, "value": { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,0:8:8-0:16:16", + "double_quoted_string": { + "range": ",0:0:0-0:0:0", "value": [ { - "string": "layers.x", - "raw_string": "layers.x" + "string": "root.layers.x" } ] } @@ -205,7 +204,7 @@ }, "style": {}, "link": { - "value": "layers.x" + "value": "root.layers.x" }, "near_key": null, "shape": { @@ -230,7 +229,7 @@ "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,0:8:8-0:16:16", + "range": ",0:0:0-0:0:0", "key": { "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,0:0:0-0:6:6", "path": [ @@ -260,12 +259,11 @@ }, "primary": {}, "value": { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,0:8:8-0:16:16", + "double_quoted_string": { + "range": ",0:0:0-0:0:0", "value": [ { - "string": "layers.x", - "raw_string": "layers.x" + "string": "root.layers.x" } ] } diff --git a/testdata/d2compiler/TestCompile/link-board-underscore-not-found.exp.json b/testdata/d2compiler/TestCompile/link-board-underscore-not-found.exp.json index b74ef0923c..040712eda8 100644 --- a/testdata/d2compiler/TestCompile/link-board-underscore-not-found.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-underscore-not-found.exp.json @@ -4,8 +4,8 @@ "ioerr": null, "errs": [ { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore-not-found.d2,6:16:62-6:21:67", - "errmsg": "d2/testdata/d2compiler/TestCompile/link-board-underscore-not-found.d2:7:17: link key \"_._._\" to board not found" + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore-not-found.d2,6:4:50-6:14:60", + "errmsg": "d2/testdata/d2compiler/TestCompile/link-board-underscore-not-found.d2:7:5: board referenced by link not found" } ] } diff --git a/testdata/d2compiler/TestCompile/link-board-underscore.exp.json b/testdata/d2compiler/TestCompile/link-board-underscore.exp.json index 4c1a80549e..fa2ef27257 100644 --- a/testdata/d2compiler/TestCompile/link-board-underscore.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-underscore.exp.json @@ -149,7 +149,7 @@ "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:16:62-6:28:74", + "range": ",0:0:0-0:0:0", "key": { "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:4:50-6:14:60", "path": [ @@ -179,12 +179,11 @@ }, "primary": {}, "value": { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:16:62-6:28:74", + "double_quoted_string": { + "range": ",0:0:0-0:0:0", "value": [ { - "string": "_._.layers.x", - "raw_string": "_._.layers.x" + "string": "root.layers.x" } ] } @@ -193,7 +192,7 @@ }, { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:14:89-7:15:90", + "range": ",0:0:0-0:0:0", "key": { "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:4:79-7:12:87", "path": [ @@ -223,12 +222,11 @@ }, "primary": {}, "value": { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:14:89-7:15:90", + "double_quoted_string": { + "range": ",0:0:0-0:0:0", "value": [ { - "string": "_", - "raw_string": "_" + "string": "root.layers.x" } ] } @@ -483,7 +481,7 @@ "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:16:62-6:28:74", + "range": ",0:0:0-0:0:0", "key": { "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:4:50-6:14:60", "path": [ @@ -513,12 +511,11 @@ }, "primary": {}, "value": { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:16:62-6:28:74", + "double_quoted_string": { + "range": ",0:0:0-0:0:0", "value": [ { - "string": "_._.layers.x", - "raw_string": "_._.layers.x" + "string": "root.layers.x" } ] } @@ -527,7 +524,7 @@ }, { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:14:89-7:15:90", + "range": ",0:0:0-0:0:0", "key": { "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:4:79-7:12:87", "path": [ @@ -557,12 +554,11 @@ }, "primary": {}, "value": { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:14:89-7:15:90", + "double_quoted_string": { + "range": ",0:0:0-0:0:0", "value": [ { - "string": "_", - "raw_string": "_" + "string": "root.layers.x" } ] } @@ -817,7 +813,7 @@ "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:16:62-6:28:74", + "range": ",0:0:0-0:0:0", "key": { "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:4:50-6:14:60", "path": [ @@ -847,12 +843,11 @@ }, "primary": {}, "value": { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:16:62-6:28:74", + "double_quoted_string": { + "range": ",0:0:0-0:0:0", "value": [ { - "string": "_._.layers.x", - "raw_string": "_._.layers.x" + "string": "root.layers.x" } ] } @@ -861,7 +856,7 @@ }, { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:14:89-7:15:90", + "range": ",0:0:0-0:0:0", "key": { "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:4:79-7:12:87", "path": [ @@ -891,12 +886,11 @@ }, "primary": {}, "value": { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:14:89-7:15:90", + "double_quoted_string": { + "range": ",0:0:0-0:0:0", "value": [ { - "string": "_", - "raw_string": "_" + "string": "root.layers.x" } ] } @@ -998,7 +992,7 @@ }, "style": {}, "link": { - "value": "_._.layers.x" + "value": "root.layers.x" }, "near_key": null, "shape": { @@ -1059,7 +1053,7 @@ }, "style": {}, "link": { - "value": "_" + "value": "root.layers.x" }, "near_key": null, "shape": { diff --git a/testdata/d2compiler/TestCompile/path_link.exp.json b/testdata/d2compiler/TestCompile/path_link.exp.json index 84a48a1de4..69eba972bf 100644 --- a/testdata/d2compiler/TestCompile/path_link.exp.json +++ b/testdata/d2compiler/TestCompile/path_link.exp.json @@ -31,7 +31,7 @@ "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/path_link.d2,1:8:13-1:39:44", + "range": ",0:0:0-0:0:0", "key": { "range": "d2/testdata/d2compiler/TestCompile/path_link.d2,1:2:7-1:6:11", "path": [ @@ -50,12 +50,11 @@ }, "primary": {}, "value": { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/path_link.d2,1:8:13-1:39:44", + "double_quoted_string": { + "range": ",0:0:0-0:0:0", "value": [ { - "string": "Overview.Untitled board 7.zzzzz", - "raw_string": "Overview.Untitled board 7.zzzzz" + "string": "root.x.Overview.Untitled board 7.zzzzz" } ] } @@ -131,7 +130,7 @@ }, "style": {}, "link": { - "value": "Overview.Untitled board 7.zzzzz" + "value": "root.x.Overview.Untitled board 7.zzzzz" }, "near_key": null, "shape": { diff --git a/testdata/d2compiler/TestCompile/url_link.exp.json b/testdata/d2compiler/TestCompile/url_link.exp.json index f7c0804cb8..2f056a5143 100644 --- a/testdata/d2compiler/TestCompile/url_link.exp.json +++ b/testdata/d2compiler/TestCompile/url_link.exp.json @@ -31,7 +31,7 @@ "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/url_link.d2,1:8:13-1:26:31", + "range": ",0:0:0-0:0:0", "key": { "range": "d2/testdata/d2compiler/TestCompile/url_link.d2,1:2:7-1:6:11", "path": [ @@ -50,12 +50,11 @@ }, "primary": {}, "value": { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/url_link.d2,1:8:13-1:26:31", + "double_quoted_string": { + "range": ",0:0:0-0:0:0", "value": [ { - "string": "https://google.com", - "raw_string": "https://google.com" + "string": "root.x.https" } ] } @@ -131,7 +130,7 @@ }, "style": {}, "link": { - "value": "https://google.com" + "value": "root.x.https" }, "near_key": null, "shape": { From 85985bbaf5278af51697aa620114dea3f764e3ff Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Wed, 1 Mar 2023 15:38:02 -0800 Subject: [PATCH 11/17] ok --- d2compiler/compile.go | 12 ++- d2compiler/compile_test.go | 6 +- d2graph/d2graph.go | 22 ----- d2ir/compile.go | 81 +++++++++++++------ .../link-board-key-nested.exp.json | 10 +-- .../TestCompile/link-board-mixed.exp.json | 6 +- .../TestCompile/link-board-nested.exp.json | 6 +- .../TestCompile/link-board-not-board.exp.json | 4 +- .../TestCompile/link-board-not-found.exp.json | 4 +- .../TestCompile/link-board-ok.exp.json | 4 +- .../link-board-underscore-not-found.exp.json | 2 +- .../link-board-underscore.exp.json | 12 +-- .../d2compiler/TestCompile/path_link.exp.json | 11 +-- .../d2compiler/TestCompile/url_link.exp.json | 11 +-- 14 files changed, 100 insertions(+), 91 deletions(-) diff --git a/d2compiler/compile.go b/d2compiler/compile.go index 9afa11e6cb..50ad03f54e 100644 --- a/d2compiler/compile.go +++ b/d2compiler/compile.go @@ -327,8 +327,6 @@ func (c *compiler) compileReserved(attrs *d2graph.Attributes, f *d2ir.Field) { attrs.Link = &d2graph.Scalar{} attrs.Link.Value = scalar.ScalarString() attrs.Link.MapKey = f.LastPrimaryKey() - // TODO I think all the attributes need the range actually - attrs.Link.MapKey.Range = scalar.GetRange() case "direction": dirs := []string{"up", "down", "right", "left"} if !go2.Contains(dirs, scalar.ScalarString()) { @@ -729,7 +727,6 @@ func (c *compiler) validateBoardLinks(g *d2graph.Graph) { } linkKey, err := d2parser.ParseKey(obj.Attributes.Link.Value) - // Links can be urls if err != nil { continue } @@ -743,7 +740,7 @@ func (c *compiler) validateBoardLinks(g *d2graph.Graph) { root = root.Parent } if !hasBoard(root, linkKey.IDA()) { - c.errorf(obj.Attributes.Link.MapKey, "link key to board not found") + c.errorf(obj.Attributes.Link.MapKey, "linked board not found") continue } } @@ -756,6 +753,7 @@ func hasBoard(root *d2graph.Graph, ida []string) bool { for i := 0; i < len(ida); i += 2 { id := ida[i] if id == "root" { + i-- continue } if i == len(ida)-1 { @@ -765,19 +763,19 @@ func hasBoard(root *d2graph.Graph, ida []string) bool { if id == "layers" { for _, b := range root.Layers { if b.Name == nextID { - return hasBoard(b, ida[i:]) + return hasBoard(b, ida[i+1:]) } } } else if id == "scenarios" { for _, b := range root.Scenarios { if b.Name == nextID { - return hasBoard(b, ida[i:]) + return hasBoard(b, ida[i+1:]) } } } else if id == "steps" { for _, b := range root.Steps { if b.Name == nextID { - return hasBoard(b, ida[i:]) + return hasBoard(b, ida[i+1:]) } } } diff --git a/d2compiler/compile_test.go b/d2compiler/compile_test.go index 8a6f66cd17..4c08bd92f1 100644 --- a/d2compiler/compile_test.go +++ b/d2compiler/compile_test.go @@ -2063,7 +2063,7 @@ scenarios: { name: "link-board-not-found", text: `x.link: layers.x `, - expErr: `d2/testdata/d2compiler/TestCompile/link-board-not-found.d2:1:9: link key "layers.x" to board not found`, + expErr: `d2/testdata/d2compiler/TestCompile/link-board-not-found.d2:1:1: linked board not found`, }, { name: "link-board-not-board", @@ -2074,7 +2074,7 @@ layers: { y } }`, - expErr: `d2/testdata/d2compiler/TestCompile/link-board-not-board.d2:2:9: link key "layers.x.y" to board not found`, + expErr: `d2/testdata/d2compiler/TestCompile/link-board-not-board.d2:2:1: linked board not found`, }, { name: "link-board-nested", @@ -2139,7 +2139,7 @@ layers: { } } }`, - expErr: `d2/testdata/d2compiler/TestCompile/link-board-underscore-not-found.d2:7:5: board referenced by link not found`, + expErr: `d2/testdata/d2compiler/TestCompile/link-board-underscore-not-found.d2:7:5: linked board not found`, }, } diff --git a/d2graph/d2graph.go b/d2graph/d2graph.go index eb1701585a..782cd831e1 100644 --- a/d2graph/d2graph.go +++ b/d2graph/d2graph.go @@ -56,28 +56,6 @@ func NewGraph() *Graph { return d } -func (g *Graph) AbsID() string { - if g.Parent == nil { - return g.Name - } - for _, l := range g.Parent.Layers { - if l.Name == g.Name { - return g.Parent.AbsID() + ".layers." + g.Name - } - } - for _, s := range g.Parent.Scenarios { - if s.Name == g.Name { - return g.Parent.AbsID() + ".scenarios." + g.Name - } - } - for _, s := range g.Parent.Steps { - if s.Name == g.Name { - return g.Parent.AbsID() + ".steps." + g.Name - } - } - return "" -} - // TODO consider having different Scalar types // Right now we'll hold any types in Value and just convert, e.g. floats type Scalar struct { diff --git a/d2ir/compile.go b/d2ir/compile.go index f6e6546124..b6035cb468 100644 --- a/d2ir/compile.go +++ b/d2ir/compile.go @@ -131,31 +131,7 @@ func (c *compiler) compileField(dst *Map, kp *d2ast.KeyPath, refctx *RefContext) } else if refctx.Key.Value.ScalarBox().Unbox() != nil { // If these are boards, we transform into absolute paths if f.Name == "link" { - link, err := d2parser.ParseKey(refctx.Key.Value.ScalarBox().Unbox().ScalarString()) - if err == nil { - scopeID, _ := d2parser.ParseKey(refctx.ScopeMap.AbsID()) - scopeIDA := scopeID.IDA() - for i := len(scopeIDA) - 1; i > 0; i-- { - if scopeIDA[i-1] == "layers" || scopeIDA[i-1] == "scenarios" || scopeIDA[i-1] == "steps" || scopeIDA[i-1] == "root" { - scopeIDA = scopeIDA[:i+1] - break - } - } - linkIDA := link.IDA() - if len(linkIDA) > 0 { - for len(linkIDA) > 0 && linkIDA[0] == "_" { - if len(scopeIDA) <= 2 { - c.errorf(refctx.Key.Key, "board referenced by link not found") - return - } - // pop 2 off path per one underscore - scopeIDA = scopeIDA[:len(scopeIDA)-2] - linkIDA = linkIDA[1:] - } - scopeIDA = append(scopeIDA, linkIDA...) - refctx.Key.Value = d2ast.MakeValueBox(d2ast.RawString(strings.Join(scopeIDA, "."), true)) - } - } + c.compileLink(refctx) } f.Primary_ = &Scalar{ parent: f, @@ -164,6 +140,61 @@ func (c *compiler) compileField(dst *Map, kp *d2ast.KeyPath, refctx *RefContext) } } +func (c *compiler) compileLink(refctx *RefContext) { + val := refctx.Key.Value.ScalarBox().Unbox().ScalarString() + link, err := d2parser.ParseKey(val) + if err != nil { + return + } + + scopeID, _ := d2parser.ParseKey(refctx.ScopeMap.AbsID()) + scopeIDA := scopeID.IDA() + + if len(scopeIDA) == 0 { + return + } + + linkIDA := link.IDA() + if len(linkIDA) == 0 { + return + } + + // If it doesn't start with one of these reserved words, the link may be a URL or local path or something + if linkIDA[0] != "layers" && linkIDA[0] != "scenarios" && linkIDA[0] != "steps" && linkIDA[0] != "_" { + return + } + + // Chop off the non-board portion of the scope, like if this is being defined on a nested object (e.g. `x.y.z`) + for i := len(scopeIDA) - 1; i > 0; i-- { + if scopeIDA[i-1] == "layers" || scopeIDA[i-1] == "scenarios" || scopeIDA[i-1] == "steps" { + scopeIDA = scopeIDA[:i+1] + break + } + if scopeIDA[i-1] == "root" { + scopeIDA = scopeIDA[:i] + break + } + } + + // Resolve underscores + for len(linkIDA) > 0 && linkIDA[0] == "_" { + if len(scopeIDA) < 2 { + c.errorf(refctx.Key.Key, "linked board not found") + return + } + // pop 2 off path per one underscore + scopeIDA = scopeIDA[:len(scopeIDA)-2] + linkIDA = linkIDA[1:] + } + if len(scopeIDA) == 0 { + scopeIDA = []string{"root"} + } + + // Create the absolute path by appending scope path with value specified + scopeIDA = append(scopeIDA, linkIDA...) + refctx.Key.Value = d2ast.MakeValueBox(d2ast.RawString(strings.Join(scopeIDA, "."), true)) +} + func (c *compiler) compileEdges(refctx *RefContext) { if refctx.Key.Key != nil { f, err := refctx.ScopeMap.EnsureField(refctx.Key.Key, refctx) diff --git a/testdata/d2compiler/TestCompile/link-board-key-nested.exp.json b/testdata/d2compiler/TestCompile/link-board-key-nested.exp.json index a31d63b38f..9095c27732 100644 --- a/testdata/d2compiler/TestCompile/link-board-key-nested.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-key-nested.exp.json @@ -31,7 +31,7 @@ "nodes": [ { "map_key": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,1:2:7-1:18:23", "key": { "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,1:2:7-1:8:13", "path": [ @@ -65,7 +65,7 @@ "range": ",0:0:0-0:0:0", "value": [ { - "string": "root.x.layers.x" + "string": "root.layers.x" } ] } @@ -280,7 +280,7 @@ }, "style": {}, "link": { - "value": "root.x.layers.x" + "value": "root.layers.x" }, "near_key": null, "shape": { @@ -329,7 +329,7 @@ "nodes": [ { "map_key": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,1:2:7-1:18:23", "key": { "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,1:2:7-1:8:13", "path": [ @@ -363,7 +363,7 @@ "range": ",0:0:0-0:0:0", "value": [ { - "string": "root.x.layers.x" + "string": "root.layers.x" } ] } diff --git a/testdata/d2compiler/TestCompile/link-board-mixed.exp.json b/testdata/d2compiler/TestCompile/link-board-mixed.exp.json index ef65c9ac2d..ac393f695e 100644 --- a/testdata/d2compiler/TestCompile/link-board-mixed.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-mixed.exp.json @@ -40,7 +40,7 @@ }, { "map_key": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,1:0:31-1:25:56", "key": { "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,1:0:31-1:13:44", "path": [ @@ -461,7 +461,7 @@ }, { "map_key": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,1:0:31-1:25:56", "key": { "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,1:0:31-1:13:44", "path": [ @@ -932,7 +932,7 @@ }, { "map_key": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,1:0:31-1:25:56", "key": { "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,1:0:31-1:13:44", "path": [ diff --git a/testdata/d2compiler/TestCompile/link-board-nested.exp.json b/testdata/d2compiler/TestCompile/link-board-nested.exp.json index 5f29264940..40561e63c3 100644 --- a/testdata/d2compiler/TestCompile/link-board-nested.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-nested.exp.json @@ -7,7 +7,7 @@ "nodes": [ { "map_key": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:0:0-0:25:25", "key": { "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:0:0-0:6:6", "path": [ @@ -287,7 +287,7 @@ "nodes": [ { "map_key": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:0:0-0:25:25", "key": { "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:0:0-0:6:6", "path": [ @@ -505,7 +505,7 @@ "nodes": [ { "map_key": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:0:0-0:25:25", "key": { "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:0:0-0:6:6", "path": [ diff --git a/testdata/d2compiler/TestCompile/link-board-not-board.exp.json b/testdata/d2compiler/TestCompile/link-board-not-board.exp.json index e37e9b481d..d8f1db7646 100644 --- a/testdata/d2compiler/TestCompile/link-board-not-board.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-not-board.exp.json @@ -4,8 +4,8 @@ "ioerr": null, "errs": [ { - "range": "d2/testdata/d2compiler/TestCompile/link-board-not-board.d2,1:8:12-1:18:22", - "errmsg": "d2/testdata/d2compiler/TestCompile/link-board-not-board.d2:2:9: link key \"layers.x.y\" to board not found" + "range": "d2/testdata/d2compiler/TestCompile/link-board-not-board.d2,1:0:4-1:18:22", + "errmsg": "d2/testdata/d2compiler/TestCompile/link-board-not-board.d2:2:1: linked board not found" } ] } diff --git a/testdata/d2compiler/TestCompile/link-board-not-found.exp.json b/testdata/d2compiler/TestCompile/link-board-not-found.exp.json index 8c8509b5d2..29ff2fddef 100644 --- a/testdata/d2compiler/TestCompile/link-board-not-found.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-not-found.exp.json @@ -4,8 +4,8 @@ "ioerr": null, "errs": [ { - "range": "d2/testdata/d2compiler/TestCompile/link-board-not-found.d2,0:8:8-0:16:16", - "errmsg": "d2/testdata/d2compiler/TestCompile/link-board-not-found.d2:1:9: link key \"layers.x\" to board not found" + "range": "d2/testdata/d2compiler/TestCompile/link-board-not-found.d2,0:0:0-0:16:16", + "errmsg": "d2/testdata/d2compiler/TestCompile/link-board-not-found.d2:1:1: linked board not found" } ] } diff --git a/testdata/d2compiler/TestCompile/link-board-ok.exp.json b/testdata/d2compiler/TestCompile/link-board-ok.exp.json index c704c8a7cd..61cf43cd74 100644 --- a/testdata/d2compiler/TestCompile/link-board-ok.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-ok.exp.json @@ -7,7 +7,7 @@ "nodes": [ { "map_key": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,0:0:0-0:16:16", "key": { "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,0:0:0-0:6:6", "path": [ @@ -229,7 +229,7 @@ "nodes": [ { "map_key": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,0:0:0-0:16:16", "key": { "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,0:0:0-0:6:6", "path": [ diff --git a/testdata/d2compiler/TestCompile/link-board-underscore-not-found.exp.json b/testdata/d2compiler/TestCompile/link-board-underscore-not-found.exp.json index 040712eda8..b1ef0359c0 100644 --- a/testdata/d2compiler/TestCompile/link-board-underscore-not-found.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-underscore-not-found.exp.json @@ -5,7 +5,7 @@ "errs": [ { "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore-not-found.d2,6:4:50-6:14:60", - "errmsg": "d2/testdata/d2compiler/TestCompile/link-board-underscore-not-found.d2:7:5: board referenced by link not found" + "errmsg": "d2/testdata/d2compiler/TestCompile/link-board-underscore-not-found.d2:7:5: linked board not found" } ] } diff --git a/testdata/d2compiler/TestCompile/link-board-underscore.exp.json b/testdata/d2compiler/TestCompile/link-board-underscore.exp.json index fa2ef27257..7f12b70d76 100644 --- a/testdata/d2compiler/TestCompile/link-board-underscore.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-underscore.exp.json @@ -149,7 +149,7 @@ "nodes": [ { "map_key": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:4:50-6:28:74", "key": { "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:4:50-6:14:60", "path": [ @@ -192,7 +192,7 @@ }, { "map_key": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:4:79-7:15:90", "key": { "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:4:79-7:12:87", "path": [ @@ -481,7 +481,7 @@ "nodes": [ { "map_key": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:4:50-6:28:74", "key": { "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:4:50-6:14:60", "path": [ @@ -524,7 +524,7 @@ }, { "map_key": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:4:79-7:15:90", "key": { "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:4:79-7:12:87", "path": [ @@ -813,7 +813,7 @@ "nodes": [ { "map_key": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:4:50-6:28:74", "key": { "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:4:50-6:14:60", "path": [ @@ -856,7 +856,7 @@ }, { "map_key": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:4:79-7:15:90", "key": { "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:4:79-7:12:87", "path": [ diff --git a/testdata/d2compiler/TestCompile/path_link.exp.json b/testdata/d2compiler/TestCompile/path_link.exp.json index 69eba972bf..9c08d24ad3 100644 --- a/testdata/d2compiler/TestCompile/path_link.exp.json +++ b/testdata/d2compiler/TestCompile/path_link.exp.json @@ -31,7 +31,7 @@ "nodes": [ { "map_key": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/path_link.d2,1:2:7-1:39:44", "key": { "range": "d2/testdata/d2compiler/TestCompile/path_link.d2,1:2:7-1:6:11", "path": [ @@ -50,11 +50,12 @@ }, "primary": {}, "value": { - "double_quoted_string": { - "range": ",0:0:0-0:0:0", + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/path_link.d2,1:8:13-1:39:44", "value": [ { - "string": "root.x.Overview.Untitled board 7.zzzzz" + "string": "Overview.Untitled board 7.zzzzz", + "raw_string": "Overview.Untitled board 7.zzzzz" } ] } @@ -130,7 +131,7 @@ }, "style": {}, "link": { - "value": "root.x.Overview.Untitled board 7.zzzzz" + "value": "Overview.Untitled board 7.zzzzz" }, "near_key": null, "shape": { diff --git a/testdata/d2compiler/TestCompile/url_link.exp.json b/testdata/d2compiler/TestCompile/url_link.exp.json index 2f056a5143..f800be68e1 100644 --- a/testdata/d2compiler/TestCompile/url_link.exp.json +++ b/testdata/d2compiler/TestCompile/url_link.exp.json @@ -31,7 +31,7 @@ "nodes": [ { "map_key": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/url_link.d2,1:2:7-1:26:31", "key": { "range": "d2/testdata/d2compiler/TestCompile/url_link.d2,1:2:7-1:6:11", "path": [ @@ -50,11 +50,12 @@ }, "primary": {}, "value": { - "double_quoted_string": { - "range": ",0:0:0-0:0:0", + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/url_link.d2,1:8:13-1:26:31", "value": [ { - "string": "root.x.https" + "string": "https://google.com", + "raw_string": "https://google.com" } ] } @@ -130,7 +131,7 @@ }, "style": {}, "link": { - "value": "root.x.https" + "value": "https://google.com" }, "near_key": null, "shape": { From 2997a6ef598994d9019630e36d31a9d2c8a3ed25 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Wed, 1 Mar 2023 15:40:08 -0800 Subject: [PATCH 12/17] test --- d2compiler/compile_test.go | 1 + 1 file changed, 1 insertion(+) diff --git a/d2compiler/compile_test.go b/d2compiler/compile_test.go index 4c08bd92f1..fdd7df3242 100644 --- a/d2compiler/compile_test.go +++ b/d2compiler/compile_test.go @@ -2057,6 +2057,7 @@ scenarios: { }`, assertions: func(t *testing.T, g *d2graph.Graph) { tassert.Equal(t, "root.layers.cat", g.Objects[0].Attributes.Link.Value) + tassert.Equal(t, "root.layers.cat", g.Scenarios[0].Objects[0].Attributes.Link.Value) }, }, { From e504aca6d090919b3550bc0816a37c3b8d6bc717 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Wed, 1 Mar 2023 15:49:47 -0800 Subject: [PATCH 13/17] comment --- d2ir/compile.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/d2ir/compile.go b/d2ir/compile.go index b6035cb468..9b50fd16c2 100644 --- a/d2ir/compile.go +++ b/d2ir/compile.go @@ -179,6 +179,8 @@ func (c *compiler) compileLink(refctx *RefContext) { // Resolve underscores for len(linkIDA) > 0 && linkIDA[0] == "_" { if len(scopeIDA) < 2 { + // IR compiler only validates bad underscore usage + // The compiler will validate if the target board actually exists c.errorf(refctx.Key.Key, "linked board not found") return } From 78e6f3fc06f4d8292d889e8d1ef86d16ecbcd167 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Thu, 2 Mar 2023 17:56:32 -0800 Subject: [PATCH 14/17] pr feedback --- d2compiler/compile.go | 29 ++-- d2compiler/compile_test.go | 32 ++--- d2format/format.go | 8 ++ d2graph/d2graph.go | 7 + d2ir/compile.go | 15 +-- d2ir/d2ir.go | 35 +++-- .../link-board-key-nested.exp.json | 44 +++--- .../TestCompile/link-board-mixed.exp.json | 74 +++++----- .../TestCompile/link-board-nested.exp.json | 112 ++++++++-------- .../link-board-underscore-not-found.exp.json | 4 +- .../link-board-underscore.exp.json | 126 +++++++++--------- 11 files changed, 257 insertions(+), 229 deletions(-) diff --git a/d2compiler/compile.go b/d2compiler/compile.go index 50ad03f54e..6be93af4ec 100644 --- a/d2compiler/compile.go +++ b/d2compiler/compile.go @@ -198,7 +198,7 @@ func (c *compiler) compileField(obj *d2graph.Object, f *d2ir.Field) { obj.Map = fr.Context.Key.Value.Map } } - scopeObjIDA := d2ir.IDA(fr.Context.ScopeMap) + scopeObjIDA := d2ir.BoardIDA(fr.Context.ScopeMap) scopeObj := obj.Graph.Root.EnsureChildIDVal(scopeObjIDA) obj.References = append(obj.References, d2graph.Reference{ Key: fr.KeyPath, @@ -436,7 +436,7 @@ func (c *compiler) compileEdge(obj *d2graph.Object, e *d2ir.Edge) { edge.Attributes.Label.MapKey = e.LastPrimaryKey() for _, er := range e.References { - scopeObjIDA := d2ir.IDA(er.Context.ScopeMap) + scopeObjIDA := d2ir.BoardIDA(er.Context.ScopeMap) scopeObj := edge.Src.Graph.Root.EnsureChildIDVal(scopeObjIDA) edge.References = append(edge.References, d2graph.EdgeReference{ Edge: er.Context.Edge, @@ -735,16 +735,18 @@ func (c *compiler) validateBoardLinks(g *d2graph.Graph) { continue } - root := g - for root.Parent != nil { - root = root.Parent - } - if !hasBoard(root, linkKey.IDA()) { + if !hasBoard(g.RootBoard(), linkKey.IDA()) { c.errorf(obj.Attributes.Link.MapKey, "linked board not found") continue } } - for _, b := range append(append(g.Layers, g.Scenarios...), g.Steps...) { + for _, b := range g.Layers { + c.validateBoardLinks(b) + } + for _, b := range g.Scenarios { + c.validateBoardLinks(b) + } + for _, b := range g.Steps { c.validateBoardLinks(b) } } @@ -752,7 +754,7 @@ func (c *compiler) validateBoardLinks(g *d2graph.Graph) { func hasBoard(root *d2graph.Graph, ida []string) bool { for i := 0; i < len(ida); i += 2 { id := ida[i] - if id == "root" { + if i == 0 && id == "root" { i-- continue } @@ -760,24 +762,27 @@ func hasBoard(root *d2graph.Graph, ida []string) bool { return root.Name == id } nextID := ida[i+1] - if id == "layers" { + switch id { + case "layers": for _, b := range root.Layers { if b.Name == nextID { return hasBoard(b, ida[i+1:]) } } - } else if id == "scenarios" { + case "scenarios": for _, b := range root.Scenarios { if b.Name == nextID { return hasBoard(b, ida[i+1:]) } } - } else if id == "steps" { + case "steps": for _, b := range root.Steps { if b.Name == nextID { return hasBoard(b, ida[i+1:]) } } + default: + break } } return false diff --git a/d2compiler/compile_test.go b/d2compiler/compile_test.go index fdd7df3242..4ae917bb61 100644 --- a/d2compiler/compile_test.go +++ b/d2compiler/compile_test.go @@ -2052,7 +2052,7 @@ layers: { scenarios: { green: { - question.style.fill: green + question.style.fill: green } }`, assertions: func(t *testing.T, g *d2graph.Graph) { @@ -2071,7 +2071,7 @@ scenarios: { text: `zzz x.link: layers.x.y layers: { - x: { + x: { y } }`, @@ -2081,11 +2081,11 @@ layers: { name: "link-board-nested", text: `x.link: layers.x.layers.x layers: { - x: { + x: { layers: { - x: { + x: { hello - } + } } } }`, @@ -2099,7 +2099,7 @@ layers: { y.link: layers.x } layers: { - x: { + x: { yo } }`, @@ -2114,10 +2114,10 @@ layers: { x: { yo layers: { - x: { - hello.link: _._.layers.x - hey.link: _ - } + x: { + hello.link: _._.layers.x + hey.link: _ + } } } }`, @@ -2131,16 +2131,16 @@ layers: { name: "link-board-underscore-not-found", text: `x layers: { - x: { - yo + x: { + yo layers: { - x: { - hello.link: _._._ - } + x: { + hello.link: _._._ + } } } }`, - expErr: `d2/testdata/d2compiler/TestCompile/link-board-underscore-not-found.d2:7:5: linked board not found`, + expErr: `d2/testdata/d2compiler/TestCompile/link-board-underscore-not-found.d2:7:9: invalid underscore usage`, }, } diff --git a/d2format/format.go b/d2format/format.go index e979a6feaa..3279fb0693 100644 --- a/d2format/format.go +++ b/d2format/format.go @@ -409,3 +409,11 @@ func KeyPath(kp *d2ast.KeyPath) (ida []string) { } return ida } + +func IDA(ida []string) *d2ast.KeyPath { + kp := &d2ast.KeyPath{} + for _, s := range ida { + kp.Path = append(kp.Path, d2ast.MakeValueBox(d2ast.RawString(s, true)).StringBox()) + } + return kp +} diff --git a/d2graph/d2graph.go b/d2graph/d2graph.go index 782cd831e1..6c220ed5fc 100644 --- a/d2graph/d2graph.go +++ b/d2graph/d2graph.go @@ -56,6 +56,13 @@ func NewGraph() *Graph { return d } +func (g *Graph) RootBoard() *Graph { + for g.Parent != nil { + g = g.Parent + } + return g +} + // TODO consider having different Scalar types // Right now we'll hold any types in Value and just convert, e.g. floats type Scalar struct { diff --git a/d2ir/compile.go b/d2ir/compile.go index 9b50fd16c2..5dba47c6d1 100644 --- a/d2ir/compile.go +++ b/d2ir/compile.go @@ -1,9 +1,8 @@ package d2ir import ( - "strings" - "oss.terrastruct.com/d2/d2ast" + "oss.terrastruct.com/d2/d2format" "oss.terrastruct.com/d2/d2parser" ) @@ -129,7 +128,7 @@ func (c *compiler) compileField(dst *Map, kp *d2ast.KeyPath, refctx *RefContext) } c.compileMap(f.Map(), refctx.Key.Value.Map) } else if refctx.Key.Value.ScalarBox().Unbox() != nil { - // If these are boards, we transform into absolute paths + // If the link is a board, we need to transform it into an absolute path. if f.Name == "link" { c.compileLink(refctx) } @@ -147,8 +146,7 @@ func (c *compiler) compileLink(refctx *RefContext) { return } - scopeID, _ := d2parser.ParseKey(refctx.ScopeMap.AbsID()) - scopeIDA := scopeID.IDA() + scopeIDA := IDA(refctx.ScopeMap) if len(scopeIDA) == 0 { return @@ -159,7 +157,7 @@ func (c *compiler) compileLink(refctx *RefContext) { return } - // If it doesn't start with one of these reserved words, the link may be a URL or local path or something + // If it doesn't start with one of these reserved words, the link is definitely not a board link. if linkIDA[0] != "layers" && linkIDA[0] != "scenarios" && linkIDA[0] != "steps" && linkIDA[0] != "_" { return } @@ -181,7 +179,7 @@ func (c *compiler) compileLink(refctx *RefContext) { if len(scopeIDA) < 2 { // IR compiler only validates bad underscore usage // The compiler will validate if the target board actually exists - c.errorf(refctx.Key.Key, "linked board not found") + c.errorf(refctx.Key.Key, "invalid underscore usage") return } // pop 2 off path per one underscore @@ -194,7 +192,8 @@ func (c *compiler) compileLink(refctx *RefContext) { // Create the absolute path by appending scope path with value specified scopeIDA = append(scopeIDA, linkIDA...) - refctx.Key.Value = d2ast.MakeValueBox(d2ast.RawString(strings.Join(scopeIDA, "."), true)) + kp := d2format.IDA(scopeIDA) + refctx.Key.Value = d2ast.MakeValueBox(d2ast.RawString(d2format.Format(kp), true)) } func (c *compiler) compileEdges(refctx *RefContext) { diff --git a/d2ir/d2ir.go b/d2ir/d2ir.go index ac00196523..aa6a4734ca 100644 --- a/d2ir/d2ir.go +++ b/d2ir/d2ir.go @@ -221,17 +221,6 @@ func (m *Map) Root() bool { return f.Root() } -func (m *Map) AbsID() string { - f, ok := m.parent.(*Field) - if !ok { - return "" - } - if f.parent == nil { - return f.Name - } - return f.parent.(*Map).AbsID() + "." + f.Name -} - func (f *Field) Root() bool { return f.parent == nil } @@ -1044,8 +1033,8 @@ func parentPrimaryKey(n Node) *d2ast.Key { return nil } -// IDA returns the absolute path to n from the nearest board root. -func IDA(n Node) (ida []string) { +// BoardIDA returns the absolute path to n from the nearest board root. +func BoardIDA(n Node) (ida []string) { for { f, ok := n.(*Field) if ok { @@ -1064,6 +1053,26 @@ func IDA(n Node) (ida []string) { } } +// IDA returns the absolute path to n from the nearest board root. +func IDA(n Node) (ida []string) { + for { + f, ok := n.(*Field) + if ok { + ida = append(ida, f.Name) + if f.Root() { + reverseIDA(ida) + return ida + } + } + f = ParentField(n) + if f == nil { + reverseIDA(ida) + return ida + } + n = f + } +} + func reverseIDA(ida []string) { for i := 0; i < len(ida)/2; i++ { tmp := ida[i] diff --git a/testdata/d2compiler/TestCompile/link-board-key-nested.exp.json b/testdata/d2compiler/TestCompile/link-board-key-nested.exp.json index 9095c27732..ec7d650bc9 100644 --- a/testdata/d2compiler/TestCompile/link-board-key-nested.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-key-nested.exp.json @@ -3,7 +3,7 @@ "name": "", "isFolderOnly": false, "ast": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,0:0:0-7:1:54", + "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,0:0:0-7:1:55", "nodes": [ { "map_key": { @@ -79,7 +79,7 @@ }, { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,3:0:26-7:1:54", + "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,3:0:26-7:1:55", "key": { "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,3:0:26-3:6:32", "path": [ @@ -99,17 +99,17 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,3:8:34-7:0:53", + "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,3:8:34-7:0:54", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,4:1:37-6:3:52", + "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,4:2:38-6:3:53", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,4:1:37-4:2:38", + "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,4:2:38-4:3:39", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,4:1:37-4:2:38", + "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,4:2:38-4:3:39", "value": [ { "string": "x", @@ -123,17 +123,17 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,4:4:40-6:2:51", + "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,4:5:41-6:2:52", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,5:4:46-5:6:48", + "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,5:4:47-5:6:49", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,5:4:46-5:6:48", + "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,5:4:47-5:6:49", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,5:4:46-5:6:48", + "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,5:4:47-5:6:49", "value": [ { "string": "yo", @@ -301,7 +301,7 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,0:0:0-7:1:54", + "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,0:0:0-7:1:55", "nodes": [ { "map_key": { @@ -377,7 +377,7 @@ }, { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,3:0:26-7:1:54", + "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,3:0:26-7:1:55", "key": { "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,3:0:26-3:6:32", "path": [ @@ -397,17 +397,17 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,3:8:34-7:0:53", + "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,3:8:34-7:0:54", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,4:1:37-6:3:52", + "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,4:2:38-6:3:53", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,4:1:37-4:2:38", + "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,4:2:38-4:3:39", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,4:1:37-4:2:38", + "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,4:2:38-4:3:39", "value": [ { "string": "x", @@ -421,17 +421,17 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,4:4:40-6:2:51", + "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,4:5:41-6:2:52", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,5:4:46-5:6:48", + "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,5:4:47-5:6:49", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,5:4:46-5:6:48", + "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,5:4:47-5:6:49", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,5:4:46-5:6:48", + "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,5:4:47-5:6:49", "value": [ { "string": "yo", @@ -495,11 +495,11 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,5:4:46-5:6:48", + "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,5:4:47-5:6:49", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,5:4:46-5:6:48", + "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,5:4:47-5:6:49", "value": [ { "string": "yo", diff --git a/testdata/d2compiler/TestCompile/link-board-mixed.exp.json b/testdata/d2compiler/TestCompile/link-board-mixed.exp.json index ac393f695e..4197bc41e1 100644 --- a/testdata/d2compiler/TestCompile/link-board-mixed.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-mixed.exp.json @@ -3,7 +3,7 @@ "name": "", "isFolderOnly": false, "ast": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,0:0:0-13:1:173", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,0:0:0-13:1:175", "nodes": [ { "map_key": { @@ -197,7 +197,7 @@ }, { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,9:0:115-13:1:173", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,9:0:115-13:1:175", "key": { "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,9:0:115-9:9:124", "path": [ @@ -217,11 +217,11 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,9:11:126-13:0:172", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,9:11:126-13:0:174", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,10:2:130-12:3:171", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,10:2:130-12:3:173", "key": { "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,10:2:130-10:7:135", "path": [ @@ -241,17 +241,17 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,10:9:137-12:2:170", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,10:9:137-12:2:172", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:2:141-11:28:167", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:4:143-11:30:169", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:2:141-11:21:160", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:4:143-11:23:162", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:2:141-11:10:149", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:4:143-11:12:151", "value": [ { "string": "question", @@ -262,7 +262,7 @@ }, { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:11:150-11:16:155", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:13:152-11:18:157", "value": [ { "string": "style", @@ -273,7 +273,7 @@ }, { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:17:156-11:21:160", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:19:158-11:23:162", "value": [ { "string": "fill", @@ -287,7 +287,7 @@ "primary": {}, "value": { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:23:162-11:28:167", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:25:164-11:30:169", "value": [ { "string": "green", @@ -424,7 +424,7 @@ "name": "cat", "isFolderOnly": false, "ast": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,0:0:0-13:1:173", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,0:0:0-13:1:175", "nodes": [ { "map_key": { @@ -618,7 +618,7 @@ }, { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,9:0:115-13:1:173", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,9:0:115-13:1:175", "key": { "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,9:0:115-9:9:124", "path": [ @@ -638,11 +638,11 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,9:11:126-13:0:172", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,9:11:126-13:0:174", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,10:2:130-12:3:171", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,10:2:130-12:3:173", "key": { "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,10:2:130-10:7:135", "path": [ @@ -662,17 +662,17 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,10:9:137-12:2:170", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,10:9:137-12:2:172", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:2:141-11:28:167", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:4:143-11:30:169", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:2:141-11:21:160", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:4:143-11:23:162", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:2:141-11:10:149", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:4:143-11:12:151", "value": [ { "string": "question", @@ -683,7 +683,7 @@ }, { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:11:150-11:16:155", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:13:152-11:18:157", "value": [ { "string": "style", @@ -694,7 +694,7 @@ }, { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:17:156-11:21:160", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:19:158-11:23:162", "value": [ { "string": "fill", @@ -708,7 +708,7 @@ "primary": {}, "value": { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:23:162-11:28:167", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:25:164-11:30:169", "value": [ { "string": "green", @@ -895,7 +895,7 @@ "name": "green", "isFolderOnly": false, "ast": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,0:0:0-13:1:173", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,0:0:0-13:1:175", "nodes": [ { "map_key": { @@ -1089,7 +1089,7 @@ }, { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,9:0:115-13:1:173", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,9:0:115-13:1:175", "key": { "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,9:0:115-9:9:124", "path": [ @@ -1109,11 +1109,11 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,9:11:126-13:0:172", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,9:11:126-13:0:174", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,10:2:130-12:3:171", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,10:2:130-12:3:173", "key": { "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,10:2:130-10:7:135", "path": [ @@ -1133,17 +1133,17 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,10:9:137-12:2:170", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,10:9:137-12:2:172", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:2:141-11:28:167", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:4:143-11:30:169", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:2:141-11:21:160", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:4:143-11:23:162", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:2:141-11:10:149", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:4:143-11:12:151", "value": [ { "string": "question", @@ -1154,7 +1154,7 @@ }, { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:11:150-11:16:155", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:13:152-11:18:157", "value": [ { "string": "style", @@ -1165,7 +1165,7 @@ }, { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:17:156-11:21:160", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:19:158-11:23:162", "value": [ { "string": "fill", @@ -1179,7 +1179,7 @@ "primary": {}, "value": { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:23:162-11:28:167", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:25:164-11:30:169", "value": [ { "string": "green", @@ -1290,11 +1290,11 @@ }, { "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:2:141-11:21:160", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:4:143-11:23:162", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:2:141-11:10:149", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:4:143-11:12:151", "value": [ { "string": "question", @@ -1305,7 +1305,7 @@ }, { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:11:150-11:16:155", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:13:152-11:18:157", "value": [ { "string": "style", @@ -1316,7 +1316,7 @@ }, { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:17:156-11:21:160", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:19:158-11:23:162", "value": [ { "string": "fill", diff --git a/testdata/d2compiler/TestCompile/link-board-nested.exp.json b/testdata/d2compiler/TestCompile/link-board-nested.exp.json index 40561e63c3..60d481fa69 100644 --- a/testdata/d2compiler/TestCompile/link-board-nested.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-nested.exp.json @@ -3,7 +3,7 @@ "name": "", "isFolderOnly": false, "ast": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:0:0-9:1:94", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:0:0-9:1:101", "nodes": [ { "map_key": { @@ -50,7 +50,7 @@ }, { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,1:0:26-9:1:94", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,1:0:26-9:1:101", "key": { "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,1:0:26-1:6:32", "path": [ @@ -70,17 +70,17 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,1:8:34-9:0:93", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,1:8:34-9:0:100", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,2:1:37-8:3:92", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,2:2:38-8:3:99", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,2:1:37-2:2:38", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,2:2:38-2:3:39", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,2:1:37-2:2:38", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,2:2:38-2:3:39", "value": [ { "string": "x", @@ -94,17 +94,17 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,2:4:40-8:2:91", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,2:5:41-8:2:98", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,3:4:46-7:5:88", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,3:4:47-7:5:95", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,3:4:46-3:10:52", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,3:4:47-3:10:53", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,3:4:46-3:10:52", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,3:4:47-3:10:53", "value": [ { "string": "layers", @@ -118,17 +118,17 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,3:12:54-7:4:87", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,3:12:55-7:4:94", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,4:3:59-6:4:82", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,4:6:63-6:7:89", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,4:3:59-4:4:60", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,4:6:63-4:7:64", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,4:3:59-4:4:60", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,4:6:63-4:7:64", "value": [ { "string": "x", @@ -142,17 +142,17 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,4:6:62-6:3:81", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,4:9:66-6:6:88", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,5:8:72-5:13:77", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,5:8:76-5:13:81", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,5:8:72-5:13:77", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,5:8:76-5:13:81", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,5:8:72-5:13:77", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,5:8:76-5:13:81", "value": [ { "string": "hello", @@ -283,7 +283,7 @@ "name": "x", "isFolderOnly": true, "ast": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:0:0-9:1:94", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:0:0-9:1:101", "nodes": [ { "map_key": { @@ -330,7 +330,7 @@ }, { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,1:0:26-9:1:94", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,1:0:26-9:1:101", "key": { "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,1:0:26-1:6:32", "path": [ @@ -350,17 +350,17 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,1:8:34-9:0:93", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,1:8:34-9:0:100", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,2:1:37-8:3:92", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,2:2:38-8:3:99", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,2:1:37-2:2:38", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,2:2:38-2:3:39", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,2:1:37-2:2:38", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,2:2:38-2:3:39", "value": [ { "string": "x", @@ -374,17 +374,17 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,2:4:40-8:2:91", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,2:5:41-8:2:98", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,3:4:46-7:5:88", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,3:4:47-7:5:95", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,3:4:46-3:10:52", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,3:4:47-3:10:53", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,3:4:46-3:10:52", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,3:4:47-3:10:53", "value": [ { "string": "layers", @@ -398,17 +398,17 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,3:12:54-7:4:87", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,3:12:55-7:4:94", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,4:3:59-6:4:82", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,4:6:63-6:7:89", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,4:3:59-4:4:60", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,4:6:63-4:7:64", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,4:3:59-4:4:60", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,4:6:63-4:7:64", "value": [ { "string": "x", @@ -422,17 +422,17 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,4:6:62-6:3:81", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,4:9:66-6:6:88", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,5:8:72-5:13:77", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,5:8:76-5:13:81", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,5:8:72-5:13:77", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,5:8:76-5:13:81", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,5:8:72-5:13:77", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,5:8:76-5:13:81", "value": [ { "string": "hello", @@ -501,7 +501,7 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:0:0-9:1:94", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:0:0-9:1:101", "nodes": [ { "map_key": { @@ -548,7 +548,7 @@ }, { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,1:0:26-9:1:94", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,1:0:26-9:1:101", "key": { "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,1:0:26-1:6:32", "path": [ @@ -568,17 +568,17 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,1:8:34-9:0:93", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,1:8:34-9:0:100", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,2:1:37-8:3:92", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,2:2:38-8:3:99", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,2:1:37-2:2:38", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,2:2:38-2:3:39", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,2:1:37-2:2:38", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,2:2:38-2:3:39", "value": [ { "string": "x", @@ -592,17 +592,17 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,2:4:40-8:2:91", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,2:5:41-8:2:98", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,3:4:46-7:5:88", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,3:4:47-7:5:95", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,3:4:46-3:10:52", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,3:4:47-3:10:53", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,3:4:46-3:10:52", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,3:4:47-3:10:53", "value": [ { "string": "layers", @@ -616,17 +616,17 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,3:12:54-7:4:87", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,3:12:55-7:4:94", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,4:3:59-6:4:82", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,4:6:63-6:7:89", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,4:3:59-4:4:60", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,4:6:63-4:7:64", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,4:3:59-4:4:60", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,4:6:63-4:7:64", "value": [ { "string": "x", @@ -640,17 +640,17 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,4:6:62-6:3:81", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,4:9:66-6:6:88", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,5:8:72-5:13:77", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,5:8:76-5:13:81", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,5:8:72-5:13:77", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,5:8:76-5:13:81", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,5:8:72-5:13:77", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,5:8:76-5:13:81", "value": [ { "string": "hello", @@ -724,11 +724,11 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,5:8:72-5:13:77", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,5:8:76-5:13:81", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,5:8:72-5:13:77", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,5:8:76-5:13:81", "value": [ { "string": "hello", diff --git a/testdata/d2compiler/TestCompile/link-board-underscore-not-found.exp.json b/testdata/d2compiler/TestCompile/link-board-underscore-not-found.exp.json index b1ef0359c0..c5d2aaac60 100644 --- a/testdata/d2compiler/TestCompile/link-board-underscore-not-found.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-underscore-not-found.exp.json @@ -4,8 +4,8 @@ "ioerr": null, "errs": [ { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore-not-found.d2,6:4:50-6:14:60", - "errmsg": "d2/testdata/d2compiler/TestCompile/link-board-underscore-not-found.d2:7:5: linked board not found" + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore-not-found.d2,6:8:59-6:18:69", + "errmsg": "d2/testdata/d2compiler/TestCompile/link-board-underscore-not-found.d2:7:9: invalid underscore usage" } ] } diff --git a/testdata/d2compiler/TestCompile/link-board-underscore.exp.json b/testdata/d2compiler/TestCompile/link-board-underscore.exp.json index 7f12b70d76..2fcd031153 100644 --- a/testdata/d2compiler/TestCompile/link-board-underscore.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-underscore.exp.json @@ -3,7 +3,7 @@ "name": "", "isFolderOnly": false, "ast": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,0:0:0-11:1:107", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,0:0:0-11:1:121", "nodes": [ { "map_key": { @@ -30,7 +30,7 @@ }, { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,1:0:2-11:1:107", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,1:0:2-11:1:121", "key": { "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,1:0:2-1:6:8", "path": [ @@ -50,11 +50,11 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,1:8:10-11:0:106", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,1:8:10-11:0:120", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,2:1:13-10:3:105", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,2:1:13-10:3:119", "key": { "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,2:1:13-2:2:14", "path": [ @@ -74,7 +74,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,2:4:16-10:2:104", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,2:4:16-10:2:118", "nodes": [ { "map_key": { @@ -101,7 +101,7 @@ }, { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,4:4:28-9:5:101", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,4:4:28-9:5:115", "key": { "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,4:4:28-4:10:34", "path": [ @@ -121,17 +121,17 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,4:12:36-9:4:100", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,4:12:36-9:4:114", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,5:3:41-8:4:95", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,5:6:44-8:7:109", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,5:3:41-5:4:42", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,5:6:44-5:7:45", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,5:3:41-5:4:42", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,5:6:44-5:7:45", "value": [ { "string": "x", @@ -145,17 +145,17 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,5:6:44-8:3:94", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,5:9:47-8:6:108", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:4:50-6:28:74", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:8:57-6:32:81", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:4:50-6:14:60", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:8:57-6:18:67", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:4:50-6:9:55", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:8:57-6:13:62", "value": [ { "string": "hello", @@ -166,7 +166,7 @@ }, { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:10:56-6:14:60", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:14:63-6:18:67", "value": [ { "string": "link", @@ -192,13 +192,13 @@ }, { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:4:79-7:15:90", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:8:90-7:19:101", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:4:79-7:12:87", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:8:90-7:16:98", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:4:79-7:7:82", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:8:90-7:11:93", "value": [ { "string": "hey", @@ -209,7 +209,7 @@ }, { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:8:83-7:12:87", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:12:94-7:16:98", "value": [ { "string": "link", @@ -335,7 +335,7 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,0:0:0-11:1:107", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,0:0:0-11:1:121", "nodes": [ { "map_key": { @@ -362,7 +362,7 @@ }, { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,1:0:2-11:1:107", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,1:0:2-11:1:121", "key": { "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,1:0:2-1:6:8", "path": [ @@ -382,11 +382,11 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,1:8:10-11:0:106", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,1:8:10-11:0:120", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,2:1:13-10:3:105", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,2:1:13-10:3:119", "key": { "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,2:1:13-2:2:14", "path": [ @@ -406,7 +406,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,2:4:16-10:2:104", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,2:4:16-10:2:118", "nodes": [ { "map_key": { @@ -433,7 +433,7 @@ }, { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,4:4:28-9:5:101", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,4:4:28-9:5:115", "key": { "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,4:4:28-4:10:34", "path": [ @@ -453,17 +453,17 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,4:12:36-9:4:100", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,4:12:36-9:4:114", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,5:3:41-8:4:95", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,5:6:44-8:7:109", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,5:3:41-5:4:42", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,5:6:44-5:7:45", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,5:3:41-5:4:42", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,5:6:44-5:7:45", "value": [ { "string": "x", @@ -477,17 +477,17 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,5:6:44-8:3:94", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,5:9:47-8:6:108", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:4:50-6:28:74", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:8:57-6:32:81", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:4:50-6:14:60", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:8:57-6:18:67", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:4:50-6:9:55", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:8:57-6:13:62", "value": [ { "string": "hello", @@ -498,7 +498,7 @@ }, { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:10:56-6:14:60", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:14:63-6:18:67", "value": [ { "string": "link", @@ -524,13 +524,13 @@ }, { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:4:79-7:15:90", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:8:90-7:19:101", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:4:79-7:12:87", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:8:90-7:16:98", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:4:79-7:7:82", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:8:90-7:11:93", "value": [ { "string": "hey", @@ -541,7 +541,7 @@ }, { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:8:83-7:12:87", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:12:94-7:16:98", "value": [ { "string": "link", @@ -667,7 +667,7 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,0:0:0-11:1:107", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,0:0:0-11:1:121", "nodes": [ { "map_key": { @@ -694,7 +694,7 @@ }, { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,1:0:2-11:1:107", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,1:0:2-11:1:121", "key": { "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,1:0:2-1:6:8", "path": [ @@ -714,11 +714,11 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,1:8:10-11:0:106", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,1:8:10-11:0:120", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,2:1:13-10:3:105", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,2:1:13-10:3:119", "key": { "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,2:1:13-2:2:14", "path": [ @@ -738,7 +738,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,2:4:16-10:2:104", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,2:4:16-10:2:118", "nodes": [ { "map_key": { @@ -765,7 +765,7 @@ }, { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,4:4:28-9:5:101", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,4:4:28-9:5:115", "key": { "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,4:4:28-4:10:34", "path": [ @@ -785,17 +785,17 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,4:12:36-9:4:100", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,4:12:36-9:4:114", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,5:3:41-8:4:95", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,5:6:44-8:7:109", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,5:3:41-5:4:42", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,5:6:44-5:7:45", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,5:3:41-5:4:42", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,5:6:44-5:7:45", "value": [ { "string": "x", @@ -809,17 +809,17 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,5:6:44-8:3:94", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,5:9:47-8:6:108", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:4:50-6:28:74", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:8:57-6:32:81", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:4:50-6:14:60", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:8:57-6:18:67", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:4:50-6:9:55", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:8:57-6:13:62", "value": [ { "string": "hello", @@ -830,7 +830,7 @@ }, { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:10:56-6:14:60", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:14:63-6:18:67", "value": [ { "string": "link", @@ -856,13 +856,13 @@ }, { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:4:79-7:15:90", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:8:90-7:19:101", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:4:79-7:12:87", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:8:90-7:16:98", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:4:79-7:7:82", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:8:90-7:11:93", "value": [ { "string": "hey", @@ -873,7 +873,7 @@ }, { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:8:83-7:12:87", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:12:94-7:16:98", "value": [ { "string": "link", @@ -956,11 +956,11 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:4:50-6:14:60", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:8:57-6:18:67", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:4:50-6:9:55", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:8:57-6:13:62", "value": [ { "string": "hello", @@ -971,7 +971,7 @@ }, { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:10:56-6:14:60", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:14:63-6:18:67", "value": [ { "string": "link", @@ -1017,11 +1017,11 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:4:79-7:12:87", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:8:90-7:16:98", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:4:79-7:7:82", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:8:90-7:11:93", "value": [ { "string": "hey", @@ -1032,7 +1032,7 @@ }, { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:8:83-7:12:87", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:12:94-7:16:98", "value": [ { "string": "link", From d8b1e65386d2cfbaff047a3176e292fe4054a7ec Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Thu, 2 Mar 2023 18:01:51 -0800 Subject: [PATCH 15/17] disallow referring to root --- d2ir/compile.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/d2ir/compile.go b/d2ir/compile.go index 5dba47c6d1..2a8e3a8afc 100644 --- a/d2ir/compile.go +++ b/d2ir/compile.go @@ -157,6 +157,11 @@ func (c *compiler) compileLink(refctx *RefContext) { return } + if linkIDA[0] == "root" { + c.errorf(refctx.Key.Key, "cannot refer to root in link") + return + } + // If it doesn't start with one of these reserved words, the link is definitely not a board link. if linkIDA[0] != "layers" && linkIDA[0] != "scenarios" && linkIDA[0] != "steps" && linkIDA[0] != "_" { return From 81ce1f8209f17f4572a9bc16d49734733e93daad Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Thu, 2 Mar 2023 18:25:14 -0800 Subject: [PATCH 16/17] pr feedback --- d2compiler/compile.go | 3 +-- d2format/format.go | 8 -------- d2ir/compile.go | 2 +- d2ir/d2ir.go | 2 +- 4 files changed, 3 insertions(+), 12 deletions(-) diff --git a/d2compiler/compile.go b/d2compiler/compile.go index 6be93af4ec..27aaadb61a 100644 --- a/d2compiler/compile.go +++ b/d2compiler/compile.go @@ -781,9 +781,8 @@ func hasBoard(root *d2graph.Graph, ida []string) bool { return hasBoard(b, ida[i+1:]) } } - default: - break } + break } return false } diff --git a/d2format/format.go b/d2format/format.go index 3279fb0693..e979a6feaa 100644 --- a/d2format/format.go +++ b/d2format/format.go @@ -409,11 +409,3 @@ func KeyPath(kp *d2ast.KeyPath) (ida []string) { } return ida } - -func IDA(ida []string) *d2ast.KeyPath { - kp := &d2ast.KeyPath{} - for _, s := range ida { - kp.Path = append(kp.Path, d2ast.MakeValueBox(d2ast.RawString(s, true)).StringBox()) - } - return kp -} diff --git a/d2ir/compile.go b/d2ir/compile.go index 2a8e3a8afc..41e54dadc1 100644 --- a/d2ir/compile.go +++ b/d2ir/compile.go @@ -197,7 +197,7 @@ func (c *compiler) compileLink(refctx *RefContext) { // Create the absolute path by appending scope path with value specified scopeIDA = append(scopeIDA, linkIDA...) - kp := d2format.IDA(scopeIDA) + kp := d2ast.MakeKeyPath(scopeIDA) refctx.Key.Value = d2ast.MakeValueBox(d2ast.RawString(d2format.Format(kp), true)) } diff --git a/d2ir/d2ir.go b/d2ir/d2ir.go index aa6a4734ca..8a687bbdf1 100644 --- a/d2ir/d2ir.go +++ b/d2ir/d2ir.go @@ -1053,7 +1053,7 @@ func BoardIDA(n Node) (ida []string) { } } -// IDA returns the absolute path to n from the nearest board root. +// IDA returns the absolute path to n. func IDA(n Node) (ida []string) { for { f, ok := n.(*Field) From e13be5c09a736d2080e9882a6a193d5283590c33 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Thu, 2 Mar 2023 19:32:31 -0800 Subject: [PATCH 17/17] fix --- d2compiler/compile.go | 53 +++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 27 deletions(-) diff --git a/d2compiler/compile.go b/d2compiler/compile.go index 27aaadb61a..1a4ea66bd0 100644 --- a/d2compiler/compile.go +++ b/d2compiler/compile.go @@ -752,37 +752,36 @@ func (c *compiler) validateBoardLinks(g *d2graph.Graph) { } func hasBoard(root *d2graph.Graph, ida []string) bool { - for i := 0; i < len(ida); i += 2 { - id := ida[i] - if i == 0 && id == "root" { - i-- - continue - } - if i == len(ida)-1 { - return root.Name == id - } - nextID := ida[i+1] - switch id { - case "layers": - for _, b := range root.Layers { - if b.Name == nextID { - return hasBoard(b, ida[i+1:]) - } + if len(ida) == 0 { + return true + } + if ida[0] == "root" { + return hasBoard(root, ida[1:]) + } + id := ida[0] + if len(ida) == 1 { + return root.Name == id + } + nextID := ida[1] + switch id { + case "layers": + for _, b := range root.Layers { + if b.Name == nextID { + return hasBoard(b, ida[2:]) } - case "scenarios": - for _, b := range root.Scenarios { - if b.Name == nextID { - return hasBoard(b, ida[i+1:]) - } + } + case "scenarios": + for _, b := range root.Scenarios { + if b.Name == nextID { + return hasBoard(b, ida[2:]) } - case "steps": - for _, b := range root.Steps { - if b.Name == nextID { - return hasBoard(b, ida[i+1:]) - } + } + case "steps": + for _, b := range root.Steps { + if b.Name == nextID { + return hasBoard(b, ida[2:]) } } - break } return false }