diff --git a/ci/release/changelogs/next.md b/ci/release/changelogs/next.md index 6841ef632..092a1ff80 100644 --- a/ci/release/changelogs/next.md +++ b/ci/release/changelogs/next.md @@ -8,6 +8,7 @@ - Render: - markdown, latex, and code can be used as object labels [#2204](https://github.com/terrastruct/d2/pull/2204) - `shape: c4-person` to render a person shape like what the C4 model prescribes [#2397](https://github.com/terrastruct/d2/pull/2397) +- Icons: border-radius should work on icon [#2409](https://github.com/terrastruct/d2/issues/2409) - Diagram legends are implemented [#2416](https://github.com/terrastruct/d2/pull/2416) #### Improvements 🧹 diff --git a/d2compiler/compile.go b/d2compiler/compile.go index 34e49c383..651238afe 100644 --- a/d2compiler/compile.go +++ b/d2compiler/compile.go @@ -389,7 +389,7 @@ func (c *compiler) compileField(obj *d2graph.Object, f *d2ir.Field) { c.errorf(f.LastRef().AST(), `"style" expected to be set to a map of key-values, or contain an additional keyword like "style.opacity: 0.4"`) return } - c.compileStyle(&obj.Attributes, f.Map()) + c.compileStyle(&obj.Attributes.Style, f.Map()) return } @@ -581,6 +581,17 @@ func (c *compiler) compileReserved(attrs *d2graph.Attributes, f *d2ir.Field) { } attrs.Icon = iconURL c.compilePosition(attrs, f) + if f.Map() != nil { + for _, ff := range f.Map().Fields { + if ff.Name.ScalarString() == "style" && ff.Name.IsUnquoted() { + if ff.Map() == nil || len(ff.Map().Fields) == 0 { + c.errorf(f.LastRef().AST(), `"style" expected to be set to a map of key-values, or contain an additional keyword like "style.opacity: 0.4"`) + return + } + c.compileStyle(&attrs.IconStyle, ff.Map()) + } + } + } case "near": nearKey, err := d2parser.ParseKey(scalar.ScalarString()) if err != nil { @@ -741,13 +752,13 @@ func (c *compiler) compileReserved(attrs *d2graph.Attributes, f *d2ir.Field) { } } -func (c *compiler) compileStyle(attrs *d2graph.Attributes, m *d2ir.Map) { +func (c *compiler) compileStyle(styles *d2graph.Style, m *d2ir.Map) { for _, f := range m.Fields { - c.compileStyleField(attrs, f) + c.compileStyleField(styles, f) } } -func (c *compiler) compileStyleField(attrs *d2graph.Attributes, f *d2ir.Field) { +func (c *compiler) compileStyleField(styles *d2graph.Style, f *d2ir.Field) { if _, ok := d2ast.StyleKeywords[strings.ToLower(f.Name.ScalarString())]; !(ok && f.Name.IsUnquoted()) { c.errorf(f.LastRef().AST(), `invalid style keyword: "%s"`, f.Name.ScalarString()) return @@ -755,65 +766,57 @@ func (c *compiler) compileStyleField(attrs *d2graph.Attributes, f *d2ir.Field) { if f.Primary() == nil { return } - compileStyleFieldInit(attrs, f) + compileStyleFieldInit(styles, f) scalar := f.Primary().Value - err := attrs.Style.Apply(f.Name.ScalarString(), scalar.ScalarString()) + err := styles.Apply(f.Name.ScalarString(), scalar.ScalarString()) if err != nil { c.errorf(scalar, err.Error()) return } } -func compileStyleFieldInit(attrs *d2graph.Attributes, f *d2ir.Field) { +func compileStyleFieldInit(styles *d2graph.Style, f *d2ir.Field) { switch f.Name.ScalarString() { case "opacity": - attrs.Style.Opacity = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} + styles.Opacity = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} case "stroke": - attrs.Style.Stroke = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} + styles.Stroke = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} case "fill": - attrs.Style.Fill = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} + styles.Fill = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} case "fill-pattern": - attrs.Style.FillPattern = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} + styles.FillPattern = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} case "stroke-width": - attrs.Style.StrokeWidth = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} + styles.StrokeWidth = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} case "stroke-dash": - attrs.Style.StrokeDash = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} + styles.StrokeDash = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} case "border-radius": - attrs.Style.BorderRadius = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} + styles.BorderRadius = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} case "shadow": - attrs.Style.Shadow = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} + styles.Shadow = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} case "3d": - attrs.Style.ThreeDee = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} + styles.ThreeDee = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} case "multiple": - attrs.Style.Multiple = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} + styles.Multiple = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} case "font": - attrs.Style.Font = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} + styles.Font = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} case "font-size": - attrs.Style.FontSize = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} + styles.FontSize = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} case "font-color": - attrs.Style.FontColor = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} + styles.FontColor = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} case "animated": - attrs.Style.Animated = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} + styles.Animated = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} case "bold": - attrs.Style.Bold = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} + styles.Bold = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} case "italic": - attrs.Style.Italic = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} + styles.Italic = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} case "underline": - attrs.Style.Underline = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} + styles.Underline = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} case "filled": - attrs.Style.Filled = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} - case "width": - attrs.WidthAttr = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} - case "height": - attrs.HeightAttr = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} - case "top": - attrs.Top = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} - case "left": - attrs.Left = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} + styles.Filled = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} case "double-border": - attrs.Style.DoubleBorder = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} + styles.DoubleBorder = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} case "text-transform": - attrs.Style.TextTransform = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} + styles.TextTransform = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} } } @@ -900,7 +903,7 @@ func (c *compiler) compileEdgeField(edge *d2graph.Edge, f *d2ir.Field) { if f.Map() == nil { return } - c.compileStyle(&edge.Attributes, f.Map()) + c.compileStyle(&edge.Attributes.Style, f.Map()) return } @@ -939,7 +942,7 @@ func (c *compiler) compileArrowheads(edge *d2graph.Edge, f *d2ir.Field) { if f2.Map() == nil { continue } - c.compileStyle(attrs, f2.Map()) + c.compileStyle(&attrs.Style, f2.Map()) continue } else { c.errorf(f2.LastRef().AST(), `source-arrowhead/target-arrowhead map keys must be reserved keywords`) diff --git a/d2exporter/export.go b/d2exporter/export.go index dc98b51e3..56f4b9146 100644 --- a/d2exporter/export.go +++ b/d2exporter/export.go @@ -194,6 +194,9 @@ func applyStyles(shape *d2target.Shape, obj *d2graph.Object) { if obj.Style.DoubleBorder != nil { shape.DoubleBorder, _ = strconv.ParseBool(obj.Style.DoubleBorder.Value) } + if obj.IconStyle.BorderRadius != nil { + shape.IconBorderRadius, _ = strconv.Atoi(obj.IconStyle.BorderRadius.Value) + } } func toShape(obj *d2graph.Object, g *d2graph.Graph) d2target.Shape { @@ -413,6 +416,10 @@ func toConnection(edge *d2graph.Edge, theme *d2themes.Theme) d2target.Connection } } + if edge.IconStyle.BorderRadius != nil { + connection.IconBorderRadius, _ = strconv.ParseFloat(edge.IconStyle.BorderRadius.Value, 64) + } + if edge.Style.Italic != nil { connection.Italic, _ = strconv.ParseBool(edge.Style.Italic.Value) } diff --git a/d2graph/d2graph.go b/d2graph/d2graph.go index ed387918a..ba9a02657 100644 --- a/d2graph/d2graph.go +++ b/d2graph/d2graph.go @@ -196,10 +196,11 @@ type Attributes struct { Label Scalar `json:"label"` LabelDimensions d2target.TextDimensions `json:"labelDimensions"` - Style Style `json:"style"` - Icon *url.URL `json:"icon,omitempty"` - Tooltip *Scalar `json:"tooltip,omitempty"` - Link *Scalar `json:"link,omitempty"` + Style Style `json:"style"` + Icon *url.URL `json:"icon,omitempty"` + IconStyle Style `json:"iconStyle"` + Tooltip *Scalar `json:"tooltip,omitempty"` + Link *Scalar `json:"link,omitempty"` WidthAttr *Scalar `json:"width,omitempty"` HeightAttr *Scalar `json:"height,omitempty"` diff --git a/d2renderers/d2svg/d2svg.go b/d2renderers/d2svg/d2svg.go index 089eaae4b..abc21d00b 100644 --- a/d2renderers/d2svg/d2svg.go +++ b/d2renderers/d2svg/d2svg.go @@ -853,12 +853,17 @@ func drawConnection(writer io.Writer, diagramHash string, connection d2target.Co if connection.Icon != nil { iconPos := connection.GetIconPosition() if iconPos != nil { - fmt.Fprintf(writer, ``, + connectionIconClipPath := "" + if connection.IconBorderRadius != 0 { + connectionIconClipPath = fmt.Sprintf(` clip-path="inset(0 round %fpx)"`, connection.IconBorderRadius) + } + fmt.Fprintf(writer, ``, html.EscapeString(connection.Icon.String()), iconPos.X, iconPos.Y, d2target.DEFAULT_ICON_SIZE, d2target.DEFAULT_ICON_SIZE, + connectionIconClipPath, ) } } @@ -1324,6 +1329,14 @@ func drawShape(writer, appendixWriter io.Writer, diagramHash string, targetShape if targetShape.BorderRadius != 0 && (targetShape.Type == d2target.ShapeClass || targetShape.Type == d2target.ShapeSQLTable) { fmt.Fprint(writer, clipPathForBorderRadius(diagramHash, targetShape)) } + var iconClipPathID string + if targetShape.IconBorderRadius != 0 && (targetShape.Type == d2target.ShapeImage) { + // Set the icon's border-radius to half of it's smaller dimension in case it exceeds that + // https://www.w3.org/Style/CSS/Tracker/issues/29?changelog + targetShape.IconBorderRadius = min(targetShape.IconBorderRadius, min(targetShape.Width, targetShape.Height)/2) + iconClipPathID = fmt.Sprintf("%v-%v-icon", diagramHash, svg.SVGID(targetShape.ID)) + fmt.Fprint(writer, applyIconBorderRadius(iconClipPathID, targetShape)) + } classes := []string{base64.URLEncoding.EncodeToString([]byte(svg.EscapeText(targetShape.ID)))} if targetShape.Animated { classes = append(classes, "animated-shape") @@ -1435,6 +1448,9 @@ func drawShape(writer, appendixWriter io.Writer, diagramHash string, targetShape el.Fill = fill el.Stroke = stroke el.Style = style + if targetShape.IconBorderRadius != 0 { + el.ClipPath = iconClipPathID + } fmt.Fprint(writer, el.Render()) // TODO should standardize "" to rectangle @@ -1627,12 +1643,17 @@ func drawShape(writer, appendixWriter io.Writer, diagramHash string, targetShape tl := iconPosition.GetPointOnBox(box, label.PADDING, float64(iconSize), float64(iconSize)) - fmt.Fprintf(writer, ``, + shapeIconClipPath := "" + if targetShape.IconBorderRadius != 0 { + shapeIconClipPath = fmt.Sprintf(` clip-path="inset(0 round %dpx)"`, targetShape.IconBorderRadius) + } + fmt.Fprintf(writer, ``, html.EscapeString(targetShape.Icon.String()), tl.X, tl.Y, iconSize, iconSize, + shapeIconClipPath, ) } @@ -1862,6 +1883,28 @@ func drawShape(writer, appendixWriter io.Writer, diagramHash string, targetShape return labelMask, nil } +func applyIconBorderRadius(clipPathID string, shape d2target.Shape) string { + box := geo.NewBox( + geo.NewPoint(float64(shape.Pos.X), float64(shape.Pos.Y)), + float64(shape.Width), + float64(shape.Height), + ) + topX, topY := box.TopLeft.X+box.Width, box.TopLeft.Y + + out := fmt.Sprintf(``, clipPathID) + out += fmt.Sprintf(` ` +} + func addAppendixItems(writer io.Writer, diagramHash string, targetShape d2target.Shape, s shape.Shape) { var p1, p2 *geo.Point if targetShape.Tooltip != "" || targetShape.Link != "" { diff --git a/d2renderers/d2svg/table.go b/d2renderers/d2svg/table.go index f7b2782db..86f5438e4 100644 --- a/d2renderers/d2svg/table.go +++ b/d2renderers/d2svg/table.go @@ -22,7 +22,7 @@ func clipPathForBorderRadius(diagramHash string, shape d2target.Shape) string { ) topX, topY := box.TopLeft.X+box.Width, box.TopLeft.Y - out := fmt.Sprintf(``, diagramHash, shape.ID) + out := fmt.Sprintf(``, diagramHash, svg.SVGID(shape.ID)) out += fmt.Sprintf(` aidintPKdiskintFKjsonjsonbUNQlast_updatedtimestamp with time zone b+field[]string+method(a uint64)(x, y int) c d + .d2-1154201599 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1154201599);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1154201599);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1154201599);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1154201599);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1154201599);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1154201599);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1154201599);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1154201599);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1154201599);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1154201599);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1154201599);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1154201599);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1154201599);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1154201599);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1154201599);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1154201599);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1154201599);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1154201599);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]> aidintPKdiskintFKjsonjsonbUNQlast_updatedtimestamp with time zone b+field[]string+method(a uint64)(x, y int) c d \ No newline at end of file diff --git a/e2etests/testdata/stable/class_and_sqlTable_border_radius/elk/sketch.exp.svg b/e2etests/testdata/stable/class_and_sqlTable_border_radius/elk/sketch.exp.svg index e321d494a..0f955d794 100644 --- a/e2etests/testdata/stable/class_and_sqlTable_border_radius/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/class_and_sqlTable_border_radius/elk/sketch.exp.svg @@ -96,7 +96,7 @@ .d2-1612823801 .color-AA4{color:#EDF0FD;} .d2-1612823801 .color-AA5{color:#F7F8FE;} .d2-1612823801 .color-AB4{color:#EDF0FD;} - .d2-1612823801 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1612823801);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1612823801);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1612823801);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1612823801);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1612823801);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1612823801);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1612823801);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1612823801);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1612823801);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1612823801);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1612823801);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1612823801);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1612823801);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1612823801);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1612823801);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1612823801);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1612823801);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1612823801);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]> aidintPKdiskintFKjsonjsonbUNQlast_updatedtimestamp with time zone b+field[]string+method(a uint64)(x, y int) c d + .d2-1612823801 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1612823801);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1612823801);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1612823801);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1612823801);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1612823801);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1612823801);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1612823801);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1612823801);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1612823801);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1612823801);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1612823801);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1612823801);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1612823801);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1612823801);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1612823801);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1612823801);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1612823801);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1612823801);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]> aidintPKdiskintFKjsonjsonbUNQlast_updatedtimestamp with time zone b+field[]string+method(a uint64)(x, y int) c d \ No newline at end of file diff --git a/e2etests/testdata/txtar/connection-icons/dagre/board.exp.json b/e2etests/testdata/txtar/connection-icons/dagre/board.exp.json index 96c74348f..b6316b897 100644 --- a/e2etests/testdata/txtar/connection-icons/dagre/board.exp.json +++ b/e2etests/testdata/txtar/connection-icons/dagre/board.exp.json @@ -15,7 +15,7 @@ "id": "a", "type": "rectangle", "pos": { - "x": 0, + "x": 29, "y": 0 }, "width": 53, @@ -57,7 +57,7 @@ "id": "b", "type": "rectangle", "pos": { - "x": 186, + "x": 275, "y": 0 }, "width": 53, @@ -99,7 +99,7 @@ "id": "c", "type": "rectangle", "pos": { - "x": 339, + "x": 459, "y": 0 }, "width": 53, @@ -136,6 +136,90 @@ "labelPosition": "INSIDE_MIDDLE_CENTER", "zIndex": 0, "level": 1 + }, + { + "id": "producer", + "type": "rectangle", + "pos": { + "x": 0, + "y": 126 + }, + "width": 110, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "producer", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 65, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "consumer", + "type": "rectangle", + "pos": { + "x": 243, + "y": 126 + }, + "width": 116, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "consumer", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 71, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 } ], "connections": [ @@ -165,19 +249,19 @@ "link": "", "route": [ { - "x": 52.5, + "x": 82.5, "y": 33 }, { - "x": 106.0999984741211, + "x": 157.6999969482422, "y": 33 }, { - "x": 132.89999389648438, + "x": 196.10000610351562, "y": 33 }, { - "x": 186.5, + "x": 274.5, "y": 33 } ], @@ -226,19 +310,19 @@ "link": "", "route": [ { - "x": 239, + "x": 328.5, "y": 33 }, { - "x": 279, + "x": 392.8999938964844, "y": 33 }, { - "x": 299, + "x": 419, "y": 33 }, { - "x": 339, + "x": 459, "y": 33 } ], @@ -260,6 +344,68 @@ }, "iconPosition": "INSIDE_MIDDLE_CENTER", "zIndex": 0 + }, + { + "id": "(producer -> consumer)[0]", + "src": "producer", + "srcArrow": "none", + "dst": "consumer", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 109.5, + "y": 159 + }, + { + "x": 163.10000610351562, + "y": 159 + }, + { + "x": 189.89999389648438, + "y": 159 + }, + { + "x": 243.5, + "y": 159 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/aws/Application Integration/Amazon-Simple-Queue-Service-SQS.svg", + "RawPath": "/aws%2FApplication%20Integration%2FAmazon-Simple-Queue-Service-SQS.svg", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "INSIDE_MIDDLE_CENTER", + "iconBorderRadius": 20, + "zIndex": 0 } ], "root": { diff --git a/e2etests/testdata/txtar/connection-icons/dagre/sketch.exp.svg b/e2etests/testdata/txtar/connection-icons/dagre/sketch.exp.svg index dfe72153f..e571a1ef0 100644 --- a/e2etests/testdata/txtar/connection-icons/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/connection-icons/dagre/sketch.exp.svg @@ -1,17 +1,17 @@ -abc hello - - - - - - + .d2-970759274 .fill-N1{fill:#0A0F25;} + .d2-970759274 .fill-N2{fill:#676C7E;} + .d2-970759274 .fill-N3{fill:#9499AB;} + .d2-970759274 .fill-N4{fill:#CFD2DD;} + .d2-970759274 .fill-N5{fill:#DEE1EB;} + .d2-970759274 .fill-N6{fill:#EEF1F8;} + .d2-970759274 .fill-N7{fill:#FFFFFF;} + .d2-970759274 .fill-B1{fill:#0D32B2;} + .d2-970759274 .fill-B2{fill:#0D32B2;} + .d2-970759274 .fill-B3{fill:#E3E9FD;} + .d2-970759274 .fill-B4{fill:#E3E9FD;} + .d2-970759274 .fill-B5{fill:#EDF0FD;} + .d2-970759274 .fill-B6{fill:#F7F8FE;} + .d2-970759274 .fill-AA2{fill:#4A6FF3;} + .d2-970759274 .fill-AA4{fill:#EDF0FD;} + .d2-970759274 .fill-AA5{fill:#F7F8FE;} + .d2-970759274 .fill-AB4{fill:#EDF0FD;} + .d2-970759274 .fill-AB5{fill:#F7F8FE;} + .d2-970759274 .stroke-N1{stroke:#0A0F25;} + .d2-970759274 .stroke-N2{stroke:#676C7E;} + .d2-970759274 .stroke-N3{stroke:#9499AB;} + .d2-970759274 .stroke-N4{stroke:#CFD2DD;} + .d2-970759274 .stroke-N5{stroke:#DEE1EB;} + .d2-970759274 .stroke-N6{stroke:#EEF1F8;} + .d2-970759274 .stroke-N7{stroke:#FFFFFF;} + .d2-970759274 .stroke-B1{stroke:#0D32B2;} + .d2-970759274 .stroke-B2{stroke:#0D32B2;} + .d2-970759274 .stroke-B3{stroke:#E3E9FD;} + .d2-970759274 .stroke-B4{stroke:#E3E9FD;} + .d2-970759274 .stroke-B5{stroke:#EDF0FD;} + .d2-970759274 .stroke-B6{stroke:#F7F8FE;} + .d2-970759274 .stroke-AA2{stroke:#4A6FF3;} + .d2-970759274 .stroke-AA4{stroke:#EDF0FD;} + .d2-970759274 .stroke-AA5{stroke:#F7F8FE;} + .d2-970759274 .stroke-AB4{stroke:#EDF0FD;} + .d2-970759274 .stroke-AB5{stroke:#F7F8FE;} + .d2-970759274 .background-color-N1{background-color:#0A0F25;} + .d2-970759274 .background-color-N2{background-color:#676C7E;} + .d2-970759274 .background-color-N3{background-color:#9499AB;} + .d2-970759274 .background-color-N4{background-color:#CFD2DD;} + .d2-970759274 .background-color-N5{background-color:#DEE1EB;} + .d2-970759274 .background-color-N6{background-color:#EEF1F8;} + .d2-970759274 .background-color-N7{background-color:#FFFFFF;} + .d2-970759274 .background-color-B1{background-color:#0D32B2;} + .d2-970759274 .background-color-B2{background-color:#0D32B2;} + .d2-970759274 .background-color-B3{background-color:#E3E9FD;} + .d2-970759274 .background-color-B4{background-color:#E3E9FD;} + .d2-970759274 .background-color-B5{background-color:#EDF0FD;} + .d2-970759274 .background-color-B6{background-color:#F7F8FE;} + .d2-970759274 .background-color-AA2{background-color:#4A6FF3;} + .d2-970759274 .background-color-AA4{background-color:#EDF0FD;} + .d2-970759274 .background-color-AA5{background-color:#F7F8FE;} + .d2-970759274 .background-color-AB4{background-color:#EDF0FD;} + .d2-970759274 .background-color-AB5{background-color:#F7F8FE;} + .d2-970759274 .color-N1{color:#0A0F25;} + .d2-970759274 .color-N2{color:#676C7E;} + .d2-970759274 .color-N3{color:#9499AB;} + .d2-970759274 .color-N4{color:#CFD2DD;} + .d2-970759274 .color-N5{color:#DEE1EB;} + .d2-970759274 .color-N6{color:#EEF1F8;} + .d2-970759274 .color-N7{color:#FFFFFF;} + .d2-970759274 .color-B1{color:#0D32B2;} + .d2-970759274 .color-B2{color:#0D32B2;} + .d2-970759274 .color-B3{color:#E3E9FD;} + .d2-970759274 .color-B4{color:#E3E9FD;} + .d2-970759274 .color-B5{color:#EDF0FD;} + .d2-970759274 .color-B6{color:#F7F8FE;} + .d2-970759274 .color-AA2{color:#4A6FF3;} + .d2-970759274 .color-AA4{color:#EDF0FD;} + .d2-970759274 .color-AA5{color:#F7F8FE;} + .d2-970759274 .color-AB4{color:#EDF0FD;} + .d2-970759274 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-970759274);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-970759274);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-970759274);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-970759274);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-970759274);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-970759274);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-970759274);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-970759274);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-970759274);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-970759274);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-970759274);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-970759274);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-970759274);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-970759274);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-970759274);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-970759274);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-970759274);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-970759274);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcproducerconsumer hello + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/connection-icons/elk/board.exp.json b/e2etests/testdata/txtar/connection-icons/elk/board.exp.json index 18f1b8346..d47b16302 100644 --- a/e2etests/testdata/txtar/connection-icons/elk/board.exp.json +++ b/e2etests/testdata/txtar/connection-icons/elk/board.exp.json @@ -15,7 +15,7 @@ "id": "a", "type": "rectangle", "pos": { - "x": 12, + "x": 69, "y": 12 }, "width": 53, @@ -57,7 +57,7 @@ "id": "b", "type": "rectangle", "pos": { - "x": 238, + "x": 378, "y": 12 }, "width": 53, @@ -99,7 +99,7 @@ "id": "c", "type": "rectangle", "pos": { - "x": 361, + "x": 501, "y": 12 }, "width": 53, @@ -136,6 +136,90 @@ "labelPosition": "INSIDE_MIDDLE_CENTER", "zIndex": 0, "level": 1 + }, + { + "id": "producer", + "type": "rectangle", + "pos": { + "x": 12, + "y": 98 + }, + "width": 110, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "producer", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 65, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "consumer", + "type": "rectangle", + "pos": { + "x": 192, + "y": 98 + }, + "width": 116, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "consumer", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 71, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 } ], "connections": [ @@ -165,11 +249,11 @@ "link": "", "route": [ { - "x": 65, + "x": 122, "y": 45 }, { - "x": 238, + "x": 378, "y": 45 } ], @@ -217,11 +301,11 @@ "link": "", "route": [ { - "x": 291, + "x": 431, "y": 45 }, { - "x": 361, + "x": 501, "y": 45 } ], @@ -242,6 +326,59 @@ }, "iconPosition": "INSIDE_MIDDLE_CENTER", "zIndex": 0 + }, + { + "id": "(producer -> consumer)[0]", + "src": "producer", + "srcArrow": "none", + "dst": "consumer", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 122, + "y": 131 + }, + { + "x": 192, + "y": 131 + } + ], + "animated": false, + "tooltip": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/aws/Application Integration/Amazon-Simple-Queue-Service-SQS.svg", + "RawPath": "/aws%2FApplication%20Integration%2FAmazon-Simple-Queue-Service-SQS.svg", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "INSIDE_MIDDLE_CENTER", + "iconBorderRadius": 20, + "zIndex": 0 } ], "root": { diff --git a/e2etests/testdata/txtar/connection-icons/elk/sketch.exp.svg b/e2etests/testdata/txtar/connection-icons/elk/sketch.exp.svg index 03640cd1f..9ba762bb2 100644 --- a/e2etests/testdata/txtar/connection-icons/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/connection-icons/elk/sketch.exp.svg @@ -1,17 +1,17 @@ -abc hello - - - - - - + .d2-674489035 .fill-N1{fill:#0A0F25;} + .d2-674489035 .fill-N2{fill:#676C7E;} + .d2-674489035 .fill-N3{fill:#9499AB;} + .d2-674489035 .fill-N4{fill:#CFD2DD;} + .d2-674489035 .fill-N5{fill:#DEE1EB;} + .d2-674489035 .fill-N6{fill:#EEF1F8;} + .d2-674489035 .fill-N7{fill:#FFFFFF;} + .d2-674489035 .fill-B1{fill:#0D32B2;} + .d2-674489035 .fill-B2{fill:#0D32B2;} + .d2-674489035 .fill-B3{fill:#E3E9FD;} + .d2-674489035 .fill-B4{fill:#E3E9FD;} + .d2-674489035 .fill-B5{fill:#EDF0FD;} + .d2-674489035 .fill-B6{fill:#F7F8FE;} + .d2-674489035 .fill-AA2{fill:#4A6FF3;} + .d2-674489035 .fill-AA4{fill:#EDF0FD;} + .d2-674489035 .fill-AA5{fill:#F7F8FE;} + .d2-674489035 .fill-AB4{fill:#EDF0FD;} + .d2-674489035 .fill-AB5{fill:#F7F8FE;} + .d2-674489035 .stroke-N1{stroke:#0A0F25;} + .d2-674489035 .stroke-N2{stroke:#676C7E;} + .d2-674489035 .stroke-N3{stroke:#9499AB;} + .d2-674489035 .stroke-N4{stroke:#CFD2DD;} + .d2-674489035 .stroke-N5{stroke:#DEE1EB;} + .d2-674489035 .stroke-N6{stroke:#EEF1F8;} + .d2-674489035 .stroke-N7{stroke:#FFFFFF;} + .d2-674489035 .stroke-B1{stroke:#0D32B2;} + .d2-674489035 .stroke-B2{stroke:#0D32B2;} + .d2-674489035 .stroke-B3{stroke:#E3E9FD;} + .d2-674489035 .stroke-B4{stroke:#E3E9FD;} + .d2-674489035 .stroke-B5{stroke:#EDF0FD;} + .d2-674489035 .stroke-B6{stroke:#F7F8FE;} + .d2-674489035 .stroke-AA2{stroke:#4A6FF3;} + .d2-674489035 .stroke-AA4{stroke:#EDF0FD;} + .d2-674489035 .stroke-AA5{stroke:#F7F8FE;} + .d2-674489035 .stroke-AB4{stroke:#EDF0FD;} + .d2-674489035 .stroke-AB5{stroke:#F7F8FE;} + .d2-674489035 .background-color-N1{background-color:#0A0F25;} + .d2-674489035 .background-color-N2{background-color:#676C7E;} + .d2-674489035 .background-color-N3{background-color:#9499AB;} + .d2-674489035 .background-color-N4{background-color:#CFD2DD;} + .d2-674489035 .background-color-N5{background-color:#DEE1EB;} + .d2-674489035 .background-color-N6{background-color:#EEF1F8;} + .d2-674489035 .background-color-N7{background-color:#FFFFFF;} + .d2-674489035 .background-color-B1{background-color:#0D32B2;} + .d2-674489035 .background-color-B2{background-color:#0D32B2;} + .d2-674489035 .background-color-B3{background-color:#E3E9FD;} + .d2-674489035 .background-color-B4{background-color:#E3E9FD;} + .d2-674489035 .background-color-B5{background-color:#EDF0FD;} + .d2-674489035 .background-color-B6{background-color:#F7F8FE;} + .d2-674489035 .background-color-AA2{background-color:#4A6FF3;} + .d2-674489035 .background-color-AA4{background-color:#EDF0FD;} + .d2-674489035 .background-color-AA5{background-color:#F7F8FE;} + .d2-674489035 .background-color-AB4{background-color:#EDF0FD;} + .d2-674489035 .background-color-AB5{background-color:#F7F8FE;} + .d2-674489035 .color-N1{color:#0A0F25;} + .d2-674489035 .color-N2{color:#676C7E;} + .d2-674489035 .color-N3{color:#9499AB;} + .d2-674489035 .color-N4{color:#CFD2DD;} + .d2-674489035 .color-N5{color:#DEE1EB;} + .d2-674489035 .color-N6{color:#EEF1F8;} + .d2-674489035 .color-N7{color:#FFFFFF;} + .d2-674489035 .color-B1{color:#0D32B2;} + .d2-674489035 .color-B2{color:#0D32B2;} + .d2-674489035 .color-B3{color:#E3E9FD;} + .d2-674489035 .color-B4{color:#E3E9FD;} + .d2-674489035 .color-B5{color:#EDF0FD;} + .d2-674489035 .color-B6{color:#F7F8FE;} + .d2-674489035 .color-AA2{color:#4A6FF3;} + .d2-674489035 .color-AA4{color:#EDF0FD;} + .d2-674489035 .color-AA5{color:#F7F8FE;} + .d2-674489035 .color-AB4{color:#EDF0FD;} + .d2-674489035 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-674489035);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-674489035);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-674489035);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-674489035);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-674489035);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-674489035);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-674489035);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-674489035);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-674489035);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-674489035);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-674489035);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-674489035);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-674489035);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-674489035);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-674489035);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-674489035);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-674489035);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-674489035);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcproducerconsumer hello + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/icon-style/dagre/board.exp.json b/e2etests/testdata/txtar/icon-style/dagre/board.exp.json new file mode 100644 index 000000000..23ec2f964 --- /dev/null +++ b/e2etests/testdata/txtar/icon-style/dagre/board.exp.json @@ -0,0 +1,276 @@ +{ + "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "AWS Firewall Manager", + "type": "rectangle", + "pos": { + "x": 0, + "y": 18 + }, + "width": 230, + "height": 92, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/aws/Security, Identity, & Compliance/AWS-Firewall-Manager.svg", + "RawPath": "/aws%2FSecurity%2C%20Identity%2C%20&%20Compliance%2FAWS-Firewall-Manager.svg", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconBorderRadius": 5, + "iconPosition": "INSIDE_MIDDLE_CENTER", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "AWS Firewall Manager", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 159, + "labelHeight": 21, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "lambda", + "type": "image", + "pos": { + "x": 290, + "y": 0 + }, + "width": 128, + "height": 128, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N7", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/aws/Compute/AWS-Lambda.svg", + "RawPath": "/aws%2FCompute%2FAWS-Lambda.svg", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconBorderRadius": 20, + "iconPosition": "INSIDE_MIDDLE_CENTER", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "lambda", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 53, + "labelHeight": 21, + "labelPosition": "OUTSIDE_BOTTOM_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "AWS Cloud", + "type": "rectangle", + "pos": { + "x": 478, + "y": 18 + }, + "width": 148, + "height": 92, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/aws/_Group Icons/AWS-Cloud_light-bg.svg", + "RawPath": "/aws%2F_Group%20Icons%2FAWS-Cloud_light-bg.svg", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "INSIDE_MIDDLE_CENTER", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "AWS Cloud", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 77, + "labelHeight": 21, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "Mesh", + "type": "rectangle", + "pos": { + "x": 686, + "y": 18 + }, + "width": 107, + "height": 92, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/aws/Networking & Content Delivery/AWS-App-Mesh.svg", + "RawPath": "/aws%2FNetworking%20&%20Content%20Delivery%2FAWS-App-Mesh.svg", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconBorderRadius": 999, + "iconPosition": "INSIDE_MIDDLE_CENTER", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "Mesh", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 36, + "labelHeight": 21, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + } + ], + "connections": [], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/txtar/icon-style/dagre/sketch.exp.svg b/e2etests/testdata/txtar/icon-style/dagre/sketch.exp.svg new file mode 100644 index 000000000..c3e5c3f8d --- /dev/null +++ b/e2etests/testdata/txtar/icon-style/dagre/sketch.exp.svg @@ -0,0 +1,98 @@ +AWS Firewall Manager lambdaAWS CloudMesh + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/icon-style/elk/board.exp.json b/e2etests/testdata/txtar/icon-style/elk/board.exp.json new file mode 100644 index 000000000..03d5592c5 --- /dev/null +++ b/e2etests/testdata/txtar/icon-style/elk/board.exp.json @@ -0,0 +1,276 @@ +{ + "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "AWS Firewall Manager", + "type": "rectangle", + "pos": { + "x": 12, + "y": 30 + }, + "width": 230, + "height": 118, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/aws/Security, Identity, & Compliance/AWS-Firewall-Manager.svg", + "RawPath": "/aws%2FSecurity%2C%20Identity%2C%20&%20Compliance%2FAWS-Firewall-Manager.svg", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconBorderRadius": 5, + "iconPosition": "INSIDE_MIDDLE_CENTER", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "AWS Firewall Manager", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 159, + "labelHeight": 21, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "lambda", + "type": "image", + "pos": { + "x": 262, + "y": 12 + }, + "width": 128, + "height": 128, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N7", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/aws/Compute/AWS-Lambda.svg", + "RawPath": "/aws%2FCompute%2FAWS-Lambda.svg", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconBorderRadius": 20, + "iconPosition": "INSIDE_MIDDLE_CENTER", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "lambda", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 53, + "labelHeight": 21, + "labelPosition": "OUTSIDE_BOTTOM_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "AWS Cloud", + "type": "rectangle", + "pos": { + "x": 410, + "y": 30 + }, + "width": 148, + "height": 118, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/aws/_Group Icons/AWS-Cloud_light-bg.svg", + "RawPath": "/aws%2F_Group%20Icons%2FAWS-Cloud_light-bg.svg", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "INSIDE_MIDDLE_CENTER", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "AWS Cloud", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 77, + "labelHeight": 21, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "Mesh", + "type": "rectangle", + "pos": { + "x": 578, + "y": 30 + }, + "width": 107, + "height": 118, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/aws/Networking & Content Delivery/AWS-App-Mesh.svg", + "RawPath": "/aws%2FNetworking%20&%20Content%20Delivery%2FAWS-App-Mesh.svg", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconBorderRadius": 999, + "iconPosition": "INSIDE_MIDDLE_CENTER", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "Mesh", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 36, + "labelHeight": 21, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + } + ], + "connections": [], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/txtar/icon-style/elk/sketch.exp.svg b/e2etests/testdata/txtar/icon-style/elk/sketch.exp.svg new file mode 100644 index 000000000..15feaec11 --- /dev/null +++ b/e2etests/testdata/txtar/icon-style/elk/sketch.exp.svg @@ -0,0 +1,98 @@ +AWS Firewall Manager lambdaAWS CloudMesh + + + + + + \ No newline at end of file diff --git a/e2etests/txtar.txt b/e2etests/txtar.txt index ac940b683..90fb07c1b 100644 --- a/e2etests/txtar.txt +++ b/e2etests/txtar.txt @@ -171,6 +171,29 @@ a -> b: hi { style.underline: true } +-- icon-style -- + +AWS Firewall Manager : { + icon: https://icons.terrastruct.com/aws%2FSecurity%2C%20Identity%2C%20&%20Compliance%2FAWS-Firewall-Manager.svg + icon.style.border-radius: 5 +} + +lambda : { + shape: image + icon: https://icons.terrastruct.com/aws%2FCompute%2FAWS-Lambda.svg + icon.style.border-radius: 20 +} + +AWS Cloud : { + icon: https://icons.terrastruct.com/aws%2F_Group%20Icons%2FAWS-Cloud_light-bg.svg + icon.style.border-radius: 0 +} + +Mesh : { + icon: https://icons.terrastruct.com/aws%2FNetworking%20&%20Content%20Delivery%2FAWS-App-Mesh.svg + icon.style.border-radius: 999 +} + -- none-fill -- vars: { @@ -776,6 +799,12 @@ b -> c: { icon: https://icons.terrastruct.com/essentials%2F213-alarm.svg } +direction: right +producer -> consumer: { + icon: https://icons.terrastruct.com/aws%2FApplication%20Integration%2FAmazon-Simple-Queue-Service-SQS.svg + icon.style.border-radius: 20 +} + -- model-view -- # Models user.style.fill: blue diff --git a/testdata/d2compiler/TestCompile/array-classes.exp.json b/testdata/d2compiler/TestCompile/array-classes.exp.json index 55f49e18a..52b0b85e9 100644 --- a/testdata/d2compiler/TestCompile/array-classes.exp.json +++ b/testdata/d2compiler/TestCompile/array-classes.exp.json @@ -616,6 +616,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -651,6 +652,7 @@ "value": "2" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -729,6 +731,7 @@ "value": "4" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "circle" @@ -805,6 +808,7 @@ "value": "4" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "circle" diff --git a/testdata/d2compiler/TestCompile/basic_icon.exp.json b/testdata/d2compiler/TestCompile/basic_icon.exp.json index c4e7552f6..8fb94fdb2 100644 --- a/testdata/d2compiler/TestCompile/basic_icon.exp.json +++ b/testdata/d2compiler/TestCompile/basic_icon.exp.json @@ -86,6 +86,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -146,6 +147,7 @@ "Fragment": "", "RawFragment": "" }, + "iconStyle": {}, "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 f5e4620d6..2c9eb6893 100644 --- a/testdata/d2compiler/TestCompile/basic_sequence.exp.json +++ b/testdata/d2compiler/TestCompile/basic_sequence.exp.json @@ -81,6 +81,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -128,6 +129,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 ff306f1c4..af9cae10b 100644 --- a/testdata/d2compiler/TestCompile/basic_shape.exp.json +++ b/testdata/d2compiler/TestCompile/basic_shape.exp.json @@ -81,6 +81,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -128,6 +129,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 8a855ee99..4aae900f3 100644 --- a/testdata/d2compiler/TestCompile/basic_style.exp.json +++ b/testdata/d2compiler/TestCompile/basic_style.exp.json @@ -88,6 +88,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -139,6 +140,7 @@ "value": "0.4" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/class-shape-class.exp.json b/testdata/d2compiler/TestCompile/class-shape-class.exp.json index 049d4ed34..de4ffe4e5 100644 --- a/testdata/d2compiler/TestCompile/class-shape-class.exp.json +++ b/testdata/d2compiler/TestCompile/class-shape-class.exp.json @@ -205,6 +205,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -262,6 +263,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "class" diff --git a/testdata/d2compiler/TestCompile/class_paren.exp.json b/testdata/d2compiler/TestCompile/class_paren.exp.json index c6b641edc..74ebae55f 100644 --- a/testdata/d2compiler/TestCompile/class_paren.exp.json +++ b/testdata/d2compiler/TestCompile/class_paren.exp.json @@ -180,6 +180,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -248,6 +249,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 f139da4f2..26181a699 100644 --- a/testdata/d2compiler/TestCompile/class_style.exp.json +++ b/testdata/d2compiler/TestCompile/class_style.exp.json @@ -154,6 +154,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -215,6 +216,7 @@ "value": "0.4" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "class" diff --git a/testdata/d2compiler/TestCompile/classes.exp.json b/testdata/d2compiler/TestCompile/classes.exp.json index ac50b12bd..c7db781a6 100644 --- a/testdata/d2compiler/TestCompile/classes.exp.json +++ b/testdata/d2compiler/TestCompile/classes.exp.json @@ -642,6 +642,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -677,6 +678,7 @@ "value": "4" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -751,6 +753,7 @@ "value": "orange" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "circle" @@ -823,6 +826,7 @@ "value": "red" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "circle" @@ -875,6 +879,7 @@ "value": "orange" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "circle" diff --git a/testdata/d2compiler/TestCompile/default_direction.exp.json b/testdata/d2compiler/TestCompile/default_direction.exp.json index b412ef6b2..dba184e16 100644 --- a/testdata/d2compiler/TestCompile/default_direction.exp.json +++ b/testdata/d2compiler/TestCompile/default_direction.exp.json @@ -42,6 +42,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -89,6 +90,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 0f9d3dd6b..87237e968 100644 --- a/testdata/d2compiler/TestCompile/dimension_with_style.exp.json +++ b/testdata/d2compiler/TestCompile/dimension_with_style.exp.json @@ -116,6 +116,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -167,6 +168,7 @@ "value": "true" } }, + "iconStyle": {}, "width": { "value": "200" }, diff --git a/testdata/d2compiler/TestCompile/dimensions_on_containers.exp.json b/testdata/d2compiler/TestCompile/dimensions_on_containers.exp.json index 6072848cd..cb20c5cec 100644 --- a/testdata/d2compiler/TestCompile/dimensions_on_containers.exp.json +++ b/testdata/d2compiler/TestCompile/dimensions_on_containers.exp.json @@ -950,6 +950,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -997,6 +998,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1042,6 +1044,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "width": { "value": "512" }, @@ -1090,6 +1093,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "width": { "value": "128" }, @@ -1141,6 +1145,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "width": { "value": "512" }, @@ -1192,6 +1197,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "width": { "value": "128" }, @@ -1240,6 +1246,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "width": { "value": "512" }, @@ -1291,6 +1298,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "width": { "value": "128" }, @@ -1342,6 +1350,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "width": { "value": "512" }, @@ -1393,6 +1402,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "width": { "value": "128" }, diff --git a/testdata/d2compiler/TestCompile/dimensions_on_nonimage.exp.json b/testdata/d2compiler/TestCompile/dimensions_on_nonimage.exp.json index 2aad6eb2d..d0b29ebe0 100644 --- a/testdata/d2compiler/TestCompile/dimensions_on_nonimage.exp.json +++ b/testdata/d2compiler/TestCompile/dimensions_on_nonimage.exp.json @@ -144,6 +144,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -191,6 +192,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "width": { "value": "200" }, diff --git a/testdata/d2compiler/TestCompile/edge.exp.json b/testdata/d2compiler/TestCompile/edge.exp.json index 04daae90e..e2e993a37 100644 --- a/testdata/d2compiler/TestCompile/edge.exp.json +++ b/testdata/d2compiler/TestCompile/edge.exp.json @@ -65,6 +65,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -96,6 +97,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -143,6 +145,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -188,6 +191,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 573bd41bb..adeb0fc84 100644 --- a/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json +++ b/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json @@ -244,6 +244,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -269,6 +270,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "diamond" @@ -292,6 +294,7 @@ "value": "true" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -315,6 +318,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -362,6 +366,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -407,6 +412,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_arrowhead_primary.exp.json b/testdata/d2compiler/TestCompile/edge_arrowhead_primary.exp.json index 43dbe6934..8bfcb1efb 100644 --- a/testdata/d2compiler/TestCompile/edge_arrowhead_primary.exp.json +++ b/testdata/d2compiler/TestCompile/edge_arrowhead_primary.exp.json @@ -104,6 +104,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -129,6 +130,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -153,6 +155,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -200,6 +203,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -245,6 +249,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 fc3cb532e..8de3ef918 100644 --- a/testdata/d2compiler/TestCompile/edge_chain.exp.json +++ b/testdata/d2compiler/TestCompile/edge_chain.exp.json @@ -112,6 +112,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -143,6 +144,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -173,6 +175,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -220,6 +223,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -285,6 +289,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -330,6 +335,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 7b58cb7bd..f7c6e7676 100644 --- a/testdata/d2compiler/TestCompile/edge_chain_map.exp.json +++ b/testdata/d2compiler/TestCompile/edge_chain_map.exp.json @@ -141,6 +141,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -172,6 +173,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -202,6 +204,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -249,6 +252,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -314,6 +318,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -359,6 +364,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 a1f43e986..cc0b6dfc3 100644 --- a/testdata/d2compiler/TestCompile/edge_column_index.exp.json +++ b/testdata/d2compiler/TestCompile/edge_column_index.exp.json @@ -343,6 +343,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -376,6 +377,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -514,6 +516,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "sql_table" @@ -650,6 +653,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 a2e8b7dc6..c1adc882a 100644 --- a/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json +++ b/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json @@ -110,6 +110,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -145,6 +146,7 @@ "value": "true" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -192,6 +194,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -237,6 +240,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 50be77f89..f860a01ee 100644 --- a/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json @@ -153,6 +153,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -178,6 +179,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "diamond" @@ -205,6 +207,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -272,6 +275,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -337,6 +341,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 bccfb9129..3bfdedda5 100644 --- a/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json @@ -121,6 +121,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -146,6 +147,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -170,6 +172,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -217,6 +220,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -262,6 +266,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 dec38ad77..d5e420691 100644 --- a/testdata/d2compiler/TestCompile/edge_index.exp.json +++ b/testdata/d2compiler/TestCompile/edge_index.exp.json @@ -136,6 +136,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -170,6 +171,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -237,6 +239,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -302,6 +305,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 14c91274e..e53b113a0 100644 --- a/testdata/d2compiler/TestCompile/edge_index_map.exp.json +++ b/testdata/d2compiler/TestCompile/edge_index_map.exp.json @@ -155,6 +155,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -189,6 +190,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -256,6 +258,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -321,6 +324,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 6ebba4d34..2d00c2aed 100644 --- a/testdata/d2compiler/TestCompile/edge_index_nested.exp.json +++ b/testdata/d2compiler/TestCompile/edge_index_nested.exp.json @@ -165,6 +165,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -199,6 +200,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -246,6 +248,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -311,6 +314,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -376,6 +380,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 084167741..ea1e11136 100644 --- a/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json +++ b/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json @@ -181,6 +181,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -215,6 +216,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -282,6 +284,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -347,6 +350,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -412,6 +416,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 5a9afc37d..693e12b64 100644 --- a/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.exp.json +++ b/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.exp.json @@ -194,6 +194,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -232,6 +233,7 @@ "value": "0.4" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -299,6 +301,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -364,6 +367,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -429,6 +433,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 846333d45..e1ac538d5 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,6 +200,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -238,6 +239,7 @@ "value": "0.4" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -285,6 +287,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -330,6 +333,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -375,6 +379,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 6ac0e489b..a2db7b1f3 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,6 +213,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -251,6 +252,7 @@ "value": "0.4" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -298,6 +300,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -343,6 +346,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -388,6 +392,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 b3a8c19ed..6360c15e5 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,6 +231,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -269,6 +270,7 @@ "value": "0.4" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -316,6 +318,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -361,6 +364,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -406,6 +410,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 04edc0e31..0b0132cb6 100644 --- a/testdata/d2compiler/TestCompile/edge_label_map.exp.json +++ b/testdata/d2compiler/TestCompile/edge_label_map.exp.json @@ -121,6 +121,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -156,6 +157,7 @@ "value": "0.5" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -203,6 +205,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -248,6 +251,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 4e4652c77..2a8eeabe8 100644 --- a/testdata/d2compiler/TestCompile/edge_map.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map.exp.json @@ -104,6 +104,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -135,6 +136,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -182,6 +184,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -227,6 +230,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 9874c0c27..5a9545082 100644 --- a/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json @@ -133,6 +133,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -158,6 +159,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "diamond" @@ -182,6 +184,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -229,6 +232,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -274,6 +278,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 4821d0012..493260187 100644 --- a/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json @@ -149,6 +149,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -187,6 +188,7 @@ "value": "0.4" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -254,6 +256,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -319,6 +322,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 1a0f715fa..6c50e60da 100644 --- a/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json @@ -167,6 +167,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -205,6 +206,7 @@ "value": "0.4" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -272,6 +274,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -337,6 +340,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 ab4523fa7..4e9e325ed 100644 --- a/testdata/d2compiler/TestCompile/edge_map_nested.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_nested.exp.json @@ -129,6 +129,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -164,6 +165,7 @@ "value": "0.4" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -211,6 +213,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -256,6 +259,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 6e83a2f2e..68cd94414 100644 --- a/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json @@ -111,6 +111,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -146,6 +147,7 @@ "value": "0.4" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -193,6 +195,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -238,6 +241,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 c00936b2d..4fd0fe368 100644 --- a/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json @@ -221,6 +221,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -246,6 +247,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "diamond" @@ -265,6 +267,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "diamond" @@ -291,6 +294,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -358,6 +362,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -423,6 +428,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 6f5721e7c..5a9553e36 100644 --- a/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json @@ -115,6 +115,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -140,6 +141,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "triangle" @@ -164,6 +166,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -211,6 +214,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -256,6 +260,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 18c537b79..580fabe28 100644 --- a/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json @@ -171,6 +171,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -196,6 +197,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "diamond" @@ -223,6 +225,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -290,6 +293,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -355,6 +359,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 796618579..edbc2ecda 100644 --- a/testdata/d2compiler/TestCompile/escaped_id.exp.json +++ b/testdata/d2compiler/TestCompile/escaped_id.exp.json @@ -42,6 +42,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -89,6 +90,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/fill-pattern.exp.json b/testdata/d2compiler/TestCompile/fill-pattern.exp.json index fcdeecfc7..55e3b7770 100644 --- a/testdata/d2compiler/TestCompile/fill-pattern.exp.json +++ b/testdata/d2compiler/TestCompile/fill-pattern.exp.json @@ -110,6 +110,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -161,6 +162,7 @@ "value": "dots" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/glob-connection-steps.exp.json b/testdata/d2compiler/TestCompile/glob-connection-steps.exp.json index 11114c355..911d7f930 100644 --- a/testdata/d2compiler/TestCompile/glob-connection-steps.exp.json +++ b/testdata/d2compiler/TestCompile/glob-connection-steps.exp.json @@ -173,6 +173,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -356,6 +357,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -481,6 +483,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -532,6 +535,7 @@ "value": "black" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/glob-spread-vars/1.exp.json b/testdata/d2compiler/TestCompile/glob-spread-vars/1.exp.json index b973d1850..11f146c70 100644 --- a/testdata/d2compiler/TestCompile/glob-spread-vars/1.exp.json +++ b/testdata/d2compiler/TestCompile/glob-spread-vars/1.exp.json @@ -206,6 +206,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -253,6 +254,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -302,6 +304,7 @@ "value": "red" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/glob-spread-vars/2.exp.json b/testdata/d2compiler/TestCompile/glob-spread-vars/2.exp.json index 52b3ca111..7dc035581 100644 --- a/testdata/d2compiler/TestCompile/glob-spread-vars/2.exp.json +++ b/testdata/d2compiler/TestCompile/glob-spread-vars/2.exp.json @@ -256,6 +256,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -287,6 +288,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -317,6 +319,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -364,6 +367,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -409,6 +413,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -454,6 +459,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -561,6 +567,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/grid.exp.json b/testdata/d2compiler/TestCompile/grid.exp.json index 2b2c4b674..dcbafbdfb 100644 --- a/testdata/d2compiler/TestCompile/grid.exp.json +++ b/testdata/d2compiler/TestCompile/grid.exp.json @@ -106,6 +106,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -153,6 +154,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/grid_nested.exp.json b/testdata/d2compiler/TestCompile/grid_nested.exp.json index c424ef3df..8fa215458 100644 --- a/testdata/d2compiler/TestCompile/grid_nested.exp.json +++ b/testdata/d2compiler/TestCompile/grid_nested.exp.json @@ -342,6 +342,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -389,6 +390,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -440,6 +442,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -485,6 +488,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -530,6 +534,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -586,6 +591,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -642,6 +648,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -687,6 +694,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -738,6 +746,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -783,6 +792,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/icon-near-composite-together.exp.json b/testdata/d2compiler/TestCompile/icon-near-composite-together.exp.json index 1d0b6974e..0aff685f7 100644 --- a/testdata/d2compiler/TestCompile/icon-near-composite-together.exp.json +++ b/testdata/d2compiler/TestCompile/icon-near-composite-together.exp.json @@ -120,6 +120,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -180,6 +181,7 @@ "Fragment": "", "RawFragment": "" }, + "iconStyle": {}, "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 0f22863e9..026db1ff4 100644 --- a/testdata/d2compiler/TestCompile/image_style.exp.json +++ b/testdata/d2compiler/TestCompile/image_style.exp.json @@ -163,6 +163,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -227,6 +228,7 @@ "Fragment": "", "RawFragment": "" }, + "iconStyle": {}, "near_key": null, "shape": { "value": "image" diff --git a/testdata/d2compiler/TestCompile/import-connections.exp.json b/testdata/d2compiler/TestCompile/import-connections.exp.json index 6433fd184..69643e832 100644 --- a/testdata/d2compiler/TestCompile/import-connections.exp.json +++ b/testdata/d2compiler/TestCompile/import-connections.exp.json @@ -129,6 +129,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -160,6 +161,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -190,6 +192,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -381,6 +384,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -477,6 +481,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -573,6 +578,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/import-icon-near.exp.json b/testdata/d2compiler/TestCompile/import-icon-near.exp.json index 5b95fd136..ec3c4453b 100644 --- a/testdata/d2compiler/TestCompile/import-icon-near.exp.json +++ b/testdata/d2compiler/TestCompile/import-icon-near.exp.json @@ -61,6 +61,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -128,6 +129,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -173,6 +175,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/import-link-layer-1.exp.json b/testdata/d2compiler/TestCompile/import-link-layer-1.exp.json index 3d3931fdd..08b4460d8 100644 --- a/testdata/d2compiler/TestCompile/import-link-layer-1.exp.json +++ b/testdata/d2compiler/TestCompile/import-link-layer-1.exp.json @@ -172,6 +172,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -219,6 +220,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -313,6 +315,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -371,6 +374,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "link": { "value": "root.layers.z" }, @@ -430,6 +434,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -477,6 +482,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/import-link-layer-2.exp.json b/testdata/d2compiler/TestCompile/import-link-layer-2.exp.json index b1739dbbc..a778eaf3f 100644 --- a/testdata/d2compiler/TestCompile/import-link-layer-2.exp.json +++ b/testdata/d2compiler/TestCompile/import-link-layer-2.exp.json @@ -120,6 +120,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -178,6 +179,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "link": { "value": "root.layers.z" }, @@ -237,6 +239,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -284,6 +287,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/import-link-layer-3.exp.json b/testdata/d2compiler/TestCompile/import-link-layer-3.exp.json index b7b2ecfb4..cb5992bc8 100644 --- a/testdata/d2compiler/TestCompile/import-link-layer-3.exp.json +++ b/testdata/d2compiler/TestCompile/import-link-layer-3.exp.json @@ -172,6 +172,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -219,6 +220,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -394,6 +396,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -441,6 +444,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -535,6 +539,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -593,6 +598,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "link": { "value": "root.layers.z" }, @@ -654,6 +660,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -701,6 +708,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/import-link-layer-4.exp.json b/testdata/d2compiler/TestCompile/import-link-layer-4.exp.json index d2bcde285..b4c38c37b 100644 --- a/testdata/d2compiler/TestCompile/import-link-layer-4.exp.json +++ b/testdata/d2compiler/TestCompile/import-link-layer-4.exp.json @@ -190,6 +190,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -237,6 +238,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -464,6 +466,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -511,6 +514,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -605,6 +609,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -663,6 +668,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "link": { "value": "root.layers.x.layers.z" }, @@ -722,6 +728,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -769,6 +776,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -827,6 +835,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -874,6 +883,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/import-link-underscore-1.exp.json b/testdata/d2compiler/TestCompile/import-link-underscore-1.exp.json index 543a7fde8..87649968b 100644 --- a/testdata/d2compiler/TestCompile/import-link-underscore-1.exp.json +++ b/testdata/d2compiler/TestCompile/import-link-underscore-1.exp.json @@ -120,6 +120,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -167,6 +168,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -696,6 +698,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -743,6 +746,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1139,6 +1143,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -1197,6 +1202,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "link": { "value": "root.layers.x" }, @@ -1256,6 +1262,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "link": { "value": "root.layers.x.layers.k" }, @@ -1475,6 +1482,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -1533,6 +1541,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "link": { "value": "root.layers.x.layers.b" }, @@ -1592,6 +1601,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "link": { "value": "root.layers.x" }, @@ -1651,6 +1661,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "link": { "value": "root.layers.x.layers.b" }, @@ -1712,6 +1723,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -1759,6 +1771,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/import-link-underscore-2.exp.json b/testdata/d2compiler/TestCompile/import-link-underscore-2.exp.json index 159810986..fcba32681 100644 --- a/testdata/d2compiler/TestCompile/import-link-underscore-2.exp.json +++ b/testdata/d2compiler/TestCompile/import-link-underscore-2.exp.json @@ -138,6 +138,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -185,6 +186,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -714,6 +716,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -761,6 +764,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1157,6 +1161,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -1215,6 +1220,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "link": { "value": "root.layers.x" }, @@ -1274,6 +1280,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "link": { "value": "root.layers.x.layers.k" }, @@ -1493,6 +1500,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -1551,6 +1559,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "link": { "value": "root.layers.x.layers.b" }, @@ -1610,6 +1619,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "link": { "value": "root.layers.x" }, @@ -1669,6 +1679,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "link": { "value": "root.layers.x.layers.b" }, @@ -1730,6 +1741,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -1777,6 +1789,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/import-link-underscore-3.exp.json b/testdata/d2compiler/TestCompile/import-link-underscore-3.exp.json index d491e90c2..48a99d619 100644 --- a/testdata/d2compiler/TestCompile/import-link-underscore-3.exp.json +++ b/testdata/d2compiler/TestCompile/import-link-underscore-3.exp.json @@ -190,6 +190,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -237,6 +238,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -412,6 +414,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -459,6 +462,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -553,6 +557,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -611,6 +616,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "link": { "value": "root.layers.b" }, @@ -672,6 +678,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -719,6 +726,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/import-nested-layers.exp.json b/testdata/d2compiler/TestCompile/import-nested-layers.exp.json index 1eb79a9c6..5fe4c1837 100644 --- a/testdata/d2compiler/TestCompile/import-nested-layers.exp.json +++ b/testdata/d2compiler/TestCompile/import-nested-layers.exp.json @@ -120,6 +120,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -167,6 +168,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -385,6 +387,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -432,6 +435,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -569,6 +573,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -616,6 +621,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -672,6 +678,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -719,6 +726,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/import-scenario.exp.json b/testdata/d2compiler/TestCompile/import-scenario.exp.json index 9f6c22826..70f8e48df 100644 --- a/testdata/d2compiler/TestCompile/import-scenario.exp.json +++ b/testdata/d2compiler/TestCompile/import-scenario.exp.json @@ -62,6 +62,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -109,6 +110,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -154,6 +156,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -272,6 +275,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -319,6 +323,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -395,6 +400,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "tooltip": { "value": "foo" }, diff --git a/testdata/d2compiler/TestCompile/import-steps.exp.json b/testdata/d2compiler/TestCompile/import-steps.exp.json index 23d9a9323..d0c2b4cc9 100644 --- a/testdata/d2compiler/TestCompile/import-steps.exp.json +++ b/testdata/d2compiler/TestCompile/import-steps.exp.json @@ -62,6 +62,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -109,6 +110,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -154,6 +156,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -272,6 +275,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -319,6 +323,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -395,6 +400,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "tooltip": { "value": "foo" }, @@ -516,6 +522,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -563,6 +570,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -670,6 +678,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "tooltip": { "value": "do" }, diff --git a/testdata/d2compiler/TestCompile/import-style-1.exp.json b/testdata/d2compiler/TestCompile/import-style-1.exp.json index 7a15621be..10933669a 100644 --- a/testdata/d2compiler/TestCompile/import-style-1.exp.json +++ b/testdata/d2compiler/TestCompile/import-style-1.exp.json @@ -127,6 +127,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -300,6 +301,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -402,6 +404,7 @@ "value": "red" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/import-style-2.exp.json b/testdata/d2compiler/TestCompile/import-style-2.exp.json index 5c61b5d52..605e32be9 100644 --- a/testdata/d2compiler/TestCompile/import-style-2.exp.json +++ b/testdata/d2compiler/TestCompile/import-style-2.exp.json @@ -138,6 +138,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -333,6 +334,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -442,6 +444,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -555,6 +558,7 @@ "value": "red" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/import-var-chain.exp.json b/testdata/d2compiler/TestCompile/import-var-chain.exp.json index 8868dcdb7..5f738b569 100644 --- a/testdata/d2compiler/TestCompile/import-var-chain.exp.json +++ b/testdata/d2compiler/TestCompile/import-var-chain.exp.json @@ -39,6 +39,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" diff --git a/testdata/d2compiler/TestCompile/import_url_link.exp.json b/testdata/d2compiler/TestCompile/import_url_link.exp.json index 66f878da6..8f42343b0 100644 --- a/testdata/d2compiler/TestCompile/import_url_link.exp.json +++ b/testdata/d2compiler/TestCompile/import_url_link.exp.json @@ -39,6 +39,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -86,6 +87,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "link": { "value": "https://google.com" }, diff --git a/testdata/d2compiler/TestCompile/label-near-composite-separate.exp.json b/testdata/d2compiler/TestCompile/label-near-composite-separate.exp.json index b73200e7a..7181e76a6 100644 --- a/testdata/d2compiler/TestCompile/label-near-composite-separate.exp.json +++ b/testdata/d2compiler/TestCompile/label-near-composite-separate.exp.json @@ -125,6 +125,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -172,6 +173,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/label-near-composite-together.exp.json b/testdata/d2compiler/TestCompile/label-near-composite-together.exp.json index ee68c9863..ebe24c0e4 100644 --- a/testdata/d2compiler/TestCompile/label-near-composite-together.exp.json +++ b/testdata/d2compiler/TestCompile/label-near-composite-together.exp.json @@ -120,6 +120,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -167,6 +168,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/label-near-parent.exp.json b/testdata/d2compiler/TestCompile/label-near-parent.exp.json index 192949f56..1d3135e56 100644 --- a/testdata/d2compiler/TestCompile/label-near-parent.exp.json +++ b/testdata/d2compiler/TestCompile/label-near-parent.exp.json @@ -102,6 +102,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -149,6 +150,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/layer-import-nested-layer.exp.json b/testdata/d2compiler/TestCompile/layer-import-nested-layer.exp.json index 7c0e89633..c73e9a011 100644 --- a/testdata/d2compiler/TestCompile/layer-import-nested-layer.exp.json +++ b/testdata/d2compiler/TestCompile/layer-import-nested-layer.exp.json @@ -97,6 +97,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -212,6 +213,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -269,6 +271,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -316,6 +319,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/leaky_sequence.exp.json b/testdata/d2compiler/TestCompile/leaky_sequence.exp.json index 4faeaa7e8..642600cd2 100644 --- a/testdata/d2compiler/TestCompile/leaky_sequence.exp.json +++ b/testdata/d2compiler/TestCompile/leaky_sequence.exp.json @@ -161,6 +161,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -192,6 +193,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -270,6 +272,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "sequence_diagram" @@ -346,6 +349,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -391,6 +395,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/legend.exp.json b/testdata/d2compiler/TestCompile/legend.exp.json index 07e51deca..0c75e278c 100644 --- a/testdata/d2compiler/TestCompile/legend.exp.json +++ b/testdata/d2compiler/TestCompile/legend.exp.json @@ -736,6 +736,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -835,6 +836,7 @@ "value": "#f5f5f5" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "person" @@ -932,6 +934,7 @@ "value": "#b5d3ff" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "cylinder" @@ -978,6 +981,7 @@ "value": "blue" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -1022,6 +1026,7 @@ "value": "5" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -1055,6 +1060,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -1122,6 +1128,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1187,6 +1194,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/link-beyond-import-root.exp.json b/testdata/d2compiler/TestCompile/link-beyond-import-root.exp.json index 36ee7d8df..57b5da914 100644 --- a/testdata/d2compiler/TestCompile/link-beyond-import-root.exp.json +++ b/testdata/d2compiler/TestCompile/link-beyond-import-root.exp.json @@ -39,6 +39,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -97,6 +98,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/link-board-key-nested.exp.json b/testdata/d2compiler/TestCompile/link-board-key-nested.exp.json index f2bfcad8e..eed6477a5 100644 --- a/testdata/d2compiler/TestCompile/link-board-key-nested.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-key-nested.exp.json @@ -173,6 +173,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -220,6 +221,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -276,6 +278,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "link": { "value": "root.layers.x" }, @@ -335,6 +338,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -382,6 +386,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/link-board-mixed.exp.json b/testdata/d2compiler/TestCompile/link-board-mixed.exp.json index 15ac06f0a..86e6555a9 100644 --- a/testdata/d2compiler/TestCompile/link-board-mixed.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-mixed.exp.json @@ -323,6 +323,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -401,6 +402,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "link": { "value": "root.layers.cat" }, @@ -537,6 +539,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -568,6 +571,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -615,6 +619,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -660,6 +665,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -828,6 +834,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -952,6 +959,7 @@ "value": "green" } }, + "iconStyle": {}, "link": { "value": "root.layers.cat" }, diff --git a/testdata/d2compiler/TestCompile/link-board-nested.exp.json b/testdata/d2compiler/TestCompile/link-board-nested.exp.json index 4ed875261..8b19e239f 100644 --- a/testdata/d2compiler/TestCompile/link-board-nested.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-nested.exp.json @@ -202,6 +202,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -260,6 +261,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "link": { "value": "root.layers.x.layers.x" }, @@ -377,6 +379,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -434,6 +437,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -481,6 +485,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/link-board-not-board.exp.json b/testdata/d2compiler/TestCompile/link-board-not-board.exp.json index d14f8da7d..86ae50689 100644 --- a/testdata/d2compiler/TestCompile/link-board-not-board.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-not-board.exp.json @@ -167,6 +167,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -214,6 +215,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -270,6 +272,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -326,6 +329,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -373,6 +377,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/link-board-not-found-1.exp.json b/testdata/d2compiler/TestCompile/link-board-not-found-1.exp.json index 47e6df352..c3e953a02 100644 --- a/testdata/d2compiler/TestCompile/link-board-not-found-1.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-not-found-1.exp.json @@ -63,6 +63,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -121,6 +122,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/link-board-not-found-2.exp.json b/testdata/d2compiler/TestCompile/link-board-not-found-2.exp.json index a0149d6f6..26b2d11d2 100644 --- a/testdata/d2compiler/TestCompile/link-board-not-found-2.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-not-found-2.exp.json @@ -230,6 +230,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -326,6 +327,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -373,6 +375,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -468,6 +471,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -515,6 +519,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/link-board-ok.exp.json b/testdata/d2compiler/TestCompile/link-board-ok.exp.json index e633fd3ed..d645e93a9 100644 --- a/testdata/d2compiler/TestCompile/link-board-ok.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-ok.exp.json @@ -144,6 +144,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -202,6 +203,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "link": { "value": "root.layers.x" }, @@ -261,6 +263,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -308,6 +311,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" 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 ff71c1aa7..20694e06d 100644 --- a/testdata/d2compiler/TestCompile/link-board-underscore-not-found.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-underscore-not-found.exp.json @@ -225,6 +225,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -272,6 +273,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -447,6 +449,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -494,6 +497,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -588,6 +592,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -646,6 +651,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/link-board-underscore.exp.json b/testdata/d2compiler/TestCompile/link-board-underscore.exp.json index a7565afca..c100ead47 100644 --- a/testdata/d2compiler/TestCompile/link-board-underscore.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-underscore.exp.json @@ -269,6 +269,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -316,6 +317,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -552,6 +554,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -599,6 +602,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -754,6 +758,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -812,6 +817,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "link": { "value": "root.layers.x" }, @@ -871,6 +877,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "link": { "value": "root.layers.x" }, diff --git a/testdata/d2compiler/TestCompile/link-file-underscore.exp.json b/testdata/d2compiler/TestCompile/link-file-underscore.exp.json index def6eacc1..479315f1f 100644 --- a/testdata/d2compiler/TestCompile/link-file-underscore.exp.json +++ b/testdata/d2compiler/TestCompile/link-file-underscore.exp.json @@ -39,6 +39,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -86,6 +87,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -142,6 +144,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -189,6 +192,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -283,6 +287,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -341,6 +346,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "link": { "value": "root.layers.a" }, @@ -641,6 +647,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -688,6 +695,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -904,6 +912,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -962,6 +971,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "link": { "value": "root.layers.e" }, @@ -1021,6 +1031,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "link": { "value": "root" }, @@ -1080,6 +1091,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "link": { "value": "root.layers.a" }, diff --git a/testdata/d2compiler/TestCompile/markdown_ampersand.exp.json b/testdata/d2compiler/TestCompile/markdown_ampersand.exp.json index 981b7f247..dd728c8ca 100644 --- a/testdata/d2compiler/TestCompile/markdown_ampersand.exp.json +++ b/testdata/d2compiler/TestCompile/markdown_ampersand.exp.json @@ -49,6 +49,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -96,6 +97,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "language": "markdown", "shape": { diff --git a/testdata/d2compiler/TestCompile/missing-class.exp.json b/testdata/d2compiler/TestCompile/missing-class.exp.json index 1aa7a9673..87203ba69 100644 --- a/testdata/d2compiler/TestCompile/missing-class.exp.json +++ b/testdata/d2compiler/TestCompile/missing-class.exp.json @@ -63,6 +63,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -121,6 +122,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/multiple-import-nested-layers.exp.json b/testdata/d2compiler/TestCompile/multiple-import-nested-layers.exp.json index ea8b77eb0..42cf16c14 100644 --- a/testdata/d2compiler/TestCompile/multiple-import-nested-layers.exp.json +++ b/testdata/d2compiler/TestCompile/multiple-import-nested-layers.exp.json @@ -120,6 +120,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -167,6 +168,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -371,6 +373,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -440,6 +443,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -507,6 +511,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "link": { "value": "root.layers.x.layers.b" }, @@ -566,6 +571,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -613,6 +619,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/name-with-dot-underscore.exp.json b/testdata/d2compiler/TestCompile/name-with-dot-underscore.exp.json index 7c2ec3cf4..082436c4b 100644 --- a/testdata/d2compiler/TestCompile/name-with-dot-underscore.exp.json +++ b/testdata/d2compiler/TestCompile/name-with-dot-underscore.exp.json @@ -145,6 +145,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -192,6 +193,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -279,6 +281,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -324,6 +327,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/near_bad_connected.exp.json b/testdata/d2compiler/TestCompile/near_bad_connected.exp.json index 4565b1d7e..c09412740 100644 --- a/testdata/d2compiler/TestCompile/near_bad_connected.exp.json +++ b/testdata/d2compiler/TestCompile/near_bad_connected.exp.json @@ -127,6 +127,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -158,6 +159,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -225,6 +227,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": { "range": "d2/testdata/d2compiler/TestCompile/near_bad_connected.d2,2:11:21-2:21:31", "path": [ @@ -285,6 +288,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/near_constant.exp.json b/testdata/d2compiler/TestCompile/near_constant.exp.json index 6139e09c5..6ccaebf47 100644 --- a/testdata/d2compiler/TestCompile/near_constant.exp.json +++ b/testdata/d2compiler/TestCompile/near_constant.exp.json @@ -63,6 +63,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -121,6 +122,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": { "range": "d2/testdata/d2compiler/TestCompile/near_constant.d2,0:8:8-0:18:18", "path": [ diff --git a/testdata/d2compiler/TestCompile/near_descendant_connect_to_outside.exp.json b/testdata/d2compiler/TestCompile/near_descendant_connect_to_outside.exp.json index 1d11c9f01..37989ebb3 100644 --- a/testdata/d2compiler/TestCompile/near_descendant_connect_to_outside.exp.json +++ b/testdata/d2compiler/TestCompile/near_descendant_connect_to_outside.exp.json @@ -161,6 +161,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -192,6 +193,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -270,6 +272,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": { "range": "d2/testdata/d2compiler/TestCompile/near_descendant_connect_to_outside.d2,2:11:21-2:19:29", "path": [ @@ -361,6 +364,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -406,6 +410,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/nested-array-classes.exp.json b/testdata/d2compiler/TestCompile/nested-array-classes.exp.json index a897f1678..521b8dda7 100644 --- a/testdata/d2compiler/TestCompile/nested-array-classes.exp.json +++ b/testdata/d2compiler/TestCompile/nested-array-classes.exp.json @@ -396,6 +396,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -422,6 +423,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "arrow" @@ -445,6 +447,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -474,6 +477,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "arrow" @@ -497,6 +501,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -568,6 +573,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -633,6 +639,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/nested-scope-1.exp.json b/testdata/d2compiler/TestCompile/nested-scope-1.exp.json index 711c99020..7a91d8274 100644 --- a/testdata/d2compiler/TestCompile/nested-scope-1.exp.json +++ b/testdata/d2compiler/TestCompile/nested-scope-1.exp.json @@ -39,6 +39,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -86,6 +87,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -131,6 +133,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -176,6 +179,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/nested-scope-2.exp.json b/testdata/d2compiler/TestCompile/nested-scope-2.exp.json index 523843136..92be695cd 100644 --- a/testdata/d2compiler/TestCompile/nested-scope-2.exp.json +++ b/testdata/d2compiler/TestCompile/nested-scope-2.exp.json @@ -88,6 +88,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -199,6 +200,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/nested_sql.exp.json b/testdata/d2compiler/TestCompile/nested_sql.exp.json index 1781b2ac6..e552aec34 100644 --- a/testdata/d2compiler/TestCompile/nested_sql.exp.json +++ b/testdata/d2compiler/TestCompile/nested_sql.exp.json @@ -176,6 +176,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -223,6 +224,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -328,6 +330,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "sql_table" diff --git a/testdata/d2compiler/TestCompile/nil_scope_obj_regression.exp.json b/testdata/d2compiler/TestCompile/nil_scope_obj_regression.exp.json index 94c666990..527ed2528 100644 --- a/testdata/d2compiler/TestCompile/nil_scope_obj_regression.exp.json +++ b/testdata/d2compiler/TestCompile/nil_scope_obj_regression.exp.json @@ -105,6 +105,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -183,6 +184,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -228,6 +230,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/no-self-link.exp.json b/testdata/d2compiler/TestCompile/no-self-link.exp.json index 9dc51c9ef..0a57e6b2a 100644 --- a/testdata/d2compiler/TestCompile/no-self-link.exp.json +++ b/testdata/d2compiler/TestCompile/no-self-link.exp.json @@ -246,6 +246,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -304,6 +305,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "link": { "value": "root.scenarios.a" }, @@ -401,6 +403,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -459,6 +462,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -578,6 +582,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -636,6 +641,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -681,6 +687,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/non_url_link.exp.json b/testdata/d2compiler/TestCompile/non_url_link.exp.json index 68e35e0bd..89170f4c9 100644 --- a/testdata/d2compiler/TestCompile/non_url_link.exp.json +++ b/testdata/d2compiler/TestCompile/non_url_link.exp.json @@ -81,6 +81,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -128,6 +129,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "link": { "value": "vscode://file//Users/pmoura/logtalk/examples/searching/hill_climbing1.lgt:35:0" }, diff --git a/testdata/d2compiler/TestCompile/null.exp.json b/testdata/d2compiler/TestCompile/null.exp.json index 9781daf23..139f60edc 100644 --- a/testdata/d2compiler/TestCompile/null.exp.json +++ b/testdata/d2compiler/TestCompile/null.exp.json @@ -42,6 +42,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -89,6 +90,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/positions.exp.json b/testdata/d2compiler/TestCompile/positions.exp.json index 700810882..33ba65869 100644 --- a/testdata/d2compiler/TestCompile/positions.exp.json +++ b/testdata/d2compiler/TestCompile/positions.exp.json @@ -106,6 +106,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -153,6 +154,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "top": { "value": "200" }, diff --git a/testdata/d2compiler/TestCompile/reordered-classes.exp.json b/testdata/d2compiler/TestCompile/reordered-classes.exp.json index 07280d1c2..23c7a4d6e 100644 --- a/testdata/d2compiler/TestCompile/reordered-classes.exp.json +++ b/testdata/d2compiler/TestCompile/reordered-classes.exp.json @@ -209,6 +209,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -267,6 +268,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "diamond" diff --git a/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json b/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json index d037b9da4..d182c5702 100644 --- a/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json +++ b/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json @@ -276,6 +276,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -377,6 +378,7 @@ "Fragment": "", "RawFragment": "" }, + "iconStyle": {}, "near_key": { "range": "d2/testdata/d2compiler/TestCompile/reserved_icon_near_style.d2,6:8:90-6:9:91", "path": [ @@ -437,6 +439,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/reserved_quoted/1.exp.json b/testdata/d2compiler/TestCompile/reserved_quoted/1.exp.json index 2d3cfd527..f9f9c6a0d 100644 --- a/testdata/d2compiler/TestCompile/reserved_quoted/1.exp.json +++ b/testdata/d2compiler/TestCompile/reserved_quoted/1.exp.json @@ -81,6 +81,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -128,6 +129,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -173,6 +175,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/reserved_quoted/2.exp.json b/testdata/d2compiler/TestCompile/reserved_quoted/2.exp.json index 003929f4e..5ec7efcd3 100644 --- a/testdata/d2compiler/TestCompile/reserved_quoted/2.exp.json +++ b/testdata/d2compiler/TestCompile/reserved_quoted/2.exp.json @@ -271,6 +271,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -434,6 +435,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "width": { "value": "200" }, diff --git a/testdata/d2compiler/TestCompile/reserved_quoted/3.exp.json b/testdata/d2compiler/TestCompile/reserved_quoted/3.exp.json index bb563d13a..3ca4731d6 100644 --- a/testdata/d2compiler/TestCompile/reserved_quoted/3.exp.json +++ b/testdata/d2compiler/TestCompile/reserved_quoted/3.exp.json @@ -79,6 +79,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -174,6 +175,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -219,6 +221,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/reserved_quoted/4.exp.json b/testdata/d2compiler/TestCompile/reserved_quoted/4.exp.json index 05f1d439a..56b7aa426 100644 --- a/testdata/d2compiler/TestCompile/reserved_quoted/4.exp.json +++ b/testdata/d2compiler/TestCompile/reserved_quoted/4.exp.json @@ -64,6 +64,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -133,6 +134,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -200,6 +202,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -267,6 +270,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 a61670cdc..0a385ea52 100644 --- a/testdata/d2compiler/TestCompile/root_direction.exp.json +++ b/testdata/d2compiler/TestCompile/root_direction.exp.json @@ -52,6 +52,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" diff --git a/testdata/d2compiler/TestCompile/root_sequence.exp.json b/testdata/d2compiler/TestCompile/root_sequence.exp.json index 4fa6ad4a8..a48c41800 100644 --- a/testdata/d2compiler/TestCompile/root_sequence.exp.json +++ b/testdata/d2compiler/TestCompile/root_sequence.exp.json @@ -52,6 +52,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 461633527..1160ba8f2 100644 --- a/testdata/d2compiler/TestCompile/self-referencing.exp.json +++ b/testdata/d2compiler/TestCompile/self-referencing.exp.json @@ -65,6 +65,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -96,6 +97,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -163,6 +165,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/sequence-diagram-icons.exp.json b/testdata/d2compiler/TestCompile/sequence-diagram-icons.exp.json index ff10cdd9d..45b32d268 100644 --- a/testdata/d2compiler/TestCompile/sequence-diagram-icons.exp.json +++ b/testdata/d2compiler/TestCompile/sequence-diagram-icons.exp.json @@ -381,6 +381,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "sequence_diagram" @@ -412,6 +413,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -442,6 +444,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -595,6 +598,7 @@ "Fragment": "", "RawFragment": "" }, + "iconStyle": {}, "near_key": null, "shape": { "value": "image" @@ -660,6 +664,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -725,6 +730,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -781,6 +787,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -837,6 +844,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -893,6 +901,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/sequence-timestamp.exp.json b/testdata/d2compiler/TestCompile/sequence-timestamp.exp.json index 4c90eaac0..06a6cb6bc 100644 --- a/testdata/d2compiler/TestCompile/sequence-timestamp.exp.json +++ b/testdata/d2compiler/TestCompile/sequence-timestamp.exp.json @@ -236,6 +236,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "sequence_diagram" @@ -267,6 +268,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -365,6 +367,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -430,6 +433,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -475,6 +479,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -520,6 +525,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -576,6 +582,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 5dd16ad44..5203a8c4b 100644 --- a/testdata/d2compiler/TestCompile/sequence_container.exp.json +++ b/testdata/d2compiler/TestCompile/sequence_container.exp.json @@ -261,6 +261,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "sequence_diagram" @@ -292,6 +293,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -322,6 +324,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -433,6 +436,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -542,6 +546,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -651,6 +656,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -760,6 +766,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -869,6 +876,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -978,6 +986,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1023,6 +1032,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 503423b6c..91c242c78 100644 --- a/testdata/d2compiler/TestCompile/sequence_container_2.exp.json +++ b/testdata/d2compiler/TestCompile/sequence_container_2.exp.json @@ -239,6 +239,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "sequence_diagram" @@ -270,6 +271,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -381,6 +383,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -490,6 +493,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -599,6 +603,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -644,6 +649,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -711,6 +717,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -778,6 +785,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -845,6 +853,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -890,6 +899,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 1958d8227..fa415091a 100644 --- a/testdata/d2compiler/TestCompile/sequence_grouped_note.exp.json +++ b/testdata/d2compiler/TestCompile/sequence_grouped_note.exp.json @@ -161,6 +161,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "sequence_diagram" @@ -208,6 +209,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -284,6 +286,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -329,6 +332,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -385,6 +389,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 0870aa4c1..1226ba7fc 100644 --- a/testdata/d2compiler/TestCompile/sequence_scoping.exp.json +++ b/testdata/d2compiler/TestCompile/sequence_scoping.exp.json @@ -349,6 +349,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -380,6 +381,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -410,6 +412,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -440,6 +443,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -487,6 +491,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "sequence_diagram" @@ -583,6 +588,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -752,6 +758,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -797,6 +804,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -853,6 +861,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -982,6 +991,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1049,6 +1059,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 b59d6d0da..e8b9461bb 100644 --- a/testdata/d2compiler/TestCompile/set_direction.exp.json +++ b/testdata/d2compiler/TestCompile/set_direction.exp.json @@ -81,6 +81,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -128,6 +129,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/shape-hierarchy.exp.json b/testdata/d2compiler/TestCompile/shape-hierarchy.exp.json index a2f5aca09..f337fbe56 100644 --- a/testdata/d2compiler/TestCompile/shape-hierarchy.exp.json +++ b/testdata/d2compiler/TestCompile/shape-hierarchy.exp.json @@ -127,6 +127,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -158,6 +159,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -205,6 +207,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "hierarchy" @@ -250,6 +253,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -295,6 +299,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/shape_edge_style.exp.json b/testdata/d2compiler/TestCompile/shape_edge_style.exp.json index e27bf57a1..6cf7bad88 100644 --- a/testdata/d2compiler/TestCompile/shape_edge_style.exp.json +++ b/testdata/d2compiler/TestCompile/shape_edge_style.exp.json @@ -87,6 +87,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -138,6 +139,7 @@ "value": "true" } }, + "iconStyle": {}, "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 3cf517caa..91bd0d318 100644 --- a/testdata/d2compiler/TestCompile/single_dimension_on_circle.exp.json +++ b/testdata/d2compiler/TestCompile/single_dimension_on_circle.exp.json @@ -115,6 +115,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -162,6 +163,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "height": { "value": "230" }, diff --git a/testdata/d2compiler/TestCompile/spread-import-link.exp.json b/testdata/d2compiler/TestCompile/spread-import-link.exp.json index b58409f17..317c97be7 100644 --- a/testdata/d2compiler/TestCompile/spread-import-link.exp.json +++ b/testdata/d2compiler/TestCompile/spread-import-link.exp.json @@ -120,6 +120,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -167,6 +168,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -342,6 +344,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -400,6 +403,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "link": { "value": "root.layers.x.layers.b" }, @@ -459,6 +463,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -506,6 +511,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/spread_var_order.exp.json b/testdata/d2compiler/TestCompile/spread_var_order.exp.json index c71ac28d6..d18b6a528 100644 --- a/testdata/d2compiler/TestCompile/spread_var_order.exp.json +++ b/testdata/d2compiler/TestCompile/spread_var_order.exp.json @@ -213,6 +213,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -260,6 +261,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -305,6 +307,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -350,6 +353,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/sql-constraints.exp.json b/testdata/d2compiler/TestCompile/sql-constraints.exp.json index db24296fa..b09356ed4 100644 --- a/testdata/d2compiler/TestCompile/sql-constraints.exp.json +++ b/testdata/d2compiler/TestCompile/sql-constraints.exp.json @@ -243,6 +243,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -355,6 +356,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "sql_table" diff --git a/testdata/d2compiler/TestCompile/sql-null-constraint.exp.json b/testdata/d2compiler/TestCompile/sql-null-constraint.exp.json index c07b88b69..d8fa1b51c 100644 --- a/testdata/d2compiler/TestCompile/sql-null-constraint.exp.json +++ b/testdata/d2compiler/TestCompile/sql-null-constraint.exp.json @@ -220,6 +220,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -329,6 +330,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "sql_table" diff --git a/testdata/d2compiler/TestCompile/sql-regression.exp.json b/testdata/d2compiler/TestCompile/sql-regression.exp.json index 64b5d46e5..790a983d9 100644 --- a/testdata/d2compiler/TestCompile/sql-regression.exp.json +++ b/testdata/d2compiler/TestCompile/sql-regression.exp.json @@ -218,6 +218,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -269,6 +270,7 @@ "value": "lemonchiffon" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -346,6 +348,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "sql_table" @@ -391,6 +394,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 8064ff8ed..298d2b6e7 100644 --- a/testdata/d2compiler/TestCompile/sql_paren.exp.json +++ b/testdata/d2compiler/TestCompile/sql_paren.exp.json @@ -157,6 +157,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -264,6 +265,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 1be890e5d..61ed5576b 100644 --- a/testdata/d2compiler/TestCompile/stroke-width.exp.json +++ b/testdata/d2compiler/TestCompile/stroke-width.exp.json @@ -88,6 +88,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -139,6 +140,7 @@ "value": "0" } }, + "iconStyle": {}, "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 9012bd927..7bbb316a5 100644 --- a/testdata/d2compiler/TestCompile/table_connection_attr.exp.json +++ b/testdata/d2compiler/TestCompile/table_connection_attr.exp.json @@ -302,6 +302,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -339,6 +340,7 @@ "value": "true" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -449,6 +451,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "sql_table" @@ -557,6 +560,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 b68772eff..917b1488f 100644 --- a/testdata/d2compiler/TestCompile/table_style.exp.json +++ b/testdata/d2compiler/TestCompile/table_style.exp.json @@ -154,6 +154,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -237,6 +238,7 @@ "value": "0.4" } }, + "iconStyle": {}, "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 bd065d54f..c167b8a2d 100644 --- a/testdata/d2compiler/TestCompile/table_style_map.exp.json +++ b/testdata/d2compiler/TestCompile/table_style_map.exp.json @@ -205,6 +205,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -291,6 +292,7 @@ "value": "blue" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "sql_table" diff --git a/testdata/d2compiler/TestCompile/text-transform.exp.json b/testdata/d2compiler/TestCompile/text-transform.exp.json index 6d32e0f75..4a0f683c6 100644 --- a/testdata/d2compiler/TestCompile/text-transform.exp.json +++ b/testdata/d2compiler/TestCompile/text-transform.exp.json @@ -286,6 +286,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -321,6 +322,7 @@ "value": "capitalize" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -414,6 +416,7 @@ "value": "uppercase" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -505,6 +508,7 @@ "value": "lowercase" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/underscore_connection.exp.json b/testdata/d2compiler/TestCompile/underscore_connection.exp.json index a1f7d0132..baa8fd2db 100644 --- a/testdata/d2compiler/TestCompile/underscore_connection.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_connection.exp.json @@ -138,6 +138,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -169,6 +170,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -216,6 +218,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -325,6 +328,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -392,6 +396,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -459,6 +464,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/underscore_edge.exp.json b/testdata/d2compiler/TestCompile/underscore_edge.exp.json index 3e00fcc33..2bf15a15d 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge.exp.json @@ -116,6 +116,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -147,6 +148,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -225,6 +227,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -281,6 +284,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 ab721e9e3..ed6afd89d 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json @@ -175,6 +175,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -206,6 +207,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -236,6 +238,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -345,6 +348,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -401,6 +405,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -457,6 +462,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 7b44d6ac8..b130d3304 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json @@ -182,6 +182,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -213,6 +214,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -243,6 +245,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -321,6 +324,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -397,6 +401,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -442,6 +447,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 25aa72494..7d96d4e5f 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json @@ -187,6 +187,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -221,6 +222,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -268,6 +270,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -313,6 +316,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -358,6 +362,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 3533194a7..76b39644a 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json @@ -156,6 +156,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -187,6 +188,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -234,6 +236,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -310,6 +313,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -377,6 +381,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 1145d7dcb..43d78caf3 100644 --- a/testdata/d2compiler/TestCompile/underscore_parent_create.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_parent_create.exp.json @@ -82,6 +82,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -129,6 +130,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -185,6 +187,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 f2af3ad4d..e3b4b235f 100644 --- a/testdata/d2compiler/TestCompile/underscore_parent_not_root.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_parent_not_root.exp.json @@ -111,6 +111,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -158,6 +159,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -203,6 +205,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -259,6 +262,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 8e1ecb3f2..35798e4f8 100644 --- a/testdata/d2compiler/TestCompile/underscore_parent_preference_1.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_parent_preference_1.exp.json @@ -125,6 +125,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -172,6 +173,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -248,6 +250,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 e8850d2a2..6c9079e71 100644 --- a/testdata/d2compiler/TestCompile/underscore_parent_preference_2.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_parent_preference_2.exp.json @@ -125,6 +125,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -203,6 +204,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -248,6 +250,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 7d9f8ed7f..be7f6a60f 100644 --- a/testdata/d2compiler/TestCompile/underscore_parent_squared.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_parent_squared.exp.json @@ -122,6 +122,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -169,6 +170,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -214,6 +216,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -281,6 +284,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 2caaa6a50..a4eea2c07 100644 --- a/testdata/d2compiler/TestCompile/underscore_unresolved_obj.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_unresolved_obj.exp.json @@ -82,6 +82,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -129,6 +130,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -185,6 +187,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 2b2f1b4f8..ee8cb5b52 100644 --- a/testdata/d2compiler/TestCompile/unescaped_id_cr.exp.json +++ b/testdata/d2compiler/TestCompile/unescaped_id_cr.exp.json @@ -42,6 +42,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -89,6 +90,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 0ee2c0378..2088ee53c 100644 --- a/testdata/d2compiler/TestCompile/url_link.exp.json +++ b/testdata/d2compiler/TestCompile/url_link.exp.json @@ -81,6 +81,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -128,6 +129,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "link": { "value": "https://google.com" }, diff --git a/testdata/d2compiler/TestCompile/url_link_and_not_url_tooltip_concurrently.exp.json b/testdata/d2compiler/TestCompile/url_link_and_not_url_tooltip_concurrently.exp.json index 4fc6b9851..e118daffd 100644 --- a/testdata/d2compiler/TestCompile/url_link_and_not_url_tooltip_concurrently.exp.json +++ b/testdata/d2compiler/TestCompile/url_link_and_not_url_tooltip_concurrently.exp.json @@ -114,6 +114,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -161,6 +162,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "tooltip": { "value": "hello world" }, diff --git a/testdata/d2compiler/TestCompile/url_link_and_path_url_label_concurrently.exp.json b/testdata/d2compiler/TestCompile/url_link_and_path_url_label_concurrently.exp.json index ae1d35226..7915a7835 100644 --- a/testdata/d2compiler/TestCompile/url_link_and_path_url_label_concurrently.exp.json +++ b/testdata/d2compiler/TestCompile/url_link_and_path_url_label_concurrently.exp.json @@ -114,6 +114,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -145,6 +146,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "link": { "value": "https://google.com" }, @@ -195,6 +197,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -240,6 +243,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/url_link_non_url_tooltip_ok.exp.json b/testdata/d2compiler/TestCompile/url_link_non_url_tooltip_ok.exp.json index 55017b2a1..ce81bdb9f 100644 --- a/testdata/d2compiler/TestCompile/url_link_non_url_tooltip_ok.exp.json +++ b/testdata/d2compiler/TestCompile/url_link_non_url_tooltip_ok.exp.json @@ -114,6 +114,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -161,6 +162,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "tooltip": { "value": "note: url.ParseRequestURI might see this as a URL" }, diff --git a/testdata/d2compiler/TestCompile/url_relative_link.exp.json b/testdata/d2compiler/TestCompile/url_relative_link.exp.json index a781e613f..1a1f3899d 100644 --- a/testdata/d2compiler/TestCompile/url_relative_link.exp.json +++ b/testdata/d2compiler/TestCompile/url_relative_link.exp.json @@ -81,6 +81,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -128,6 +129,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "link": { "value": "/google" }, diff --git a/testdata/d2compiler/TestCompile/url_tooltip.exp.json b/testdata/d2compiler/TestCompile/url_tooltip.exp.json index 5191349ed..3ceaabfef 100644 --- a/testdata/d2compiler/TestCompile/url_tooltip.exp.json +++ b/testdata/d2compiler/TestCompile/url_tooltip.exp.json @@ -81,6 +81,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -128,6 +129,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "tooltip": { "value": "https://google.com" }, diff --git a/testdata/d2compiler/TestCompile/var_in_glob.exp.json b/testdata/d2compiler/TestCompile/var_in_glob.exp.json index d4ca77cc6..6002ce862 100644 --- a/testdata/d2compiler/TestCompile/var_in_glob.exp.json +++ b/testdata/d2compiler/TestCompile/var_in_glob.exp.json @@ -198,6 +198,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -229,6 +230,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -276,6 +278,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -321,6 +324,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -366,6 +370,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -411,6 +416,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/var_in_markdown.exp.json b/testdata/d2compiler/TestCompile/var_in_markdown.exp.json index 415e4911d..c817c276b 100644 --- a/testdata/d2compiler/TestCompile/var_in_markdown.exp.json +++ b/testdata/d2compiler/TestCompile/var_in_markdown.exp.json @@ -111,6 +111,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -158,6 +159,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "language": "markdown", "shape": { diff --git a/testdata/d2compiler/TestCompile/var_in_vars.exp.json b/testdata/d2compiler/TestCompile/var_in_vars.exp.json index 3e371542b..4c3c46b85 100644 --- a/testdata/d2compiler/TestCompile/var_in_vars.exp.json +++ b/testdata/d2compiler/TestCompile/var_in_vars.exp.json @@ -553,6 +553,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -584,6 +585,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -631,6 +633,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "circle" @@ -676,6 +679,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "circle" @@ -721,6 +725,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -786,6 +791,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "circle" @@ -851,6 +857,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "circle" diff --git a/testdata/d2compiler/TestCompile/var_nested_in_markdown.exp.json b/testdata/d2compiler/TestCompile/var_nested_in_markdown.exp.json index ae3af4a94..14d120f4b 100644 --- a/testdata/d2compiler/TestCompile/var_nested_in_markdown.exp.json +++ b/testdata/d2compiler/TestCompile/var_nested_in_markdown.exp.json @@ -140,6 +140,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -187,6 +188,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "language": "markdown", "shape": { diff --git a/testdata/d2compiler/TestCompile/vars-in-imports.exp.json b/testdata/d2compiler/TestCompile/vars-in-imports.exp.json index 05c63f5e3..416f9b8ad 100644 --- a/testdata/d2compiler/TestCompile/vars-in-imports.exp.json +++ b/testdata/d2compiler/TestCompile/vars-in-imports.exp.json @@ -241,6 +241,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -288,6 +289,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -333,6 +335,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -378,6 +381,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -423,6 +427,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -468,6 +473,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -513,6 +519,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 555ed3efc..c8b6b2b06 100644 --- a/testdata/d2compiler/TestCompile/wrong_column_index.exp.json +++ b/testdata/d2compiler/TestCompile/wrong_column_index.exp.json @@ -703,6 +703,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -736,6 +737,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -992,6 +994,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "sql_table" @@ -1160,6 +1163,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "sql_table" diff --git a/testdata/d2compiler/TestCompile2/boards/board-label-primary.exp.json b/testdata/d2compiler/TestCompile2/boards/board-label-primary.exp.json index ccc31d84b..cc6d74f2e 100644 --- a/testdata/d2compiler/TestCompile2/boards/board-label-primary.exp.json +++ b/testdata/d2compiler/TestCompile2/boards/board-label-primary.exp.json @@ -218,6 +218,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -265,6 +266,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -321,6 +323,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -368,6 +371,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -457,6 +461,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -504,6 +509,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/boards/isFolderOnly-shapes.exp.json b/testdata/d2compiler/TestCompile2/boards/isFolderOnly-shapes.exp.json index 6723de0c4..712ab3ec6 100644 --- a/testdata/d2compiler/TestCompile2/boards/isFolderOnly-shapes.exp.json +++ b/testdata/d2compiler/TestCompile2/boards/isFolderOnly-shapes.exp.json @@ -133,6 +133,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -223,6 +224,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -270,6 +272,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/boards/isFolderOnly.exp.json b/testdata/d2compiler/TestCompile2/boards/isFolderOnly.exp.json index 4267f9ea9..ab399402b 100644 --- a/testdata/d2compiler/TestCompile2/boards/isFolderOnly.exp.json +++ b/testdata/d2compiler/TestCompile2/boards/isFolderOnly.exp.json @@ -304,6 +304,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -361,6 +362,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -408,6 +410,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -659,6 +662,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -706,6 +710,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -762,6 +767,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -809,6 +815,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -927,6 +934,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -974,6 +982,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1006,6 +1015,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" diff --git a/testdata/d2compiler/TestCompile2/boards/no-inherit-label.exp.json b/testdata/d2compiler/TestCompile2/boards/no-inherit-label.exp.json index 0069a24f4..473dc72e9 100644 --- a/testdata/d2compiler/TestCompile2/boards/no-inherit-label.exp.json +++ b/testdata/d2compiler/TestCompile2/boards/no-inherit-label.exp.json @@ -133,6 +133,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -190,6 +191,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -237,6 +239,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/boards/recursive.exp.json b/testdata/d2compiler/TestCompile2/boards/recursive.exp.json index 341caa2e3..6e5cdc016 100644 --- a/testdata/d2compiler/TestCompile2/boards/recursive.exp.json +++ b/testdata/d2compiler/TestCompile2/boards/recursive.exp.json @@ -308,6 +308,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -355,6 +356,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -411,6 +413,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -458,6 +461,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -716,6 +720,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -763,6 +768,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -842,6 +848,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -889,6 +896,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -934,6 +942,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1036,6 +1045,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -1083,6 +1093,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1128,6 +1139,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1173,6 +1185,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 d7c7a2dc2..bfc3760a0 100644 --- a/testdata/d2compiler/TestCompile2/boards/root.exp.json +++ b/testdata/d2compiler/TestCompile2/boards/root.exp.json @@ -175,6 +175,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -222,6 +223,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -278,6 +280,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -325,6 +328,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -381,6 +385,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -428,6 +433,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.exp.json b/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.exp.json index 36d1c2d13..33ccc8138 100644 --- a/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.exp.json +++ b/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.exp.json @@ -207,6 +207,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -238,6 +239,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -285,6 +287,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -330,6 +333,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -517,6 +521,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -555,6 +560,7 @@ "value": "0.1" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -622,6 +628,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -687,6 +694,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/boards/style-nested-boards.exp.json b/testdata/d2compiler/TestCompile2/boards/style-nested-boards.exp.json index 05169724b..07703c3cd 100644 --- a/testdata/d2compiler/TestCompile2/boards/style-nested-boards.exp.json +++ b/testdata/d2compiler/TestCompile2/boards/style-nested-boards.exp.json @@ -426,6 +426,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -483,6 +484,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -530,6 +532,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -656,6 +659,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -707,6 +711,7 @@ "value": "black" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -831,6 +836,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -882,6 +888,7 @@ "value": "black" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1008,6 +1015,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -1059,6 +1067,7 @@ "value": "black" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1183,6 +1192,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -1254,6 +1264,7 @@ "value": "black" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/1.exp.json b/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/1.exp.json index 49144ac3b..110018670 100644 --- a/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/1.exp.json +++ b/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/1.exp.json @@ -316,6 +316,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -370,6 +371,7 @@ "value": "true" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "circle" @@ -419,6 +421,7 @@ "value": "yellow" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "circle" @@ -543,6 +546,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -594,6 +598,7 @@ "value": "yellow" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/2.exp.json b/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/2.exp.json index 395b2e255..74134f549 100644 --- a/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/2.exp.json +++ b/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/2.exp.json @@ -183,6 +183,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -443,6 +444,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -474,6 +476,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -525,6 +528,7 @@ "value": "yellow" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -574,6 +578,7 @@ "value": "yellow" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/3.exp.json b/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/3.exp.json index c42990a09..b457d3910 100644 --- a/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/3.exp.json +++ b/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/3.exp.json @@ -358,6 +358,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -469,6 +470,7 @@ "value": "red" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "sql_table" diff --git a/testdata/d2compiler/TestCompile2/globs/and-filter.exp.json b/testdata/d2compiler/TestCompile2/globs/and-filter.exp.json index 84ab92222..685cb507f 100644 --- a/testdata/d2compiler/TestCompile2/globs/and-filter.exp.json +++ b/testdata/d2compiler/TestCompile2/globs/and-filter.exp.json @@ -473,6 +473,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -504,6 +505,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -541,6 +543,7 @@ "value": "yellow" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -643,6 +646,7 @@ "value": "red" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "person" @@ -688,6 +692,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -733,6 +738,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/globs/connected-filter.exp.json b/testdata/d2compiler/TestCompile2/globs/connected-filter.exp.json index 72b949980..17cb1d2d9 100644 --- a/testdata/d2compiler/TestCompile2/globs/connected-filter.exp.json +++ b/testdata/d2compiler/TestCompile2/globs/connected-filter.exp.json @@ -193,6 +193,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -224,6 +225,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -275,6 +277,7 @@ "value": "red" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -324,6 +327,7 @@ "value": "red" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -369,6 +373,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/globs/creating-node-bug.exp.json b/testdata/d2compiler/TestCompile2/globs/creating-node-bug.exp.json index 665feb37a..e1fc37f38 100644 --- a/testdata/d2compiler/TestCompile2/globs/creating-node-bug.exp.json +++ b/testdata/d2compiler/TestCompile2/globs/creating-node-bug.exp.json @@ -205,6 +205,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -236,6 +237,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -283,6 +285,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -328,6 +331,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -373,6 +377,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -418,6 +423,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/globs/default-glob-filter/1.exp.json b/testdata/d2compiler/TestCompile2/globs/default-glob-filter/1.exp.json index 6bff2fcca..6f46f67b0 100644 --- a/testdata/d2compiler/TestCompile2/globs/default-glob-filter/1.exp.json +++ b/testdata/d2compiler/TestCompile2/globs/default-glob-filter/1.exp.json @@ -357,6 +357,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -411,6 +412,7 @@ "value": "red" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -471,6 +473,7 @@ "value": "blue" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "circle" @@ -534,6 +537,7 @@ "value": "red" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/globs/default-glob-filter/2.exp.json b/testdata/d2compiler/TestCompile2/globs/default-glob-filter/2.exp.json index 31071203f..c155de01b 100644 --- a/testdata/d2compiler/TestCompile2/globs/default-glob-filter/2.exp.json +++ b/testdata/d2compiler/TestCompile2/globs/default-glob-filter/2.exp.json @@ -194,6 +194,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -225,6 +226,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -276,6 +278,7 @@ "value": "0.2" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -325,6 +328,7 @@ "value": "0.2" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -374,6 +378,7 @@ "value": "0.2" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/globs/default-glob-filter/3.exp.json b/testdata/d2compiler/TestCompile2/globs/default-glob-filter/3.exp.json index 06886b16c..43bfe445b 100644 --- a/testdata/d2compiler/TestCompile2/globs/default-glob-filter/3.exp.json +++ b/testdata/d2compiler/TestCompile2/globs/default-glob-filter/3.exp.json @@ -187,6 +187,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -238,6 +239,7 @@ "value": "0.2" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -307,6 +309,7 @@ "Fragment": "", "RawFragment": "" }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/globs/default-glob-filter/4.exp.json b/testdata/d2compiler/TestCompile2/globs/default-glob-filter/4.exp.json index 5c50c84be..4323a1aa6 100644 --- a/testdata/d2compiler/TestCompile2/globs/default-glob-filter/4.exp.json +++ b/testdata/d2compiler/TestCompile2/globs/default-glob-filter/4.exp.json @@ -331,6 +331,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -369,6 +370,7 @@ "value": "red" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -420,6 +422,7 @@ "value": "red" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -469,6 +472,7 @@ "value": "red" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -518,6 +522,7 @@ "value": "red" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.exp.json b/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.exp.json index 6c2ac09a5..bfff699cf 100644 --- a/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.exp.json +++ b/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.exp.json @@ -610,6 +610,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -648,6 +649,7 @@ "value": "3" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -691,6 +693,7 @@ "value": "red" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -734,6 +737,7 @@ "value": "3" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -801,6 +805,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -866,6 +871,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -931,6 +937,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.exp.json b/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.exp.json index 26a0db37c..f42ea6df7 100644 --- a/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.exp.json +++ b/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.exp.json @@ -1131,6 +1131,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -1169,6 +1170,7 @@ "value": "3" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -1212,6 +1214,7 @@ "value": "5" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -1255,6 +1258,7 @@ "value": "3" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -1349,6 +1353,7 @@ "value": "blue" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "circle" @@ -1441,6 +1446,7 @@ "value": "red" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1533,6 +1539,7 @@ "value": "green" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "diamond" diff --git a/testdata/d2compiler/TestCompile2/globs/exists-filter.exp.json b/testdata/d2compiler/TestCompile2/globs/exists-filter.exp.json index 4721aaee6..93cc9a768 100644 --- a/testdata/d2compiler/TestCompile2/globs/exists-filter.exp.json +++ b/testdata/d2compiler/TestCompile2/globs/exists-filter.exp.json @@ -194,6 +194,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -241,6 +242,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -301,6 +303,7 @@ "value": "true" } }, + "iconStyle": {}, "link": { "value": "https://google.com" }, diff --git a/testdata/d2compiler/TestCompile2/globs/glob-filter.exp.json b/testdata/d2compiler/TestCompile2/globs/glob-filter.exp.json index b92bbf90c..209d491fb 100644 --- a/testdata/d2compiler/TestCompile2/globs/glob-filter.exp.json +++ b/testdata/d2compiler/TestCompile2/globs/glob-filter.exp.json @@ -240,6 +240,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -287,6 +288,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -347,6 +349,7 @@ "value": "true" } }, + "iconStyle": {}, "link": { "value": "https://google.com" }, @@ -406,6 +409,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "link": { "value": "https://yahoo.com" }, diff --git a/testdata/d2compiler/TestCompile2/globs/leaf-filter-1.exp.json b/testdata/d2compiler/TestCompile2/globs/leaf-filter-1.exp.json index f34e624ad..a1391a7e6 100644 --- a/testdata/d2compiler/TestCompile2/globs/leaf-filter-1.exp.json +++ b/testdata/d2compiler/TestCompile2/globs/leaf-filter-1.exp.json @@ -278,6 +278,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -351,6 +352,7 @@ "value": "red" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -422,6 +424,7 @@ "value": "red" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -493,6 +496,7 @@ "value": "yellow" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/globs/leaf-filter-2.exp.json b/testdata/d2compiler/TestCompile2/globs/leaf-filter-2.exp.json index 8dd629962..937780ff3 100644 --- a/testdata/d2compiler/TestCompile2/globs/leaf-filter-2.exp.json +++ b/testdata/d2compiler/TestCompile2/globs/leaf-filter-2.exp.json @@ -253,6 +253,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -284,6 +285,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -331,6 +333,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -380,6 +383,7 @@ "value": "yellow" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -429,6 +433,7 @@ "value": "yellow" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -474,6 +479,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -523,6 +529,7 @@ "value": "yellow" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/globs/level-filter.exp.json b/testdata/d2compiler/TestCompile2/globs/level-filter.exp.json index 0c1939d87..6f03fe650 100644 --- a/testdata/d2compiler/TestCompile2/globs/level-filter.exp.json +++ b/testdata/d2compiler/TestCompile2/globs/level-filter.exp.json @@ -280,6 +280,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -353,6 +354,7 @@ "value": "red" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -424,6 +426,7 @@ "value": "yellow" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -491,6 +494,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/globs/md-shape.exp.json b/testdata/d2compiler/TestCompile2/globs/md-shape.exp.json index b80c089ea..d40047583 100644 --- a/testdata/d2compiler/TestCompile2/globs/md-shape.exp.json +++ b/testdata/d2compiler/TestCompile2/globs/md-shape.exp.json @@ -429,6 +429,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -507,6 +508,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "language": "markdown", "shape": { @@ -595,6 +597,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "language": "markdown", "shape": { @@ -672,6 +675,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "language": "markdown", "shape": { @@ -760,6 +764,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "language": "markdown", "shape": { @@ -806,6 +811,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "language": "markdown", "shape": { diff --git a/testdata/d2compiler/TestCompile2/globs/merge-glob-values.exp.json b/testdata/d2compiler/TestCompile2/globs/merge-glob-values.exp.json index b3ad4b332..37196cdff 100644 --- a/testdata/d2compiler/TestCompile2/globs/merge-glob-values.exp.json +++ b/testdata/d2compiler/TestCompile2/globs/merge-glob-values.exp.json @@ -190,6 +190,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -275,6 +276,7 @@ "value": "14" } }, + "iconStyle": {}, "width": { "value": "339" }, diff --git a/testdata/d2compiler/TestCompile2/globs/mixed-edge-quoting.exp.json b/testdata/d2compiler/TestCompile2/globs/mixed-edge-quoting.exp.json index ada99c15c..d083d3091 100644 --- a/testdata/d2compiler/TestCompile2/globs/mixed-edge-quoting.exp.json +++ b/testdata/d2compiler/TestCompile2/globs/mixed-edge-quoting.exp.json @@ -131,6 +131,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -162,6 +163,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -295,6 +297,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -426,6 +429,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -557,6 +561,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -635,6 +640,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -713,6 +719,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/globs/override-edge/1.exp.json b/testdata/d2compiler/TestCompile2/globs/override-edge/1.exp.json index fed08dc94..4441ad3f1 100644 --- a/testdata/d2compiler/TestCompile2/globs/override-edge/1.exp.json +++ b/testdata/d2compiler/TestCompile2/globs/override-edge/1.exp.json @@ -253,6 +253,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -294,6 +295,7 @@ "value": "green" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -341,6 +343,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -386,6 +389,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/globs/override-edge/2.exp.json b/testdata/d2compiler/TestCompile2/globs/override-edge/2.exp.json index 28e9b1036..2eadbacd7 100644 --- a/testdata/d2compiler/TestCompile2/globs/override-edge/2.exp.json +++ b/testdata/d2compiler/TestCompile2/globs/override-edge/2.exp.json @@ -255,6 +255,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -293,6 +294,7 @@ "value": "green" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -330,6 +332,7 @@ "value": "red" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -397,6 +400,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -462,6 +466,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/globs/reapply-scenario.exp.json b/testdata/d2compiler/TestCompile2/globs/reapply-scenario.exp.json index 2d8d76b97..b76efa1c8 100644 --- a/testdata/d2compiler/TestCompile2/globs/reapply-scenario.exp.json +++ b/testdata/d2compiler/TestCompile2/globs/reapply-scenario.exp.json @@ -243,6 +243,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -290,6 +291,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -335,6 +337,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "circle" @@ -459,6 +462,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -526,6 +530,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -591,6 +596,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "circle" diff --git a/testdata/d2compiler/TestCompile2/globs/second-scenario.exp.json b/testdata/d2compiler/TestCompile2/globs/second-scenario.exp.json index 888521719..77c065cb0 100644 --- a/testdata/d2compiler/TestCompile2/globs/second-scenario.exp.json +++ b/testdata/d2compiler/TestCompile2/globs/second-scenario.exp.json @@ -272,6 +272,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -397,6 +398,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -444,6 +446,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -489,6 +492,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "circle" @@ -613,6 +617,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -660,6 +665,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -705,6 +711,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "circle" diff --git a/testdata/d2compiler/TestCompile2/globs/suspend-shape.exp.json b/testdata/d2compiler/TestCompile2/globs/suspend-shape.exp.json index baf429ece..d8c653c2f 100644 --- a/testdata/d2compiler/TestCompile2/globs/suspend-shape.exp.json +++ b/testdata/d2compiler/TestCompile2/globs/suspend-shape.exp.json @@ -83,6 +83,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" diff --git a/testdata/d2compiler/TestCompile2/globs/suspension-lazy.exp.json b/testdata/d2compiler/TestCompile2/globs/suspension-lazy.exp.json index 78d2710a9..39250038d 100644 --- a/testdata/d2compiler/TestCompile2/globs/suspension-lazy.exp.json +++ b/testdata/d2compiler/TestCompile2/globs/suspension-lazy.exp.json @@ -210,6 +210,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -257,6 +258,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/globs/suspension-quotes.exp.json b/testdata/d2compiler/TestCompile2/globs/suspension-quotes.exp.json index f025e00fa..bcc779a93 100644 --- a/testdata/d2compiler/TestCompile2/globs/suspension-quotes.exp.json +++ b/testdata/d2compiler/TestCompile2/globs/suspension-quotes.exp.json @@ -276,6 +276,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -310,6 +311,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -397,6 +399,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/globs/unsuspend-cross-container-edge-label.exp.json b/testdata/d2compiler/TestCompile2/globs/unsuspend-cross-container-edge-label.exp.json index 70fca048f..9f6e86713 100644 --- a/testdata/d2compiler/TestCompile2/globs/unsuspend-cross-container-edge-label.exp.json +++ b/testdata/d2compiler/TestCompile2/globs/unsuspend-cross-container-edge-label.exp.json @@ -406,6 +406,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -443,6 +444,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -521,6 +523,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -597,6 +600,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -673,6 +677,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -749,6 +754,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-child.exp.json b/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-child.exp.json index 0cc431588..564e662a2 100644 --- a/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-child.exp.json +++ b/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-child.exp.json @@ -299,6 +299,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -336,6 +337,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -383,6 +385,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -428,6 +431,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -473,6 +477,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-filter.exp.json b/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-filter.exp.json index aaf8ce50e..4100e2ac1 100644 --- a/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-filter.exp.json +++ b/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-filter.exp.json @@ -266,6 +266,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" diff --git a/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label.exp.json b/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label.exp.json index d33cb9b7c..bce164ba8 100644 --- a/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label.exp.json +++ b/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label.exp.json @@ -259,6 +259,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -296,6 +297,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -343,6 +345,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -388,6 +391,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/globs/unsuspend-shape-label.exp.json b/testdata/d2compiler/TestCompile2/globs/unsuspend-shape-label.exp.json index 2ab9e4cfb..ab40a755f 100644 --- a/testdata/d2compiler/TestCompile2/globs/unsuspend-shape-label.exp.json +++ b/testdata/d2compiler/TestCompile2/globs/unsuspend-shape-label.exp.json @@ -114,6 +114,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -161,6 +162,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/nulls/basic/attribute.exp.json b/testdata/d2compiler/TestCompile2/nulls/basic/attribute.exp.json index fb4a47fbd..97233c400 100644 --- a/testdata/d2compiler/TestCompile2/nulls/basic/attribute.exp.json +++ b/testdata/d2compiler/TestCompile2/nulls/basic/attribute.exp.json @@ -119,6 +119,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -230,6 +231,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/nulls/basic/basic-edge.exp.json b/testdata/d2compiler/TestCompile2/nulls/basic/basic-edge.exp.json index 22bbc9837..36451d711 100644 --- a/testdata/d2compiler/TestCompile2/nulls/basic/basic-edge.exp.json +++ b/testdata/d2compiler/TestCompile2/nulls/basic/basic-edge.exp.json @@ -120,6 +120,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -167,6 +168,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -212,6 +214,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.exp.json b/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.exp.json index 2e9b77955..0039c2309 100644 --- a/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.exp.json +++ b/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.exp.json @@ -391,6 +391,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -606,6 +607,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -715,6 +717,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -824,6 +827,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -933,6 +937,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1042,6 +1047,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/nulls/basic/shape.exp.json b/testdata/d2compiler/TestCompile2/nulls/basic/shape.exp.json index ec5030e90..fa6fc4bf7 100644 --- a/testdata/d2compiler/TestCompile2/nulls/basic/shape.exp.json +++ b/testdata/d2compiler/TestCompile2/nulls/basic/shape.exp.json @@ -69,6 +69,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" diff --git a/testdata/d2compiler/TestCompile2/nulls/implicit/delete-children.exp.json b/testdata/d2compiler/TestCompile2/nulls/implicit/delete-children.exp.json index 758fbbabb..fcfbe21c0 100644 --- a/testdata/d2compiler/TestCompile2/nulls/implicit/delete-children.exp.json +++ b/testdata/d2compiler/TestCompile2/nulls/implicit/delete-children.exp.json @@ -174,6 +174,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -274,6 +275,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/nulls/implicit/delete-connection.exp.json b/testdata/d2compiler/TestCompile2/nulls/implicit/delete-connection.exp.json index 62151696b..0e60bd324 100644 --- a/testdata/d2compiler/TestCompile2/nulls/implicit/delete-connection.exp.json +++ b/testdata/d2compiler/TestCompile2/nulls/implicit/delete-connection.exp.json @@ -92,6 +92,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -139,6 +140,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/nulls/implicit/delete-multiple-connections.exp.json b/testdata/d2compiler/TestCompile2/nulls/implicit/delete-multiple-connections.exp.json index 7a9d1b326..66c5b2812 100644 --- a/testdata/d2compiler/TestCompile2/nulls/implicit/delete-multiple-connections.exp.json +++ b/testdata/d2compiler/TestCompile2/nulls/implicit/delete-multiple-connections.exp.json @@ -184,6 +184,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -231,6 +232,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -276,6 +278,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -321,6 +324,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/nulls/implicit/delete-nested-connection.exp.json b/testdata/d2compiler/TestCompile2/nulls/implicit/delete-nested-connection.exp.json index ab4289ac1..3eb4e3250 100644 --- a/testdata/d2compiler/TestCompile2/nulls/implicit/delete-nested-connection.exp.json +++ b/testdata/d2compiler/TestCompile2/nulls/implicit/delete-nested-connection.exp.json @@ -114,6 +114,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -161,6 +162,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -248,6 +250,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/nulls/implicit/no-delete-connection.exp.json b/testdata/d2compiler/TestCompile2/nulls/implicit/no-delete-connection.exp.json index c0b0e4fc1..b6b70ff58 100644 --- a/testdata/d2compiler/TestCompile2/nulls/implicit/no-delete-connection.exp.json +++ b/testdata/d2compiler/TestCompile2/nulls/implicit/no-delete-connection.exp.json @@ -92,6 +92,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -123,6 +124,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -170,6 +172,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -215,6 +218,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/nulls/multiboard/scenario.exp.json b/testdata/d2compiler/TestCompile2/nulls/multiboard/scenario.exp.json index c1c9acc54..f586a6d3a 100644 --- a/testdata/d2compiler/TestCompile2/nulls/multiboard/scenario.exp.json +++ b/testdata/d2compiler/TestCompile2/nulls/multiboard/scenario.exp.json @@ -127,6 +127,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -174,6 +175,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -206,6 +208,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" diff --git a/testdata/d2compiler/TestCompile2/nulls/reappear/attribute-reset.exp.json b/testdata/d2compiler/TestCompile2/nulls/reappear/attribute-reset.exp.json index 92f2e464a..3ba9efaba 100644 --- a/testdata/d2compiler/TestCompile2/nulls/reappear/attribute-reset.exp.json +++ b/testdata/d2compiler/TestCompile2/nulls/reappear/attribute-reset.exp.json @@ -120,6 +120,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -167,6 +168,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/nulls/reappear/children-reset.exp.json b/testdata/d2compiler/TestCompile2/nulls/reappear/children-reset.exp.json index 6af8f1845..37405dce0 100644 --- a/testdata/d2compiler/TestCompile2/nulls/reappear/children-reset.exp.json +++ b/testdata/d2compiler/TestCompile2/nulls/reappear/children-reset.exp.json @@ -136,6 +136,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -267,6 +268,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -323,6 +325,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/nulls/reappear/edge-reset.exp.json b/testdata/d2compiler/TestCompile2/nulls/reappear/edge-reset.exp.json index d6e3860e1..7a3a04234 100644 --- a/testdata/d2compiler/TestCompile2/nulls/reappear/edge-reset.exp.json +++ b/testdata/d2compiler/TestCompile2/nulls/reappear/edge-reset.exp.json @@ -115,6 +115,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -162,6 +163,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -207,6 +209,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/nulls/reappear/edge.exp.json b/testdata/d2compiler/TestCompile2/nulls/reappear/edge.exp.json index f22a53468..c51ea36c2 100644 --- a/testdata/d2compiler/TestCompile2/nulls/reappear/edge.exp.json +++ b/testdata/d2compiler/TestCompile2/nulls/reappear/edge.exp.json @@ -166,6 +166,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -197,6 +198,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -264,6 +266,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -329,6 +332,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/nulls/reappear/shape.exp.json b/testdata/d2compiler/TestCompile2/nulls/reappear/shape.exp.json index 744b757f3..ae073b07b 100644 --- a/testdata/d2compiler/TestCompile2/nulls/reappear/shape.exp.json +++ b/testdata/d2compiler/TestCompile2/nulls/reappear/shape.exp.json @@ -92,6 +92,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -139,6 +140,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/vars/basic/array.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/array.exp.json index 73c5d4b33..ec5b3038a 100644 --- a/testdata/d2compiler/TestCompile2/vars/basic/array.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/basic/array.exp.json @@ -248,6 +248,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -330,6 +331,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "sql_table" diff --git a/testdata/d2compiler/TestCompile2/vars/basic/combined.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/combined.exp.json index 647ad1d52..cffe24a16 100644 --- a/testdata/d2compiler/TestCompile2/vars/basic/combined.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/basic/combined.exp.json @@ -113,6 +113,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -160,6 +161,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/vars/basic/comment-array.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/comment-array.exp.json index 392d58b96..0596e3a42 100644 --- a/testdata/d2compiler/TestCompile2/vars/basic/comment-array.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/basic/comment-array.exp.json @@ -150,6 +150,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -197,6 +198,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/vars/basic/double-border.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/double-border.exp.json index c2ef1281b..448acbbc1 100644 --- a/testdata/d2compiler/TestCompile2/vars/basic/double-border.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/basic/double-border.exp.json @@ -113,6 +113,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -217,6 +218,7 @@ "value": "true" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "circle" diff --git a/testdata/d2compiler/TestCompile2/vars/basic/double-quote-primary.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/double-quote-primary.exp.json index d23e46259..407f8ad27 100644 --- a/testdata/d2compiler/TestCompile2/vars/basic/double-quote-primary.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/basic/double-quote-primary.exp.json @@ -152,6 +152,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -199,6 +200,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/vars/basic/double-quoted.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/double-quoted.exp.json index dd4764b6b..ef3b6a3b4 100644 --- a/testdata/d2compiler/TestCompile2/vars/basic/double-quoted.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/basic/double-quoted.exp.json @@ -113,6 +113,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -160,6 +161,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/vars/basic/edge-label.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/edge-label.exp.json index 87391a571..8750bbebe 100644 --- a/testdata/d2compiler/TestCompile2/vars/basic/edge-label.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/basic/edge-label.exp.json @@ -152,6 +152,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -183,6 +184,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -230,6 +232,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -275,6 +278,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/vars/basic/edge-map.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/edge-map.exp.json index cb64534ff..2f6130c61 100644 --- a/testdata/d2compiler/TestCompile2/vars/basic/edge-map.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/basic/edge-map.exp.json @@ -192,6 +192,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -218,6 +219,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -241,6 +243,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -288,6 +291,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -333,6 +337,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/vars/basic/map.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/map.exp.json index e04804d69..77170767c 100644 --- a/testdata/d2compiler/TestCompile2/vars/basic/map.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/basic/map.exp.json @@ -313,6 +313,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -339,6 +340,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -362,6 +364,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -424,6 +427,7 @@ "value": "red" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -469,6 +473,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -514,6 +519,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/vars/basic/multi-part-array.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/multi-part-array.exp.json index f6b14f864..d9c1f3fab 100644 --- a/testdata/d2compiler/TestCompile2/vars/basic/multi-part-array.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/basic/multi-part-array.exp.json @@ -142,6 +142,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -200,6 +201,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/vars/basic/nested.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/nested.exp.json index 2b5c53b82..a19448c54 100644 --- a/testdata/d2compiler/TestCompile2/vars/basic/nested.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/basic/nested.exp.json @@ -249,6 +249,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -300,6 +301,7 @@ "value": "red" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/vars/basic/number.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/number.exp.json index a27ca9ad5..2f4ec8488 100644 --- a/testdata/d2compiler/TestCompile2/vars/basic/number.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/basic/number.exp.json @@ -177,6 +177,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -224,6 +225,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -272,6 +274,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/vars/basic/parent-scope.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/parent-scope.exp.json index b9d8924d5..0d2507540 100644 --- a/testdata/d2compiler/TestCompile2/vars/basic/parent-scope.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/basic/parent-scope.exp.json @@ -220,6 +220,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -267,6 +268,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -312,6 +314,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/vars/basic/primary-and-composite.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/primary-and-composite.exp.json index f787b07bc..c64006cb0 100644 --- a/testdata/d2compiler/TestCompile2/vars/basic/primary-and-composite.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/basic/primary-and-composite.exp.json @@ -168,6 +168,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -215,6 +216,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -260,6 +262,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/vars/basic/quoted-var-quoted-sub.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/quoted-var-quoted-sub.exp.json index 0ab13c79f..53a31fe40 100644 --- a/testdata/d2compiler/TestCompile2/vars/basic/quoted-var-quoted-sub.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/basic/quoted-var-quoted-sub.exp.json @@ -113,6 +113,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -160,6 +161,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/vars/basic/quoted-var.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/quoted-var.exp.json index ec1525372..0d2ce8a0f 100644 --- a/testdata/d2compiler/TestCompile2/vars/basic/quoted-var.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/basic/quoted-var.exp.json @@ -296,6 +296,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -350,6 +351,7 @@ "value": "5" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/vars/basic/shape-label.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/shape-label.exp.json index faf48d651..26c2458dc 100644 --- a/testdata/d2compiler/TestCompile2/vars/basic/shape-label.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/basic/shape-label.exp.json @@ -129,6 +129,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -176,6 +177,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/vars/basic/single-quoted.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/single-quoted.exp.json index 5e1a45456..5ea7b5420 100644 --- a/testdata/d2compiler/TestCompile2/vars/basic/single-quoted.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/basic/single-quoted.exp.json @@ -110,6 +110,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -157,6 +158,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/vars/basic/spread-array.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/spread-array.exp.json index f83c5490d..4793baf29 100644 --- a/testdata/d2compiler/TestCompile2/vars/basic/spread-array.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/basic/spread-array.exp.json @@ -259,6 +259,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -342,6 +343,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "sql_table" diff --git a/testdata/d2compiler/TestCompile2/vars/basic/spread-edge.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/spread-edge.exp.json index 2222e2d12..cf0883009 100644 --- a/testdata/d2compiler/TestCompile2/vars/basic/spread-edge.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/basic/spread-edge.exp.json @@ -171,6 +171,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -202,6 +203,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -249,6 +251,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -294,6 +297,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -339,6 +343,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/vars/basic/spread-nested.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/spread-nested.exp.json index 484af8d51..2e5f19a4a 100644 --- a/testdata/d2compiler/TestCompile2/vars/basic/spread-nested.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/basic/spread-nested.exp.json @@ -158,6 +158,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -205,6 +206,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -250,6 +252,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/vars/basic/spread.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/spread.exp.json index 31cda41df..18d7542d7 100644 --- a/testdata/d2compiler/TestCompile2/vars/basic/spread.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/basic/spread.exp.json @@ -224,6 +224,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -271,6 +272,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -316,6 +318,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -361,6 +364,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -406,6 +410,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/vars/basic/style.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/style.exp.json index 9cd133ce4..72874a2f6 100644 --- a/testdata/d2compiler/TestCompile2/vars/basic/style.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/basic/style.exp.json @@ -169,6 +169,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -220,6 +221,7 @@ "value": "red" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/vars/basic/sub-array.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/sub-array.exp.json index 0c182f344..9e1539bbe 100644 --- a/testdata/d2compiler/TestCompile2/vars/basic/sub-array.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/basic/sub-array.exp.json @@ -158,6 +158,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -216,6 +217,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/vars/boards/layer-2.exp.json b/testdata/d2compiler/TestCompile2/vars/boards/layer-2.exp.json index 12e21fce8..e6d5021f3 100644 --- a/testdata/d2compiler/TestCompile2/vars/boards/layer-2.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/boards/layer-2.exp.json @@ -330,6 +330,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -492,6 +493,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -539,6 +541,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -584,6 +587,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/vars/boards/layer.exp.json b/testdata/d2compiler/TestCompile2/vars/boards/layer.exp.json index b6637d17d..1faf67423 100644 --- a/testdata/d2compiler/TestCompile2/vars/boards/layer.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/boards/layer.exp.json @@ -187,6 +187,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -254,6 +255,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -301,6 +303,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/vars/boards/overlay.exp.json b/testdata/d2compiler/TestCompile2/vars/boards/overlay.exp.json index 71dbaf145..a7cc3ebdd 100644 --- a/testdata/d2compiler/TestCompile2/vars/boards/overlay.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/boards/overlay.exp.json @@ -513,6 +513,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -675,6 +676,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -722,6 +724,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -767,6 +770,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -963,6 +967,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -1010,6 +1015,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1055,6 +1061,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/vars/boards/replace.exp.json b/testdata/d2compiler/TestCompile2/vars/boards/replace.exp.json index 411acd675..660308ec6 100644 --- a/testdata/d2compiler/TestCompile2/vars/boards/replace.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/boards/replace.exp.json @@ -249,6 +249,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -378,6 +379,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -425,6 +427,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/vars/boards/scenario.exp.json b/testdata/d2compiler/TestCompile2/vars/boards/scenario.exp.json index c8ee454e7..1c699584f 100644 --- a/testdata/d2compiler/TestCompile2/vars/boards/scenario.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/boards/scenario.exp.json @@ -187,6 +187,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -316,6 +317,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -363,6 +365,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/vars/config/basic.exp.json b/testdata/d2compiler/TestCompile2/vars/config/basic.exp.json index bff64593a..47cf3e9d3 100644 --- a/testdata/d2compiler/TestCompile2/vars/config/basic.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/config/basic.exp.json @@ -151,6 +151,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -182,6 +183,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -229,6 +231,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -274,6 +277,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/vars/config/data.exp.json b/testdata/d2compiler/TestCompile2/vars/config/data.exp.json index 3cc4116a2..bb17c0b0f 100644 --- a/testdata/d2compiler/TestCompile2/vars/config/data.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/config/data.exp.json @@ -189,6 +189,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" diff --git a/testdata/d2compiler/TestCompile2/vars/errors/split-var-usage.exp.json b/testdata/d2compiler/TestCompile2/vars/errors/split-var-usage.exp.json index aedfa7123..16d5bd9e7 100644 --- a/testdata/d2compiler/TestCompile2/vars/errors/split-var-usage.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/errors/split-var-usage.exp.json @@ -192,6 +192,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -263,6 +264,7 @@ "value": "green" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/vars/errors/spread-mid-string.exp.json b/testdata/d2compiler/TestCompile2/vars/errors/spread-mid-string.exp.json index 92963e270..0f849df83 100644 --- a/testdata/d2compiler/TestCompile2/vars/errors/spread-mid-string.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/errors/spread-mid-string.exp.json @@ -142,6 +142,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -189,6 +190,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/vars/override/label.exp.json b/testdata/d2compiler/TestCompile2/vars/override/label.exp.json index 7101e2e4f..19fc7c45d 100644 --- a/testdata/d2compiler/TestCompile2/vars/override/label.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/override/label.exp.json @@ -162,6 +162,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -229,6 +230,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/vars/override/map.exp.json b/testdata/d2compiler/TestCompile2/vars/override/map.exp.json index 11208a29b..9f53a9e28 100644 --- a/testdata/d2compiler/TestCompile2/vars/override/map.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/override/map.exp.json @@ -220,6 +220,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -267,6 +268,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -312,6 +314,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/vars/override/recursive-var.exp.json b/testdata/d2compiler/TestCompile2/vars/override/recursive-var.exp.json index c075d52a3..2dec10472 100644 --- a/testdata/d2compiler/TestCompile2/vars/override/recursive-var.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/override/recursive-var.exp.json @@ -315,6 +315,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -362,6 +363,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -407,6 +409,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -452,6 +455,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/vars/override/var-in-var.exp.json b/testdata/d2compiler/TestCompile2/vars/override/var-in-var.exp.json index 6f41e1fad..595ce0ca1 100644 --- a/testdata/d2compiler/TestCompile2/vars/override/var-in-var.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/override/var-in-var.exp.json @@ -251,6 +251,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -298,6 +299,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -343,6 +345,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/add_layer/1.exp.json b/testdata/d2oracle/TestCreate/add_layer/1.exp.json index dfb966563..ebfa807fd 100644 --- a/testdata/d2oracle/TestCreate/add_layer/1.exp.json +++ b/testdata/d2oracle/TestCreate/add_layer/1.exp.json @@ -99,6 +99,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -146,6 +147,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -178,6 +180,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" diff --git a/testdata/d2oracle/TestCreate/add_layer/2.exp.json b/testdata/d2oracle/TestCreate/add_layer/2.exp.json index 373dd3fa7..483ee71f0 100644 --- a/testdata/d2oracle/TestCreate/add_layer/2.exp.json +++ b/testdata/d2oracle/TestCreate/add_layer/2.exp.json @@ -151,6 +151,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -198,6 +199,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -254,6 +256,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -301,6 +304,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -333,6 +337,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" diff --git a/testdata/d2oracle/TestCreate/add_layer/3.exp.json b/testdata/d2oracle/TestCreate/add_layer/3.exp.json index 9289f8a7b..399a2b0d0 100644 --- a/testdata/d2oracle/TestCreate/add_layer/3.exp.json +++ b/testdata/d2oracle/TestCreate/add_layer/3.exp.json @@ -180,6 +180,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -227,6 +228,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -335,6 +337,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -382,6 +385,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -414,6 +418,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" diff --git a/testdata/d2oracle/TestCreate/add_layer/4.exp.json b/testdata/d2oracle/TestCreate/add_layer/4.exp.json index 4fb77218e..a36c89f62 100644 --- a/testdata/d2oracle/TestCreate/add_layer/4.exp.json +++ b/testdata/d2oracle/TestCreate/add_layer/4.exp.json @@ -123,6 +123,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -170,6 +171,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -226,6 +228,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -273,6 +276,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/add_layer/5.exp.json b/testdata/d2oracle/TestCreate/add_layer/5.exp.json index bd5e2f3bc..c828ec22e 100644 --- a/testdata/d2oracle/TestCreate/add_layer/5.exp.json +++ b/testdata/d2oracle/TestCreate/add_layer/5.exp.json @@ -225,6 +225,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -272,6 +273,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -448,6 +450,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -495,6 +498,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/base.exp.json b/testdata/d2oracle/TestCreate/base.exp.json index f552f394a..ed6671aa9 100644 --- a/testdata/d2oracle/TestCreate/base.exp.json +++ b/testdata/d2oracle/TestCreate/base.exp.json @@ -42,6 +42,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -89,6 +90,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/container.exp.json b/testdata/d2oracle/TestCreate/container.exp.json index a98e70b9f..f6ed275e7 100644 --- a/testdata/d2oracle/TestCreate/container.exp.json +++ b/testdata/d2oracle/TestCreate/container.exp.json @@ -71,6 +71,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -118,6 +119,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -163,6 +165,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 be325688f..2c8c20e5f 100644 --- a/testdata/d2oracle/TestCreate/container_edge.exp.json +++ b/testdata/d2oracle/TestCreate/container_edge.exp.json @@ -94,6 +94,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -125,6 +126,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -172,6 +174,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -217,6 +220,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -262,6 +266,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 5e2691e80..989d00e12 100644 --- a/testdata/d2oracle/TestCreate/container_edge_label.exp.json +++ b/testdata/d2oracle/TestCreate/container_edge_label.exp.json @@ -104,6 +104,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -135,6 +136,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -182,6 +184,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -227,6 +230,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -272,6 +276,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/edge.exp.json b/testdata/d2oracle/TestCreate/edge.exp.json index b9391dd96..1dc918b70 100644 --- a/testdata/d2oracle/TestCreate/edge.exp.json +++ b/testdata/d2oracle/TestCreate/edge.exp.json @@ -65,6 +65,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -96,6 +97,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -143,6 +145,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -188,6 +191,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 fd96ef6e9..b36c7fc63 100644 --- a/testdata/d2oracle/TestCreate/edge_nested.exp.json +++ b/testdata/d2oracle/TestCreate/edge_nested.exp.json @@ -81,6 +81,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -112,6 +113,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -159,6 +161,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -204,6 +207,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -249,6 +253,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 96a1cef5e..ee973a454 100644 --- a/testdata/d2oracle/TestCreate/edge_scope.exp.json +++ b/testdata/d2oracle/TestCreate/edge_scope.exp.json @@ -94,6 +94,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -125,6 +126,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -172,6 +174,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -217,6 +220,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -262,6 +266,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 6d529ec3e..e245ae4c0 100644 --- a/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json +++ b/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json @@ -94,6 +94,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -125,6 +126,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -172,6 +174,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -217,6 +220,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -262,6 +266,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 6aa1e8666..1ed900594 100644 --- a/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json +++ b/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json @@ -105,6 +105,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -136,6 +137,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -194,6 +196,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -250,6 +253,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -295,6 +299,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -340,6 +345,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 2228f62f9..8869f398b 100644 --- a/testdata/d2oracle/TestCreate/edge_unique.exp.json +++ b/testdata/d2oracle/TestCreate/edge_unique.exp.json @@ -251,6 +251,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -282,6 +283,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -312,6 +314,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -342,6 +345,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -372,6 +376,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -419,6 +424,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -464,6 +470,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -549,6 +556,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -634,6 +642,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -719,6 +728,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 6d3333c4f..8ec9b10c3 100644 --- a/testdata/d2oracle/TestCreate/gen_key.exp.json +++ b/testdata/d2oracle/TestCreate/gen_key.exp.json @@ -65,6 +65,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -112,6 +113,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -157,6 +159,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 d35ac1de8..3e5832ebe 100644 --- a/testdata/d2oracle/TestCreate/gen_key_n.exp.json +++ b/testdata/d2oracle/TestCreate/gen_key_n.exp.json @@ -323,6 +323,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -392,6 +393,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -459,6 +461,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -526,6 +529,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -571,6 +575,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -616,6 +621,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -661,6 +667,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -706,6 +713,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -751,6 +759,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -796,6 +805,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -841,6 +851,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -886,6 +897,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -931,6 +943,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -976,6 +989,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1021,6 +1035,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 8e43202e6..e38c0ca56 100644 --- a/testdata/d2oracle/TestCreate/gen_key_nested.exp.json +++ b/testdata/d2oracle/TestCreate/gen_key_nested.exp.json @@ -131,6 +131,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -264,6 +265,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -395,6 +397,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -526,6 +529,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -604,6 +608,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -682,6 +687,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 0bcfa43e5..85e3d1b97 100644 --- a/testdata/d2oracle/TestCreate/gen_key_scope.exp.json +++ b/testdata/d2oracle/TestCreate/gen_key_scope.exp.json @@ -116,6 +116,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -185,6 +186,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -252,6 +254,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -319,6 +322,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -364,6 +368,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -409,6 +414,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 2cc74b8aa..6760dfa17 100644 --- a/testdata/d2oracle/TestCreate/gen_key_suffix.exp.json +++ b/testdata/d2oracle/TestCreate/gen_key_suffix.exp.json @@ -65,6 +65,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -112,6 +113,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -157,6 +159,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/image-edge.exp.json b/testdata/d2oracle/TestCreate/image-edge.exp.json index 17076cc87..47d894ca1 100644 --- a/testdata/d2oracle/TestCreate/image-edge.exp.json +++ b/testdata/d2oracle/TestCreate/image-edge.exp.json @@ -207,6 +207,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -238,6 +239,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -336,6 +338,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -445,6 +448,7 @@ "Fragment": "", "RawFragment": "" }, + "iconStyle": {}, "near_key": null, "shape": { "value": "image" @@ -510,6 +514,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/layers-basic.exp.json b/testdata/d2oracle/TestCreate/layers-basic.exp.json index 00f2181e7..ba7c99692 100644 --- a/testdata/d2oracle/TestCreate/layers-basic.exp.json +++ b/testdata/d2oracle/TestCreate/layers-basic.exp.json @@ -146,6 +146,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -193,6 +194,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -272,6 +274,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -319,6 +322,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -364,6 +368,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/layers-edge-duplicate.exp.json b/testdata/d2oracle/TestCreate/layers-edge-duplicate.exp.json index a07f6b053..6b4cd2a5f 100644 --- a/testdata/d2oracle/TestCreate/layers-edge-duplicate.exp.json +++ b/testdata/d2oracle/TestCreate/layers-edge-duplicate.exp.json @@ -215,6 +215,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -246,6 +247,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -293,6 +295,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -338,6 +341,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -505,6 +509,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -536,6 +541,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -566,6 +572,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -633,6 +640,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -698,6 +706,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/layers-edge.exp.json b/testdata/d2oracle/TestCreate/layers-edge.exp.json index 46d1857fa..76bc27adf 100644 --- a/testdata/d2oracle/TestCreate/layers-edge.exp.json +++ b/testdata/d2oracle/TestCreate/layers-edge.exp.json @@ -169,6 +169,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -216,6 +217,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -339,6 +341,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -370,6 +373,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -437,6 +441,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -482,6 +487,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 3b2eb0b98..529d26d68 100644 --- a/testdata/d2oracle/TestCreate/make_scope_multiline.exp.json +++ b/testdata/d2oracle/TestCreate/make_scope_multiline.exp.json @@ -104,6 +104,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -151,6 +152,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "circle" @@ -196,6 +198,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 c5e68d3cb..db9829d8d 100644 --- a/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.exp.json +++ b/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.exp.json @@ -150,6 +150,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -197,6 +198,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -242,6 +244,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "circle" @@ -287,6 +290,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -332,6 +336,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 b5616c220..e18861213 100644 --- a/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.exp.json +++ b/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.exp.json @@ -150,6 +150,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -197,6 +198,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -242,6 +244,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "circle" @@ -287,6 +290,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -332,6 +336,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/nested.exp.json b/testdata/d2oracle/TestCreate/nested.exp.json index aa857c317..7d21f76b2 100644 --- a/testdata/d2oracle/TestCreate/nested.exp.json +++ b/testdata/d2oracle/TestCreate/nested.exp.json @@ -64,6 +64,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -133,6 +134,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -200,6 +202,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -267,6 +270,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/scenarios-basic.exp.json b/testdata/d2oracle/TestCreate/scenarios-basic.exp.json index dced51d93..64d5a0ca1 100644 --- a/testdata/d2oracle/TestCreate/scenarios-basic.exp.json +++ b/testdata/d2oracle/TestCreate/scenarios-basic.exp.json @@ -169,6 +169,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -216,6 +217,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -261,6 +263,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -363,6 +366,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -430,6 +434,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -475,6 +480,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -520,6 +526,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/scenarios-edge-inherited.exp.json b/testdata/d2oracle/TestCreate/scenarios-edge-inherited.exp.json index f30872771..e483a16da 100644 --- a/testdata/d2oracle/TestCreate/scenarios-edge-inherited.exp.json +++ b/testdata/d2oracle/TestCreate/scenarios-edge-inherited.exp.json @@ -192,6 +192,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -223,6 +224,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -270,6 +272,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -315,6 +318,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -482,6 +486,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -513,6 +518,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -543,6 +549,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -630,6 +637,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -695,6 +703,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/scenarios-edge.exp.json b/testdata/d2oracle/TestCreate/scenarios-edge.exp.json index f63bfeff7..2630612b4 100644 --- a/testdata/d2oracle/TestCreate/scenarios-edge.exp.json +++ b/testdata/d2oracle/TestCreate/scenarios-edge.exp.json @@ -192,6 +192,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -239,6 +240,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -284,6 +286,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -407,6 +410,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -438,6 +442,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -525,6 +530,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -590,6 +596,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/scope.exp.json b/testdata/d2oracle/TestCreate/scope.exp.json index 54f4d8c6a..742cf41bf 100644 --- a/testdata/d2oracle/TestCreate/scope.exp.json +++ b/testdata/d2oracle/TestCreate/scope.exp.json @@ -93,6 +93,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -162,6 +163,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -229,6 +231,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -296,6 +299,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -341,6 +345,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/steps-basic.exp.json b/testdata/d2oracle/TestCreate/steps-basic.exp.json index 25c19f1ba..3de45348a 100644 --- a/testdata/d2oracle/TestCreate/steps-basic.exp.json +++ b/testdata/d2oracle/TestCreate/steps-basic.exp.json @@ -169,6 +169,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -216,6 +217,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -261,6 +263,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -386,6 +389,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -433,6 +437,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -478,6 +483,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -523,6 +529,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -568,6 +575,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/steps-conflict.exp.json b/testdata/d2oracle/TestCreate/steps-conflict.exp.json index 2527f158c..ede5da1a3 100644 --- a/testdata/d2oracle/TestCreate/steps-conflict.exp.json +++ b/testdata/d2oracle/TestCreate/steps-conflict.exp.json @@ -169,6 +169,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -216,6 +217,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -261,6 +263,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -386,6 +389,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -433,6 +437,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -478,6 +483,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -523,6 +529,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -568,6 +575,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/steps-edge.exp.json b/testdata/d2oracle/TestCreate/steps-edge.exp.json index 7d4d07625..6eaefea57 100644 --- a/testdata/d2oracle/TestCreate/steps-edge.exp.json +++ b/testdata/d2oracle/TestCreate/steps-edge.exp.json @@ -192,6 +192,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -239,6 +240,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -284,6 +286,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -430,6 +433,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -461,6 +465,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -508,6 +513,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -573,6 +579,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -638,6 +645,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/arrowhead.exp.json b/testdata/d2oracle/TestDelete/arrowhead.exp.json index 6e89878ef..073a6dc88 100644 --- a/testdata/d2oracle/TestDelete/arrowhead.exp.json +++ b/testdata/d2oracle/TestDelete/arrowhead.exp.json @@ -65,6 +65,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -96,6 +97,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -143,6 +145,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -188,6 +191,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/arrowhead_label.exp.json b/testdata/d2oracle/TestDelete/arrowhead_label.exp.json index 0ca9c574f..406826502 100644 --- a/testdata/d2oracle/TestDelete/arrowhead_label.exp.json +++ b/testdata/d2oracle/TestDelete/arrowhead_label.exp.json @@ -115,6 +115,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -141,6 +142,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "diamond" @@ -164,6 +166,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -211,6 +214,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -256,6 +260,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/arrowhead_map.exp.json b/testdata/d2oracle/TestDelete/arrowhead_map.exp.json index e6ff5d752..0a8684592 100644 --- a/testdata/d2oracle/TestDelete/arrowhead_map.exp.json +++ b/testdata/d2oracle/TestDelete/arrowhead_map.exp.json @@ -65,6 +65,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -96,6 +97,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -143,6 +145,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -188,6 +191,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/arrowhead_shape.exp.json b/testdata/d2oracle/TestDelete/arrowhead_shape.exp.json index 28694a0da..c466c7f06 100644 --- a/testdata/d2oracle/TestDelete/arrowhead_shape.exp.json +++ b/testdata/d2oracle/TestDelete/arrowhead_shape.exp.json @@ -65,6 +65,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -96,6 +97,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -143,6 +145,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -188,6 +191,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 59968f1d6..7fd99076a 100644 --- a/testdata/d2oracle/TestDelete/breakup_arrowhead.exp.json +++ b/testdata/d2oracle/TestDelete/breakup_arrowhead.exp.json @@ -42,6 +42,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -89,6 +90,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/chaos_1.exp.json b/testdata/d2oracle/TestDelete/chaos_1.exp.json index dc0352817..aa860ca5f 100644 --- a/testdata/d2oracle/TestDelete/chaos_1.exp.json +++ b/testdata/d2oracle/TestDelete/chaos_1.exp.json @@ -256,6 +256,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -281,6 +282,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "cf-one-required" @@ -305,6 +307,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -412,6 +415,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "cylinder" @@ -457,6 +461,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -502,6 +507,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/children.exp.json b/testdata/d2oracle/TestDelete/children.exp.json index a0fdc1628..119045603 100644 --- a/testdata/d2oracle/TestDelete/children.exp.json +++ b/testdata/d2oracle/TestDelete/children.exp.json @@ -88,6 +88,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -119,6 +120,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -166,6 +168,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -211,6 +214,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -256,6 +260,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 bfed5014b..45f29a6a3 100644 --- a/testdata/d2oracle/TestDelete/children_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_conflicts.exp.json @@ -65,6 +65,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -112,6 +113,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -157,6 +159,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 7759732a2..64581d9da 100644 --- a/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json @@ -121,6 +121,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -152,6 +153,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -219,6 +221,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -264,6 +267,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -309,6 +313,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 a11ffdd2c..f93045e26 100644 --- a/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json @@ -214,6 +214,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -245,6 +246,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -275,6 +277,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -342,6 +345,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -407,6 +411,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -472,6 +477,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -517,6 +523,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -562,6 +569,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 fe212f64a..08859f6d5 100644 --- a/testdata/d2oracle/TestDelete/children_flat_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_flat_conflicts.exp.json @@ -98,6 +98,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -165,6 +166,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -210,6 +212,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 c1cf6e922..75883de8c 100644 --- a/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json @@ -190,6 +190,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -221,6 +222,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -308,6 +310,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -373,6 +376,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -418,6 +422,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -463,6 +468,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 c8465ce86..1bfd71ee8 100644 --- a/testdata/d2oracle/TestDelete/children_nested_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_nested_conflicts.exp.json @@ -94,6 +94,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -141,6 +142,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -186,6 +188,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -231,6 +234,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 489e99551..f595e5431 100644 --- a/testdata/d2oracle/TestDelete/children_nested_referenced_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_nested_referenced_conflicts.exp.json @@ -153,6 +153,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -262,6 +263,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -349,6 +351,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -394,6 +397,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 656125a78..9e40a2e8b 100644 --- a/testdata/d2oracle/TestDelete/children_no_self_conflict.exp.json +++ b/testdata/d2oracle/TestDelete/children_no_self_conflict.exp.json @@ -42,6 +42,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -89,6 +90,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 a85079f82..2b487c516 100644 --- a/testdata/d2oracle/TestDelete/children_order.exp.json +++ b/testdata/d2oracle/TestDelete/children_order.exp.json @@ -117,6 +117,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -164,6 +165,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -209,6 +211,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -254,6 +257,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -299,6 +303,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 25088c478..f9d889bf6 100644 --- a/testdata/d2oracle/TestDelete/children_referenced_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_referenced_conflicts.exp.json @@ -98,6 +98,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -165,6 +166,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -210,6 +212,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 13e8a86d1..e486aaf45 100644 --- a/testdata/d2oracle/TestDelete/children_scope.exp.json +++ b/testdata/d2oracle/TestDelete/children_scope.exp.json @@ -128,6 +128,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -159,6 +160,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -217,6 +219,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -273,6 +276,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -318,6 +322,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -363,6 +368,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -408,6 +414,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/class_refs.exp.json b/testdata/d2oracle/TestDelete/class_refs.exp.json index 600314149..95133a478 100644 --- a/testdata/d2oracle/TestDelete/class_refs.exp.json +++ b/testdata/d2oracle/TestDelete/class_refs.exp.json @@ -18,6 +18,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" diff --git a/testdata/d2oracle/TestDelete/conflicts_generated.exp.json b/testdata/d2oracle/TestDelete/conflicts_generated.exp.json index 031c8c0ee..4c0be7d37 100644 --- a/testdata/d2oracle/TestDelete/conflicts_generated.exp.json +++ b/testdata/d2oracle/TestDelete/conflicts_generated.exp.json @@ -117,6 +117,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -164,6 +165,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -209,6 +211,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -254,6 +257,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -299,6 +303,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/conflicts_generated_3.exp.json b/testdata/d2oracle/TestDelete/conflicts_generated_3.exp.json index 5bfcfeee6..4b6afb662 100644 --- a/testdata/d2oracle/TestDelete/conflicts_generated_3.exp.json +++ b/testdata/d2oracle/TestDelete/conflicts_generated_3.exp.json @@ -111,6 +111,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -158,6 +159,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -203,6 +205,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -248,6 +251,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -293,6 +297,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/conflicts_generated_continued.exp.json b/testdata/d2oracle/TestDelete/conflicts_generated_continued.exp.json index b6b34b741..d4f337ae8 100644 --- a/testdata/d2oracle/TestDelete/conflicts_generated_continued.exp.json +++ b/testdata/d2oracle/TestDelete/conflicts_generated_continued.exp.json @@ -88,6 +88,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -135,6 +136,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -180,6 +182,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -225,6 +228,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/connection-glob.exp.json b/testdata/d2oracle/TestDelete/connection-glob.exp.json index f1fb79d61..ccfdd0d35 100644 --- a/testdata/d2oracle/TestDelete/connection-glob.exp.json +++ b/testdata/d2oracle/TestDelete/connection-glob.exp.json @@ -172,6 +172,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -203,6 +204,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -250,6 +252,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -295,6 +298,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 5044d5f4b..c77755b02 100644 --- a/testdata/d2oracle/TestDelete/container_near.exp.json +++ b/testdata/d2oracle/TestDelete/container_near.exp.json @@ -166,6 +166,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -213,6 +214,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": { "range": "d2/testdata/d2oracle/TestDelete/container_near.d2,1:8:13-1:9:14", "path": [ @@ -273,6 +275,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -318,6 +321,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": { "range": "d2/testdata/d2oracle/TestDelete/container_near.d2,5:8:32-5:9:33", "path": [ diff --git a/testdata/d2oracle/TestDelete/delete-imported-layer-obj.exp.json b/testdata/d2oracle/TestDelete/delete-imported-layer-obj.exp.json index 5cbfa98a1..9800d9229 100644 --- a/testdata/d2oracle/TestDelete/delete-imported-layer-obj.exp.json +++ b/testdata/d2oracle/TestDelete/delete-imported-layer-obj.exp.json @@ -124,6 +124,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -157,6 +158,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" diff --git a/testdata/d2oracle/TestDelete/delete-layer-obj.exp.json b/testdata/d2oracle/TestDelete/delete-layer-obj.exp.json index f8b40706e..689d73314 100644 --- a/testdata/d2oracle/TestDelete/delete-layer-obj.exp.json +++ b/testdata/d2oracle/TestDelete/delete-layer-obj.exp.json @@ -76,6 +76,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -109,6 +110,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" diff --git a/testdata/d2oracle/TestDelete/delete-layer-style.exp.json b/testdata/d2oracle/TestDelete/delete-layer-style.exp.json index d93ae8b29..91c6bbea3 100644 --- a/testdata/d2oracle/TestDelete/delete-layer-style.exp.json +++ b/testdata/d2oracle/TestDelete/delete-layer-style.exp.json @@ -100,6 +100,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -157,6 +158,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -204,6 +206,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/delete-not-layer-obj.exp.json b/testdata/d2oracle/TestDelete/delete-not-layer-obj.exp.json index 4295b9b93..27f02a70e 100644 --- a/testdata/d2oracle/TestDelete/delete-not-layer-obj.exp.json +++ b/testdata/d2oracle/TestDelete/delete-not-layer-obj.exp.json @@ -123,6 +123,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -170,6 +171,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -226,6 +228,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -273,6 +276,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/delete_container_of_near.exp.json b/testdata/d2oracle/TestDelete/delete_container_of_near.exp.json index 4c52363d8..262230084 100644 --- a/testdata/d2oracle/TestDelete/delete_container_of_near.exp.json +++ b/testdata/d2oracle/TestDelete/delete_container_of_near.exp.json @@ -474,6 +474,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -505,6 +506,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -535,6 +537,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -565,6 +568,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -595,6 +599,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -625,6 +630,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -655,6 +661,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -685,6 +692,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -715,6 +723,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -745,6 +754,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -792,6 +802,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -837,6 +848,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -882,6 +894,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -927,6 +940,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -992,6 +1006,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1057,6 +1072,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1142,6 +1158,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1238,6 +1255,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": { "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,9:19:236-9:37:254", "path": [ @@ -1318,6 +1336,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1383,6 +1402,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1428,6 +1448,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/delete_icon.exp.json b/testdata/d2oracle/TestDelete/delete_icon.exp.json index 09b4bbab9..362ff5929 100644 --- a/testdata/d2oracle/TestDelete/delete_icon.exp.json +++ b/testdata/d2oracle/TestDelete/delete_icon.exp.json @@ -92,6 +92,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -150,6 +151,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -206,6 +208,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "link": { "value": "https://google.com" }, diff --git a/testdata/d2oracle/TestDelete/delete_link.exp.json b/testdata/d2oracle/TestDelete/delete_link.exp.json index b90432335..9bc66d899 100644 --- a/testdata/d2oracle/TestDelete/delete_link.exp.json +++ b/testdata/d2oracle/TestDelete/delete_link.exp.json @@ -42,6 +42,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -89,6 +90,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 123053d74..a07c27466 100644 --- a/testdata/d2oracle/TestDelete/delete_near.exp.json +++ b/testdata/d2oracle/TestDelete/delete_near.exp.json @@ -65,6 +65,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -112,6 +113,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -157,6 +159,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 1572242cc..b5f209c0c 100644 --- a/testdata/d2oracle/TestDelete/delete_needed_flat_near.exp.json +++ b/testdata/d2oracle/TestDelete/delete_needed_flat_near.exp.json @@ -65,6 +65,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -112,6 +113,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -157,6 +159,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 dc12090dc..59857da63 100644 --- a/testdata/d2oracle/TestDelete/delete_redundant_flat_near.exp.json +++ b/testdata/d2oracle/TestDelete/delete_redundant_flat_near.exp.json @@ -65,6 +65,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -112,6 +113,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -157,6 +159,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 374052ed6..1565eb92a 100644 --- a/testdata/d2oracle/TestDelete/delete_tooltip.exp.json +++ b/testdata/d2oracle/TestDelete/delete_tooltip.exp.json @@ -42,6 +42,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -89,6 +90,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/drop_value.exp.json b/testdata/d2oracle/TestDelete/drop_value.exp.json index ffa928761..71d6f1fd5 100644 --- a/testdata/d2oracle/TestDelete/drop_value.exp.json +++ b/testdata/d2oracle/TestDelete/drop_value.exp.json @@ -53,6 +53,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -111,6 +112,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -167,6 +169,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/drop_value_with_primary.exp.json b/testdata/d2oracle/TestDelete/drop_value_with_primary.exp.json index b77b63a71..d156bd233 100644 --- a/testdata/d2oracle/TestDelete/drop_value_with_primary.exp.json +++ b/testdata/d2oracle/TestDelete/drop_value_with_primary.exp.json @@ -42,6 +42,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -89,6 +90,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/duplicate_generated.exp.json b/testdata/d2oracle/TestDelete/duplicate_generated.exp.json index c157119f0..59976836c 100644 --- a/testdata/d2oracle/TestDelete/duplicate_generated.exp.json +++ b/testdata/d2oracle/TestDelete/duplicate_generated.exp.json @@ -157,6 +157,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -204,6 +205,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -249,6 +251,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -294,6 +297,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -339,6 +343,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -384,6 +389,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -429,6 +435,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/edge-in-layer.exp.json b/testdata/d2oracle/TestDelete/edge-in-layer.exp.json index 07a357c75..c853c2d7c 100644 --- a/testdata/d2oracle/TestDelete/edge-in-layer.exp.json +++ b/testdata/d2oracle/TestDelete/edge-in-layer.exp.json @@ -152,6 +152,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -305,6 +306,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -336,6 +338,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -383,6 +386,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -428,6 +432,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -473,6 +478,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/edge-only-style.exp.json b/testdata/d2oracle/TestDelete/edge-only-style.exp.json index baec4d804..b25dfbf8d 100644 --- a/testdata/d2oracle/TestDelete/edge-only-style.exp.json +++ b/testdata/d2oracle/TestDelete/edge-only-style.exp.json @@ -65,6 +65,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -96,6 +97,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -143,6 +145,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -188,6 +191,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/edge-out-layer.exp.json b/testdata/d2oracle/TestDelete/edge-out-layer.exp.json index f71127261..30f48510c 100644 --- a/testdata/d2oracle/TestDelete/edge-out-layer.exp.json +++ b/testdata/d2oracle/TestDelete/edge-out-layer.exp.json @@ -94,6 +94,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -125,6 +126,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -172,6 +174,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -217,6 +220,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -262,6 +266,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/edge-with-glob.exp.json b/testdata/d2oracle/TestDelete/edge-with-glob.exp.json index 1fffd7e42..955f6120f 100644 --- a/testdata/d2oracle/TestDelete/edge-with-glob.exp.json +++ b/testdata/d2oracle/TestDelete/edge-with-glob.exp.json @@ -155,6 +155,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -202,6 +203,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -247,6 +249,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 1d8b8d2ea..7320cacd9 100644 --- a/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json +++ b/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json @@ -98,6 +98,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -129,6 +130,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -229,6 +231,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -296,6 +299,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -363,6 +367,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -419,6 +424,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 5f4719f31..bab053572 100644 --- a/testdata/d2oracle/TestDelete/edge_common.exp.json +++ b/testdata/d2oracle/TestDelete/edge_common.exp.json @@ -65,6 +65,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -96,6 +97,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -143,6 +145,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -188,6 +191,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 1994e23e7..931e5f20e 100644 --- a/testdata/d2oracle/TestDelete/edge_common_2.exp.json +++ b/testdata/d2oracle/TestDelete/edge_common_2.exp.json @@ -65,6 +65,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -96,6 +97,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -143,6 +145,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -188,6 +191,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 038ad6051..23088ec1a 100644 --- a/testdata/d2oracle/TestDelete/edge_common_3.exp.json +++ b/testdata/d2oracle/TestDelete/edge_common_3.exp.json @@ -87,6 +87,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -176,6 +177,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -232,6 +234,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -288,6 +291,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 22dc9057c..178952611 100644 --- a/testdata/d2oracle/TestDelete/edge_common_4.exp.json +++ b/testdata/d2oracle/TestDelete/edge_common_4.exp.json @@ -87,6 +87,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -176,6 +177,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -232,6 +234,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -288,6 +291,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 40c43ece4..5dec79f50 100644 --- a/testdata/d2oracle/TestDelete/edge_conflict.exp.json +++ b/testdata/d2oracle/TestDelete/edge_conflict.exp.json @@ -110,6 +110,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -141,6 +142,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -230,6 +232,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -286,6 +289,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -342,6 +346,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -387,6 +392,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 13a576bb8..3fc31cd0e 100644 --- a/testdata/d2oracle/TestDelete/edge_decrement.exp.json +++ b/testdata/d2oracle/TestDelete/edge_decrement.exp.json @@ -447,6 +447,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -481,6 +482,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -514,6 +516,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -547,6 +550,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -580,6 +584,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -767,6 +772,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -952,6 +958,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 b92c2fb3a..e0324527d 100644 --- a/testdata/d2oracle/TestDelete/edge_first.exp.json +++ b/testdata/d2oracle/TestDelete/edge_first.exp.json @@ -176,6 +176,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -207,6 +208,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -237,6 +239,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -306,6 +309,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -373,6 +377,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -440,6 +445,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -485,6 +491,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -530,6 +537,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -595,6 +603,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -640,6 +649,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 9a91e3f76..7d046262d 100644 --- a/testdata/d2oracle/TestDelete/edge_flat_style.exp.json +++ b/testdata/d2oracle/TestDelete/edge_flat_style.exp.json @@ -42,6 +42,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -89,6 +90,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 8803c583a..7b98d1764 100644 --- a/testdata/d2oracle/TestDelete/edge_identical_child.exp.json +++ b/testdata/d2oracle/TestDelete/edge_identical_child.exp.json @@ -98,6 +98,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -129,6 +130,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -198,6 +200,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -265,6 +268,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -332,6 +336,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -388,6 +393,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -444,6 +450,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 92084a164..e494956aa 100644 --- a/testdata/d2oracle/TestDelete/edge_key_style.exp.json +++ b/testdata/d2oracle/TestDelete/edge_key_style.exp.json @@ -65,6 +65,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -96,6 +97,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -143,6 +145,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -188,6 +191,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 1d565e6c8..d7d9d03ff 100644 --- a/testdata/d2oracle/TestDelete/edge_last.exp.json +++ b/testdata/d2oracle/TestDelete/edge_last.exp.json @@ -213,6 +213,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -244,6 +245,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -274,6 +276,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -304,6 +307,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -373,6 +377,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -440,6 +445,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -507,6 +513,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -552,6 +559,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -617,6 +625,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -682,6 +691,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -727,6 +737,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -772,6 +783,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 4e09f2ba8..83bbbcb3e 100644 --- a/testdata/d2oracle/TestDelete/edge_map_style.exp.json +++ b/testdata/d2oracle/TestDelete/edge_map_style.exp.json @@ -65,6 +65,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -96,6 +97,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -143,6 +145,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -188,6 +191,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 28c0fcd11..150463e04 100644 --- a/testdata/d2oracle/TestDelete/edge_middle.exp.json +++ b/testdata/d2oracle/TestDelete/edge_middle.exp.json @@ -199,6 +199,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -230,6 +231,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -260,6 +262,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -290,6 +293,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -359,6 +363,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -426,6 +431,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -493,6 +499,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -538,6 +545,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -603,6 +611,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -648,6 +657,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -693,6 +703,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -738,6 +749,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 3d7092713..043fb98b4 100644 --- a/testdata/d2oracle/TestDelete/empty_map.exp.json +++ b/testdata/d2oracle/TestDelete/empty_map.exp.json @@ -71,6 +71,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -118,6 +119,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -163,6 +165,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/flat.exp.json b/testdata/d2oracle/TestDelete/flat.exp.json index bf68210d1..29ad84a68 100644 --- a/testdata/d2oracle/TestDelete/flat.exp.json +++ b/testdata/d2oracle/TestDelete/flat.exp.json @@ -18,6 +18,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" diff --git a/testdata/d2oracle/TestDelete/flat_reserved.exp.json b/testdata/d2oracle/TestDelete/flat_reserved.exp.json index 184a6220e..9192cecb8 100644 --- a/testdata/d2oracle/TestDelete/flat_reserved.exp.json +++ b/testdata/d2oracle/TestDelete/flat_reserved.exp.json @@ -65,6 +65,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -96,6 +97,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -143,6 +145,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -188,6 +191,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/glob-child/1.exp.json b/testdata/d2oracle/TestDelete/glob-child/1.exp.json index 415c0c798..179747558 100644 --- a/testdata/d2oracle/TestDelete/glob-child/1.exp.json +++ b/testdata/d2oracle/TestDelete/glob-child/1.exp.json @@ -117,6 +117,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -195,6 +196,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 2e9eb254e..a0058ddde 100644 --- a/testdata/d2oracle/TestDelete/hoist_children.exp.json +++ b/testdata/d2oracle/TestDelete/hoist_children.exp.json @@ -71,6 +71,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -118,6 +119,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -163,6 +165,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 5131fc958..c2bca9594 100644 --- a/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json +++ b/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json @@ -88,6 +88,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -119,6 +120,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -166,6 +168,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -211,6 +214,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -256,6 +260,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/import/1.exp.json b/testdata/d2oracle/TestDelete/import/1.exp.json index 00b9d4093..488f27114 100644 --- a/testdata/d2oracle/TestDelete/import/1.exp.json +++ b/testdata/d2oracle/TestDelete/import/1.exp.json @@ -89,6 +89,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -136,6 +137,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/import/2.exp.json b/testdata/d2oracle/TestDelete/import/2.exp.json index 9d135b166..207ba75f6 100644 --- a/testdata/d2oracle/TestDelete/import/2.exp.json +++ b/testdata/d2oracle/TestDelete/import/2.exp.json @@ -147,6 +147,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -194,6 +195,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -239,6 +241,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -295,6 +298,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -342,6 +346,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/import/3.exp.json b/testdata/d2oracle/TestDelete/import/3.exp.json index 90559179d..a663f6033 100644 --- a/testdata/d2oracle/TestDelete/import/3.exp.json +++ b/testdata/d2oracle/TestDelete/import/3.exp.json @@ -94,6 +94,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -141,6 +142,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -186,6 +188,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/import/4.exp.json b/testdata/d2oracle/TestDelete/import/4.exp.json index 5b7c67fb5..8036bad18 100644 --- a/testdata/d2oracle/TestDelete/import/4.exp.json +++ b/testdata/d2oracle/TestDelete/import/4.exp.json @@ -77,6 +77,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -166,6 +167,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/import/5.exp.json b/testdata/d2oracle/TestDelete/import/5.exp.json index b0315b772..dbc5b95ac 100644 --- a/testdata/d2oracle/TestDelete/import/5.exp.json +++ b/testdata/d2oracle/TestDelete/import/5.exp.json @@ -110,6 +110,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -157,6 +158,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -202,6 +204,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/import/6.exp.json b/testdata/d2oracle/TestDelete/import/6.exp.json index 24ad58cdf..e18fe2379 100644 --- a/testdata/d2oracle/TestDelete/import/6.exp.json +++ b/testdata/d2oracle/TestDelete/import/6.exp.json @@ -88,6 +88,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -199,6 +200,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/import/7.exp.json b/testdata/d2oracle/TestDelete/import/7.exp.json index aaf6a4fa1..ed04a8f05 100644 --- a/testdata/d2oracle/TestDelete/import/7.exp.json +++ b/testdata/d2oracle/TestDelete/import/7.exp.json @@ -39,6 +39,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -86,6 +87,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/import/8.exp.json b/testdata/d2oracle/TestDelete/import/8.exp.json index 9cd9e2256..5d45bc795 100644 --- a/testdata/d2oracle/TestDelete/import/8.exp.json +++ b/testdata/d2oracle/TestDelete/import/8.exp.json @@ -39,6 +39,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -70,6 +71,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -117,6 +119,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -162,6 +165,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 b627b4c4c..dc1b320b8 100644 --- a/testdata/d2oracle/TestDelete/key_with_edges.exp.json +++ b/testdata/d2oracle/TestDelete/key_with_edges.exp.json @@ -87,6 +87,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -176,6 +177,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -232,6 +234,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -288,6 +291,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 3d1f7b584..7e05620bf 100644 --- a/testdata/d2oracle/TestDelete/key_with_edges_2.exp.json +++ b/testdata/d2oracle/TestDelete/key_with_edges_2.exp.json @@ -53,6 +53,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -111,6 +112,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -167,6 +169,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 1506c5f02..ac13dc579 100644 --- a/testdata/d2oracle/TestDelete/key_with_edges_3.exp.json +++ b/testdata/d2oracle/TestDelete/key_with_edges_3.exp.json @@ -53,6 +53,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -111,6 +112,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -167,6 +169,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 605af29ab..a1be88d73 100644 --- a/testdata/d2oracle/TestDelete/key_with_edges_4.exp.json +++ b/testdata/d2oracle/TestDelete/key_with_edges_4.exp.json @@ -87,6 +87,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -176,6 +177,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -232,6 +234,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -288,6 +291,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/label-near-in-layer.exp.json b/testdata/d2oracle/TestDelete/label-near-in-layer.exp.json index b4f568a10..e05828233 100644 --- a/testdata/d2oracle/TestDelete/label-near-in-layer.exp.json +++ b/testdata/d2oracle/TestDelete/label-near-in-layer.exp.json @@ -100,6 +100,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -157,6 +158,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -204,6 +206,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/label-near/1.exp.json b/testdata/d2oracle/TestDelete/label-near/1.exp.json index 6243ba4b4..274c2cd09 100644 --- a/testdata/d2oracle/TestDelete/label-near/1.exp.json +++ b/testdata/d2oracle/TestDelete/label-near/1.exp.json @@ -42,6 +42,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -89,6 +90,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/label-near/2.exp.json b/testdata/d2oracle/TestDelete/label-near/2.exp.json index 9decfa8ed..d9dc5e4eb 100644 --- a/testdata/d2oracle/TestDelete/label-near/2.exp.json +++ b/testdata/d2oracle/TestDelete/label-near/2.exp.json @@ -42,6 +42,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -89,6 +90,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/layer-delete-complex-object.exp.json b/testdata/d2oracle/TestDelete/layer-delete-complex-object.exp.json index 008958820..72926a872 100644 --- a/testdata/d2oracle/TestDelete/layer-delete-complex-object.exp.json +++ b/testdata/d2oracle/TestDelete/layer-delete-complex-object.exp.json @@ -123,6 +123,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -170,6 +171,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -226,6 +228,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -273,6 +276,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/layers-basic.exp.json b/testdata/d2oracle/TestDelete/layers-basic.exp.json index 7a8074dfd..a32fc00c9 100644 --- a/testdata/d2oracle/TestDelete/layers-basic.exp.json +++ b/testdata/d2oracle/TestDelete/layers-basic.exp.json @@ -123,6 +123,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -170,6 +171,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -226,6 +228,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -273,6 +276,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/left.exp.json b/testdata/d2oracle/TestDelete/left.exp.json index ecb9c0394..d4ba51dab 100644 --- a/testdata/d2oracle/TestDelete/left.exp.json +++ b/testdata/d2oracle/TestDelete/left.exp.json @@ -42,6 +42,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -89,6 +90,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 f6c3e68b1..9d13be180 100644 --- a/testdata/d2oracle/TestDelete/multi_near.exp.json +++ b/testdata/d2oracle/TestDelete/multi_near.exp.json @@ -189,6 +189,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -236,6 +237,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -281,6 +283,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": { "range": "d2/testdata/d2oracle/TestDelete/multi_near.d2,2:8:24-2:11:27", "path": [ @@ -341,6 +344,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": { "range": "d2/testdata/d2oracle/TestDelete/multi_near.d2,5:8:44-5:12:48", "path": [ @@ -401,6 +405,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 88f938d40..6158294b1 100644 --- a/testdata/d2oracle/TestDelete/multi_path_map_conflict.exp.json +++ b/testdata/d2oracle/TestDelete/multi_path_map_conflict.exp.json @@ -123,6 +123,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -190,6 +191,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -235,6 +237,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -280,6 +283,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 2e67684d4..85b6550c1 100644 --- a/testdata/d2oracle/TestDelete/multi_path_map_no_conflict.exp.json +++ b/testdata/d2oracle/TestDelete/multi_path_map_no_conflict.exp.json @@ -94,6 +94,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -141,6 +142,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -186,6 +188,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -231,6 +234,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 a50fae2dd..bdc4f201a 100644 --- a/testdata/d2oracle/TestDelete/multiple_flat_middle_container.exp.json +++ b/testdata/d2oracle/TestDelete/multiple_flat_middle_container.exp.json @@ -87,6 +87,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -176,6 +177,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -232,6 +234,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -288,6 +291,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 daca2a820..a453f6782 100644 --- a/testdata/d2oracle/TestDelete/multiple_flat_style.exp.json +++ b/testdata/d2oracle/TestDelete/multiple_flat_style.exp.json @@ -70,6 +70,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -143,6 +144,7 @@ "value": "0.4" } }, + "iconStyle": {}, "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 01edf7efc..37d3de399 100644 --- a/testdata/d2oracle/TestDelete/multiple_map_styles.exp.json +++ b/testdata/d2oracle/TestDelete/multiple_map_styles.exp.json @@ -106,6 +106,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -157,6 +158,7 @@ "value": "0.4" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/near.exp.json b/testdata/d2oracle/TestDelete/near.exp.json index 0ce229964..3fefaa368 100644 --- a/testdata/d2oracle/TestDelete/near.exp.json +++ b/testdata/d2oracle/TestDelete/near.exp.json @@ -42,6 +42,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -89,6 +90,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/nested.exp.json b/testdata/d2oracle/TestDelete/nested.exp.json index 462b1f7c6..9f8a5d5e1 100644 --- a/testdata/d2oracle/TestDelete/nested.exp.json +++ b/testdata/d2oracle/TestDelete/nested.exp.json @@ -64,6 +64,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -133,6 +134,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -200,6 +202,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -267,6 +270,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 d473f7e02..479b5e676 100644 --- a/testdata/d2oracle/TestDelete/nested_2.exp.json +++ b/testdata/d2oracle/TestDelete/nested_2.exp.json @@ -64,6 +64,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -133,6 +134,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -200,6 +202,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -267,6 +270,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 084c5aba9..caa58e4bb 100644 --- a/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json +++ b/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json @@ -94,6 +94,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -125,6 +126,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -172,6 +174,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -217,6 +220,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -262,6 +266,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 6536e0ab9..bc4dc5b50 100644 --- a/testdata/d2oracle/TestDelete/nested_flat_style.exp.json +++ b/testdata/d2oracle/TestDelete/nested_flat_style.exp.json @@ -42,6 +42,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -89,6 +90,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 38b307002..4ba76f7e3 100644 --- a/testdata/d2oracle/TestDelete/nested_reserved.exp.json +++ b/testdata/d2oracle/TestDelete/nested_reserved.exp.json @@ -98,6 +98,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -198,6 +199,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -296,6 +298,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -363,6 +366,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 73b193b3f..d4cf3561f 100644 --- a/testdata/d2oracle/TestDelete/nested_underscore_update.exp.json +++ b/testdata/d2oracle/TestDelete/nested_underscore_update.exp.json @@ -82,6 +82,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -129,6 +130,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -185,6 +187,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 dc3c6c44f..68973323e 100644 --- a/testdata/d2oracle/TestDelete/node_in_edge.exp.json +++ b/testdata/d2oracle/TestDelete/node_in_edge.exp.json @@ -163,6 +163,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -194,6 +195,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -224,6 +226,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -271,6 +274,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -316,6 +320,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -361,6 +366,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -406,6 +412,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -451,6 +458,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -496,6 +504,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 117af5395..b85f87b5c 100644 --- a/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json +++ b/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json @@ -202,6 +202,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -233,6 +234,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -263,6 +265,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -293,6 +296,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -340,6 +344,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -405,6 +410,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -470,6 +476,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -515,6 +522,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -571,6 +579,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -627,6 +636,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -672,6 +682,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/only-underscore-nested.exp.json b/testdata/d2oracle/TestDelete/only-underscore-nested.exp.json index b5c7ccdae..d0a8c0dd2 100644 --- a/testdata/d2oracle/TestDelete/only-underscore-nested.exp.json +++ b/testdata/d2oracle/TestDelete/only-underscore-nested.exp.json @@ -94,6 +94,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -141,6 +142,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -186,6 +188,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -231,6 +234,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/only-underscore.exp.json b/testdata/d2oracle/TestDelete/only-underscore.exp.json index 2309c924e..09859fa6b 100644 --- a/testdata/d2oracle/TestDelete/only-underscore.exp.json +++ b/testdata/d2oracle/TestDelete/only-underscore.exp.json @@ -71,6 +71,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -118,6 +119,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -163,6 +165,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 b93c9f0c6..414d6bdc5 100644 --- a/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json +++ b/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json @@ -161,6 +161,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -192,6 +193,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -263,6 +265,7 @@ "value": "#000e3d" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -328,6 +331,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 35f4eac8b..01a550957 100644 --- a/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json +++ b/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json @@ -161,6 +161,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -196,6 +197,7 @@ "value": "#2b50c2" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -263,6 +265,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -328,6 +331,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 81c1a7f63..f9a3a474f 100644 --- a/testdata/d2oracle/TestDelete/order_1.exp.json +++ b/testdata/d2oracle/TestDelete/order_1.exp.json @@ -88,6 +88,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -119,6 +120,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -166,6 +168,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -211,6 +214,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -256,6 +260,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 fb792b501..1c5e29b72 100644 --- a/testdata/d2oracle/TestDelete/order_2.exp.json +++ b/testdata/d2oracle/TestDelete/order_2.exp.json @@ -65,6 +65,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -112,6 +113,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -157,6 +159,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 3d12f9941..b7f6d4a5d 100644 --- a/testdata/d2oracle/TestDelete/order_3.exp.json +++ b/testdata/d2oracle/TestDelete/order_3.exp.json @@ -65,6 +65,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -112,6 +113,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -157,6 +159,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 b742e3635..aa2e94afc 100644 --- a/testdata/d2oracle/TestDelete/order_4.exp.json +++ b/testdata/d2oracle/TestDelete/order_4.exp.json @@ -42,6 +42,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -89,6 +90,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 340e97382..61cdfd965 100644 --- a/testdata/d2oracle/TestDelete/order_5.exp.json +++ b/testdata/d2oracle/TestDelete/order_5.exp.json @@ -140,6 +140,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -171,6 +172,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -201,6 +203,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -248,6 +251,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -293,6 +297,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -338,6 +343,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -383,6 +389,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -428,6 +435,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 010f688df..0e2998364 100644 --- a/testdata/d2oracle/TestDelete/order_6.exp.json +++ b/testdata/d2oracle/TestDelete/order_6.exp.json @@ -116,6 +116,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -205,6 +206,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -250,6 +252,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -317,6 +320,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -384,6 +388,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 d85b7b0cc..4ee812176 100644 --- a/testdata/d2oracle/TestDelete/order_7.exp.json +++ b/testdata/d2oracle/TestDelete/order_7.exp.json @@ -127,6 +127,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -227,6 +228,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -272,6 +274,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -350,6 +353,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -428,6 +432,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -506,6 +511,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 962ecad45..d28a92233 100644 --- a/testdata/d2oracle/TestDelete/order_8.exp.json +++ b/testdata/d2oracle/TestDelete/order_8.exp.json @@ -134,6 +134,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -181,6 +182,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -226,6 +228,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -271,6 +274,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -316,6 +320,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -361,6 +366,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/save_map.exp.json b/testdata/d2oracle/TestDelete/save_map.exp.json index f9a437bd2..279f40cfd 100644 --- a/testdata/d2oracle/TestDelete/save_map.exp.json +++ b/testdata/d2oracle/TestDelete/save_map.exp.json @@ -81,6 +81,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -128,6 +129,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "circle" diff --git a/testdata/d2oracle/TestDelete/save_map_with_primary.exp.json b/testdata/d2oracle/TestDelete/save_map_with_primary.exp.json index 9135e9999..bbbeae2a8 100644 --- a/testdata/d2oracle/TestDelete/save_map_with_primary.exp.json +++ b/testdata/d2oracle/TestDelete/save_map_with_primary.exp.json @@ -91,6 +91,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -138,6 +139,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "circle" diff --git a/testdata/d2oracle/TestDelete/scenarios-basic.exp.json b/testdata/d2oracle/TestDelete/scenarios-basic.exp.json index f529b7dfb..09c30487a 100644 --- a/testdata/d2oracle/TestDelete/scenarios-basic.exp.json +++ b/testdata/d2oracle/TestDelete/scenarios-basic.exp.json @@ -123,6 +123,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -170,6 +171,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -249,6 +251,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -296,6 +299,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -341,6 +345,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/scenarios-edge-inherited.exp.json b/testdata/d2oracle/TestDelete/scenarios-edge-inherited.exp.json index 02ee38f06..0bee17f8d 100644 --- a/testdata/d2oracle/TestDelete/scenarios-edge-inherited.exp.json +++ b/testdata/d2oracle/TestDelete/scenarios-edge-inherited.exp.json @@ -224,6 +224,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -255,6 +256,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -302,6 +304,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -347,6 +350,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -449,6 +453,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -496,6 +501,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -561,6 +567,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -606,6 +613,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/scenarios-inherited.exp.json b/testdata/d2oracle/TestDelete/scenarios-inherited.exp.json index 4e70a5547..03bb2f88a 100644 --- a/testdata/d2oracle/TestDelete/scenarios-inherited.exp.json +++ b/testdata/d2oracle/TestDelete/scenarios-inherited.exp.json @@ -173,6 +173,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -220,6 +221,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -299,6 +301,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -346,6 +349,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -391,6 +395,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 e5f1f7ea9..aadd6c007 100644 --- a/testdata/d2oracle/TestDelete/shape_class.exp.json +++ b/testdata/d2oracle/TestDelete/shape_class.exp.json @@ -42,6 +42,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -89,6 +90,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 279fee006..95bcc6b83 100644 --- a/testdata/d2oracle/TestDelete/shape_sql_table.exp.json +++ b/testdata/d2oracle/TestDelete/shape_sql_table.exp.json @@ -262,6 +262,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -293,6 +294,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -340,6 +342,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -470,6 +473,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "sql_table" @@ -515,6 +519,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 4468c2179..4115dc9be 100644 --- a/testdata/d2oracle/TestDelete/singular_flat_style.exp.json +++ b/testdata/d2oracle/TestDelete/singular_flat_style.exp.json @@ -42,6 +42,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -89,6 +90,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 341dfb3c4..bed7f7c8d 100644 --- a/testdata/d2oracle/TestDelete/singular_map_style.exp.json +++ b/testdata/d2oracle/TestDelete/singular_map_style.exp.json @@ -42,6 +42,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -89,6 +90,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/table_refs.exp.json b/testdata/d2oracle/TestDelete/table_refs.exp.json index 8dddf30b2..57f587270 100644 --- a/testdata/d2oracle/TestDelete/table_refs.exp.json +++ b/testdata/d2oracle/TestDelete/table_refs.exp.json @@ -138,6 +138,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -248,6 +249,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "sql_table" diff --git a/testdata/d2oracle/TestDelete/underscore_linked.exp.json b/testdata/d2oracle/TestDelete/underscore_linked.exp.json index 5ff160e38..69fcd6c0c 100644 --- a/testdata/d2oracle/TestDelete/underscore_linked.exp.json +++ b/testdata/d2oracle/TestDelete/underscore_linked.exp.json @@ -123,6 +123,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -170,6 +171,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -226,6 +228,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -273,6 +276,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 95ef38dd6..69c62e233 100644 --- a/testdata/d2oracle/TestDelete/underscore_no_conflict.exp.json +++ b/testdata/d2oracle/TestDelete/underscore_no_conflict.exp.json @@ -105,6 +105,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -152,6 +153,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -208,6 +210,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -253,6 +256,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 17f728b9d..20b8dd3df 100644 --- a/testdata/d2oracle/TestDelete/underscore_remove.exp.json +++ b/testdata/d2oracle/TestDelete/underscore_remove.exp.json @@ -134,6 +134,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -165,6 +166,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -195,6 +197,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -242,6 +245,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -287,6 +291,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -332,6 +337,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -377,6 +383,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -422,6 +429,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/update-near-in-layer.exp.json b/testdata/d2oracle/TestDelete/update-near-in-layer.exp.json index 5513e9263..5c6907533 100644 --- a/testdata/d2oracle/TestDelete/update-near-in-layer.exp.json +++ b/testdata/d2oracle/TestDelete/update-near-in-layer.exp.json @@ -100,6 +100,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -157,6 +158,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -204,6 +206,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/width.exp.json b/testdata/d2oracle/TestDelete/width.exp.json index 9b46cd396..0fd00e35e 100644 --- a/testdata/d2oracle/TestDelete/width.exp.json +++ b/testdata/d2oracle/TestDelete/width.exp.json @@ -42,6 +42,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -89,6 +90,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 f35e81c9d..133711205 100644 --- a/testdata/d2oracle/TestMove/append_multiple_styles.exp.json +++ b/testdata/d2oracle/TestMove/append_multiple_styles.exp.json @@ -226,6 +226,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -273,6 +274,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -345,6 +347,7 @@ "value": "red" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/basic.exp.json b/testdata/d2oracle/TestMove/basic.exp.json index cf783246e..223735807 100644 --- a/testdata/d2oracle/TestMove/basic.exp.json +++ b/testdata/d2oracle/TestMove/basic.exp.json @@ -42,6 +42,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -89,6 +90,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 16fc91031..a8f52609f 100644 --- a/testdata/d2oracle/TestMove/basic_nested.exp.json +++ b/testdata/d2oracle/TestMove/basic_nested.exp.json @@ -71,6 +71,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -118,6 +119,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -163,6 +165,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 fbe57ba9f..022414e56 100644 --- a/testdata/d2oracle/TestMove/basic_out_of_container.exp.json +++ b/testdata/d2oracle/TestMove/basic_out_of_container.exp.json @@ -65,6 +65,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -112,6 +113,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -157,6 +159,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 8e4ec8375..4973f5d58 100644 --- a/testdata/d2oracle/TestMove/between_containers.exp.json +++ b/testdata/d2oracle/TestMove/between_containers.exp.json @@ -94,6 +94,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -141,6 +142,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -186,6 +188,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -231,6 +234,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 587de4889..4bc4d33d3 100644 --- a/testdata/d2oracle/TestMove/chain_connected_nested.exp.json +++ b/testdata/d2oracle/TestMove/chain_connected_nested.exp.json @@ -125,6 +125,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -156,6 +157,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -186,6 +188,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -253,6 +256,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -318,6 +322,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -363,6 +368,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 d4d287d9b..0a62c56e9 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,6 +113,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -144,6 +145,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -174,6 +176,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -232,6 +235,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -288,6 +292,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -353,6 +358,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -398,6 +404,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 895608ae8..1d1af6252 100644 --- a/testdata/d2oracle/TestMove/connected_nested.exp.json +++ b/testdata/d2oracle/TestMove/connected_nested.exp.json @@ -88,6 +88,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -119,6 +120,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -166,6 +168,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -211,6 +214,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -256,6 +260,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/container_conflicts_generated.exp.json b/testdata/d2oracle/TestMove/container_conflicts_generated.exp.json index 2bb20536a..68b9333ee 100644 --- a/testdata/d2oracle/TestMove/container_conflicts_generated.exp.json +++ b/testdata/d2oracle/TestMove/container_conflicts_generated.exp.json @@ -132,6 +132,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -179,6 +180,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -224,6 +226,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -269,6 +272,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -314,6 +318,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/container_multiple_refs_with_underscore.exp.json b/testdata/d2oracle/TestMove/container_multiple_refs_with_underscore.exp.json index cab5389a5..a4c35e3ff 100644 --- a/testdata/d2oracle/TestMove/container_multiple_refs_with_underscore.exp.json +++ b/testdata/d2oracle/TestMove/container_multiple_refs_with_underscore.exp.json @@ -71,6 +71,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -118,6 +119,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -163,6 +165,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 95d0a5982..40cf691f2 100644 --- a/testdata/d2oracle/TestMove/container_near.exp.json +++ b/testdata/d2oracle/TestMove/container_near.exp.json @@ -196,6 +196,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -243,6 +244,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -288,6 +290,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": { "range": "d2/testdata/d2oracle/TestMove/container_near.d2,2:10:22-2:15:27", "path": [ @@ -381,6 +384,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -437,6 +441,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -482,6 +487,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -527,6 +533,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/duplicate.exp.json b/testdata/d2oracle/TestMove/duplicate.exp.json index 322268428..b48987e23 100644 --- a/testdata/d2oracle/TestMove/duplicate.exp.json +++ b/testdata/d2oracle/TestMove/duplicate.exp.json @@ -127,6 +127,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -194,6 +195,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -239,6 +241,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "cylinder" diff --git a/testdata/d2oracle/TestMove/duplicate_generated.exp.json b/testdata/d2oracle/TestMove/duplicate_generated.exp.json index 0b27a1251..149eaa277 100644 --- a/testdata/d2oracle/TestMove/duplicate_generated.exp.json +++ b/testdata/d2oracle/TestMove/duplicate_generated.exp.json @@ -186,6 +186,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -233,6 +234,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -278,6 +280,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -323,6 +326,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -368,6 +372,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -413,6 +418,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -458,6 +464,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -503,6 +510,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 a796860ef..0846db469 100644 --- a/testdata/d2oracle/TestMove/edge_across_containers.exp.json +++ b/testdata/d2oracle/TestMove/edge_across_containers.exp.json @@ -139,6 +139,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -170,6 +171,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -217,6 +219,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -304,6 +307,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -371,6 +375,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -416,6 +421,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 fc1f00057..7ffe333d6 100644 --- a/testdata/d2oracle/TestMove/edge_basic.exp.json +++ b/testdata/d2oracle/TestMove/edge_basic.exp.json @@ -65,6 +65,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -96,6 +97,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -143,6 +145,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -188,6 +191,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 1a72ed1fe..d5caee6fe 100644 --- a/testdata/d2oracle/TestMove/edge_chain_basic.exp.json +++ b/testdata/d2oracle/TestMove/edge_chain_basic.exp.json @@ -102,6 +102,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -133,6 +134,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -163,6 +165,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -210,6 +213,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -275,6 +279,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -320,6 +325,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 0fdadf058..6005424ee 100644 --- a/testdata/d2oracle/TestMove/edge_chain_circular.exp.json +++ b/testdata/d2oracle/TestMove/edge_chain_circular.exp.json @@ -153,6 +153,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -184,6 +185,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -214,6 +216,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -261,6 +264,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -348,6 +352,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -413,6 +418,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 c8c7aee24..c49f31398 100644 --- a/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json +++ b/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json @@ -136,6 +136,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -167,6 +168,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -197,6 +199,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -275,6 +278,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -331,6 +335,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -396,6 +401,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -441,6 +447,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 71c90c3cf..caf2e5a4d 100644 --- a/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json +++ b/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json @@ -153,6 +153,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -184,6 +185,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -214,6 +216,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -261,6 +264,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -306,6 +310,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -393,6 +398,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -438,6 +444,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 208bbc7c6..751b426ce 100644 --- a/testdata/d2oracle/TestMove/edge_conflict.exp.json +++ b/testdata/d2oracle/TestMove/edge_conflict.exp.json @@ -139,6 +139,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -170,6 +171,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -259,6 +261,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -315,6 +318,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -371,6 +375,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -416,6 +421,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -461,6 +467,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 8ea6e91c5..7008e9fcf 100644 --- a/testdata/d2oracle/TestMove/edge_into_container.exp.json +++ b/testdata/d2oracle/TestMove/edge_into_container.exp.json @@ -128,6 +128,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -159,6 +160,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -237,6 +239,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -282,6 +285,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -338,6 +342,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -383,6 +388,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 34eb8ef15..4065269df 100644 --- a/testdata/d2oracle/TestMove/edge_nested_basic.exp.json +++ b/testdata/d2oracle/TestMove/edge_nested_basic.exp.json @@ -94,6 +94,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -125,6 +126,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -172,6 +174,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -217,6 +220,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -262,6 +266,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 f5b230e67..71c01718e 100644 --- a/testdata/d2oracle/TestMove/edge_out_of_container.exp.json +++ b/testdata/d2oracle/TestMove/edge_out_of_container.exp.json @@ -105,6 +105,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -136,6 +137,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -183,6 +185,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -239,6 +242,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -284,6 +288,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 65216fcde..437ffa606 100644 --- a/testdata/d2oracle/TestMove/extend_map.exp.json +++ b/testdata/d2oracle/TestMove/extend_map.exp.json @@ -152,6 +152,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -219,6 +220,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -264,6 +266,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -309,6 +312,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -354,6 +358,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 c727e8304..f8bdef2b9 100644 --- a/testdata/d2oracle/TestMove/extend_stationary_path.exp.json +++ b/testdata/d2oracle/TestMove/extend_stationary_path.exp.json @@ -145,6 +145,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -234,6 +235,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -321,6 +323,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -408,6 +411,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 dfe4b4932..0b379c8fd 100644 --- a/testdata/d2oracle/TestMove/flat_between_containers.exp.json +++ b/testdata/d2oracle/TestMove/flat_between_containers.exp.json @@ -94,6 +94,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -141,6 +142,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -186,6 +188,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -231,6 +234,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 735394e90..584f99569 100644 --- a/testdata/d2oracle/TestMove/flat_merge.exp.json +++ b/testdata/d2oracle/TestMove/flat_merge.exp.json @@ -127,6 +127,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -174,6 +175,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -219,6 +221,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -264,6 +267,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -309,6 +313,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 249f6e625..981d0912e 100644 --- a/testdata/d2oracle/TestMove/flat_middle_container.exp.json +++ b/testdata/d2oracle/TestMove/flat_middle_container.exp.json @@ -105,6 +105,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -163,6 +164,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -219,6 +221,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -264,6 +267,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -309,6 +313,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/flat_near.exp.json b/testdata/d2oracle/TestMove/flat_near.exp.json index 88af9eb39..bdfb578ed 100644 --- a/testdata/d2oracle/TestMove/flat_near.exp.json +++ b/testdata/d2oracle/TestMove/flat_near.exp.json @@ -115,6 +115,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -173,6 +174,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": { "range": "d2/testdata/d2oracle/TestMove/flat_near.d2,0:8:8-0:11:11", "path": [ @@ -244,6 +246,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -289,6 +292,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 5e057fe71..91a9b53df 100644 --- a/testdata/d2oracle/TestMove/flat_nested_merge.exp.json +++ b/testdata/d2oracle/TestMove/flat_nested_merge.exp.json @@ -183,6 +183,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -263,6 +264,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -341,6 +343,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -419,6 +422,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -497,6 +501,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -553,6 +558,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -609,6 +615,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -676,6 +683,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -743,6 +751,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -810,6 +819,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -855,6 +865,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 a1abcb3b1..ca6f15447 100644 --- a/testdata/d2oracle/TestMove/flat_nested_merge_multiple_refs.exp.json +++ b/testdata/d2oracle/TestMove/flat_nested_merge_multiple_refs.exp.json @@ -281,6 +281,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -423,6 +424,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -574,6 +576,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -725,6 +728,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -770,6 +774,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -815,6 +820,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -860,6 +866,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -905,6 +912,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -983,6 +991,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 28401eb18..280402909 100644 --- a/testdata/d2oracle/TestMove/flat_reparent_with_map_value.exp.json +++ b/testdata/d2oracle/TestMove/flat_reparent_with_map_value.exp.json @@ -104,6 +104,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -151,6 +152,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -196,6 +198,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 5ca987152..8ad631152 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,6 +145,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -192,6 +193,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -237,6 +239,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -282,6 +285,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 936069718..ddb2a28c6 100644 --- a/testdata/d2oracle/TestMove/flat_reparent_with_value.exp.json +++ b/testdata/d2oracle/TestMove/flat_reparent_with_value.exp.json @@ -75,6 +75,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -122,6 +123,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -167,6 +169,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 ac3ee7326..29e36b1e9 100644 --- a/testdata/d2oracle/TestMove/flat_style.exp.json +++ b/testdata/d2oracle/TestMove/flat_style.exp.json @@ -154,6 +154,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -201,6 +202,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -317,6 +319,7 @@ "value": "black" } }, + "iconStyle": {}, "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 fa669a32d..c25b8d2fc 100644 --- a/testdata/d2oracle/TestMove/full_edge_slice.exp.json +++ b/testdata/d2oracle/TestMove/full_edge_slice.exp.json @@ -208,6 +208,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -239,6 +240,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -269,6 +271,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -347,6 +350,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -392,6 +396,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -488,6 +493,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -564,6 +570,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 7ac3ed662..10332641e 100644 --- a/testdata/d2oracle/TestMove/full_slice.exp.json +++ b/testdata/d2oracle/TestMove/full_slice.exp.json @@ -94,6 +94,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -141,6 +142,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -186,6 +188,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -231,6 +234,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 d4fdf0016..53f76c308 100644 --- a/testdata/d2oracle/TestMove/gnarly_1.exp.json +++ b/testdata/d2oracle/TestMove/gnarly_1.exp.json @@ -352,6 +352,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -383,6 +384,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -413,6 +415,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -443,6 +446,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -512,6 +516,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -579,6 +584,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -646,6 +652,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -753,6 +760,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -820,6 +828,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -887,6 +896,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -932,6 +942,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1039,6 +1050,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1115,6 +1127,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1171,6 +1184,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1227,6 +1241,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1283,6 +1298,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 e1175fec1..0e642f6f9 100644 --- a/testdata/d2oracle/TestMove/hoist_container_children.exp.json +++ b/testdata/d2oracle/TestMove/hoist_container_children.exp.json @@ -117,6 +117,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -164,6 +165,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -209,6 +211,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -254,6 +257,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -299,6 +303,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/include_descendants_conflict.exp.json b/testdata/d2oracle/TestMove/include_descendants_conflict.exp.json index 891d371f0..ebc857b6f 100644 --- a/testdata/d2oracle/TestMove/include_descendants_conflict.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_conflict.exp.json @@ -105,6 +105,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -152,6 +153,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -197,6 +199,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -253,6 +256,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -309,6 +313,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/include_descendants_edge_child.exp.json b/testdata/d2oracle/TestMove/include_descendants_edge_child.exp.json index ae2d5dbd4..e1df02488 100644 --- a/testdata/d2oracle/TestMove/include_descendants_edge_child.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_edge_child.exp.json @@ -123,6 +123,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -154,6 +155,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -201,6 +203,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -246,6 +249,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -291,6 +295,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -336,6 +341,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/include_descendants_edge_ref_1.exp.json b/testdata/d2oracle/TestMove/include_descendants_edge_ref_1.exp.json index e2cdeca29..edfabb095 100644 --- a/testdata/d2oracle/TestMove/include_descendants_edge_ref_1.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_edge_ref_1.exp.json @@ -161,6 +161,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -192,6 +193,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -323,6 +325,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -452,6 +455,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -519,6 +523,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -586,6 +591,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/include_descendants_edge_ref_2.exp.json b/testdata/d2oracle/TestMove/include_descendants_edge_ref_2.exp.json index 6398bdbee..56f57f5e3 100644 --- a/testdata/d2oracle/TestMove/include_descendants_edge_ref_2.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_edge_ref_2.exp.json @@ -88,6 +88,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -119,6 +120,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -166,6 +168,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -211,6 +214,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -256,6 +260,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/include_descendants_edge_ref_3.exp.json b/testdata/d2oracle/TestMove/include_descendants_edge_ref_3.exp.json index 49eeceb6a..26e165ce9 100644 --- a/testdata/d2oracle/TestMove/include_descendants_edge_ref_3.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_edge_ref_3.exp.json @@ -99,6 +99,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -130,6 +131,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -177,6 +179,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -233,6 +236,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -289,6 +293,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -334,6 +339,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/include_descendants_edge_ref_4.exp.json b/testdata/d2oracle/TestMove/include_descendants_edge_ref_4.exp.json index a0401b010..159337132 100644 --- a/testdata/d2oracle/TestMove/include_descendants_edge_ref_4.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_edge_ref_4.exp.json @@ -133,6 +133,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -164,6 +165,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -211,6 +213,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -298,6 +301,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -365,6 +369,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -432,6 +437,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -477,6 +483,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/include_descendants_edge_ref_5.exp.json b/testdata/d2oracle/TestMove/include_descendants_edge_ref_5.exp.json index 588c19dc5..91a2ab1a7 100644 --- a/testdata/d2oracle/TestMove/include_descendants_edge_ref_5.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_edge_ref_5.exp.json @@ -162,6 +162,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -193,6 +194,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -240,6 +242,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -285,6 +288,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -372,6 +376,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -439,6 +444,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -506,6 +512,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -551,6 +558,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/include_descendants_edge_ref_6.exp.json b/testdata/d2oracle/TestMove/include_descendants_edge_ref_6.exp.json index 6e965a5c1..c248f2309 100644 --- a/testdata/d2oracle/TestMove/include_descendants_edge_ref_6.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_edge_ref_6.exp.json @@ -99,6 +99,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -130,6 +131,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -177,6 +179,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -253,6 +256,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -309,6 +313,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/include_descendants_edge_ref_7.exp.json b/testdata/d2oracle/TestMove/include_descendants_edge_ref_7.exp.json index e4786e442..02d5dba38 100644 --- a/testdata/d2oracle/TestMove/include_descendants_edge_ref_7.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_edge_ref_7.exp.json @@ -121,6 +121,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -152,6 +153,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -272,6 +274,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -328,6 +331,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -384,6 +388,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -440,6 +445,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/include_descendants_edge_ref_underscore.exp.json b/testdata/d2oracle/TestMove/include_descendants_edge_ref_underscore.exp.json index b3266b6ad..3434b8c76 100644 --- a/testdata/d2oracle/TestMove/include_descendants_edge_ref_underscore.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_edge_ref_underscore.exp.json @@ -302,6 +302,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -333,6 +334,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -363,6 +365,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -600,6 +603,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -835,6 +839,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -955,6 +960,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1075,6 +1081,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1120,6 +1127,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/include_descendants_flat_1.exp.json b/testdata/d2oracle/TestMove/include_descendants_flat_1.exp.json index abfb18ae5..83786f98a 100644 --- a/testdata/d2oracle/TestMove/include_descendants_flat_1.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_flat_1.exp.json @@ -82,6 +82,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -129,6 +130,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -185,6 +187,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -241,6 +244,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/include_descendants_flat_2.exp.json b/testdata/d2oracle/TestMove/include_descendants_flat_2.exp.json index bbb9dbc8f..6745e27f4 100644 --- a/testdata/d2oracle/TestMove/include_descendants_flat_2.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_flat_2.exp.json @@ -116,6 +116,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -194,6 +195,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -250,6 +252,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -306,6 +309,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -362,6 +366,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/include_descendants_flat_3.exp.json b/testdata/d2oracle/TestMove/include_descendants_flat_3.exp.json index 53a6d1c9a..0ab3c4ae9 100644 --- a/testdata/d2oracle/TestMove/include_descendants_flat_3.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_flat_3.exp.json @@ -110,6 +110,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -188,6 +189,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -244,6 +246,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -300,6 +303,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -356,6 +360,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/include_descendants_flat_4.exp.json b/testdata/d2oracle/TestMove/include_descendants_flat_4.exp.json index 2f602a41c..5b2add389 100644 --- a/testdata/d2oracle/TestMove/include_descendants_flat_4.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_flat_4.exp.json @@ -110,6 +110,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -199,6 +200,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -255,6 +257,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -311,6 +314,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -356,6 +360,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/include_descendants_grandchild.exp.json b/testdata/d2oracle/TestMove/include_descendants_grandchild.exp.json index bc210a92d..70eae72ff 100644 --- a/testdata/d2oracle/TestMove/include_descendants_grandchild.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_grandchild.exp.json @@ -163,6 +163,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -210,6 +211,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -255,6 +257,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -331,6 +334,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -387,6 +391,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -432,6 +437,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/include_descendants_map_1.exp.json b/testdata/d2oracle/TestMove/include_descendants_map_1.exp.json index 22437cde7..566d37fb6 100644 --- a/testdata/d2oracle/TestMove/include_descendants_map_1.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_map_1.exp.json @@ -100,6 +100,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -147,6 +148,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -192,6 +194,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -237,6 +240,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/include_descendants_map_2.exp.json b/testdata/d2oracle/TestMove/include_descendants_map_2.exp.json index c87d5f62d..325482a85 100644 --- a/testdata/d2oracle/TestMove/include_descendants_map_2.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_map_2.exp.json @@ -174,6 +174,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -241,6 +242,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -286,6 +288,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -362,6 +365,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -407,6 +411,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -463,6 +468,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/include_descendants_move_out.exp.json b/testdata/d2oracle/TestMove/include_descendants_move_out.exp.json index c80f7b086..9e64a8c33 100644 --- a/testdata/d2oracle/TestMove/include_descendants_move_out.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_move_out.exp.json @@ -123,6 +123,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -170,6 +171,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -215,6 +217,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -260,6 +263,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -305,6 +309,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/include_descendants_near.exp.json b/testdata/d2oracle/TestMove/include_descendants_near.exp.json index fe66e976f..c1c30c719 100644 --- a/testdata/d2oracle/TestMove/include_descendants_near.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_near.exp.json @@ -126,6 +126,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -173,6 +174,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -229,6 +231,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -285,6 +288,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -341,6 +345,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": { "range": "d2/testdata/d2oracle/TestMove/include_descendants_near.d2,3:8:21-3:13:26", "path": [ diff --git a/testdata/d2oracle/TestMove/include_descendants_nested_1.exp.json b/testdata/d2oracle/TestMove/include_descendants_nested_1.exp.json index e3892169e..b5c716c57 100644 --- a/testdata/d2oracle/TestMove/include_descendants_nested_1.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_nested_1.exp.json @@ -94,6 +94,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -141,6 +142,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -186,6 +188,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -231,6 +234,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/include_descendants_nested_2.exp.json b/testdata/d2oracle/TestMove/include_descendants_nested_2.exp.json index ca86b08a0..08d0349e5 100644 --- a/testdata/d2oracle/TestMove/include_descendants_nested_2.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_nested_2.exp.json @@ -105,6 +105,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -183,6 +184,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -239,6 +241,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -284,6 +287,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/include_descendants_nested_reserved_2.exp.json b/testdata/d2oracle/TestMove/include_descendants_nested_reserved_2.exp.json index 16780889e..0ec8e5cbd 100644 --- a/testdata/d2oracle/TestMove/include_descendants_nested_reserved_2.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_nested_reserved_2.exp.json @@ -97,6 +97,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -155,6 +156,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -211,6 +213,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -267,6 +270,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "circle" diff --git a/testdata/d2oracle/TestMove/include_descendants_nested_reserved_3.exp.json b/testdata/d2oracle/TestMove/include_descendants_nested_reserved_3.exp.json index 354853776..8a0dca281 100644 --- a/testdata/d2oracle/TestMove/include_descendants_nested_reserved_3.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_nested_reserved_3.exp.json @@ -97,6 +97,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -144,6 +145,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -211,6 +213,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -278,6 +281,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "circle" diff --git a/testdata/d2oracle/TestMove/include_descendants_non_conflict.exp.json b/testdata/d2oracle/TestMove/include_descendants_non_conflict.exp.json index ea03a4bf6..9bff95083 100644 --- a/testdata/d2oracle/TestMove/include_descendants_non_conflict.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_non_conflict.exp.json @@ -128,6 +128,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -175,6 +176,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -220,6 +222,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -276,6 +279,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -332,6 +336,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -377,6 +382,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/include_descendants_sql.exp.json b/testdata/d2oracle/TestMove/include_descendants_sql.exp.json index 990495062..f71724ccd 100644 --- a/testdata/d2oracle/TestMove/include_descendants_sql.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_sql.exp.json @@ -143,6 +143,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -190,6 +191,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -267,6 +269,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "sql_table" diff --git a/testdata/d2oracle/TestMove/include_descendants_underscore.exp.json b/testdata/d2oracle/TestMove/include_descendants_underscore.exp.json index 7c897ae05..1db70c985 100644 --- a/testdata/d2oracle/TestMove/include_descendants_underscore.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_underscore.exp.json @@ -241,6 +241,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -272,6 +273,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -302,6 +304,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -380,6 +383,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -436,6 +440,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -534,6 +539,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -632,6 +638,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -697,6 +704,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -753,6 +761,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/include_descendants_underscore_2.exp.json b/testdata/d2oracle/TestMove/include_descendants_underscore_2.exp.json index 6b24d0ce9..41cff8817 100644 --- a/testdata/d2oracle/TestMove/include_descendants_underscore_2.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_underscore_2.exp.json @@ -116,6 +116,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -205,6 +206,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -250,6 +252,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -317,6 +320,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/include_descendants_underscore_3.exp.json b/testdata/d2oracle/TestMove/include_descendants_underscore_3.exp.json index e9279e02e..49ff2400a 100644 --- a/testdata/d2oracle/TestMove/include_descendants_underscore_3.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_underscore_3.exp.json @@ -229,6 +229,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -260,6 +261,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -290,6 +292,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -463,6 +466,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -508,6 +512,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -617,6 +622,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -662,6 +668,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -729,6 +736,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/include_descendants_underscore_regression.exp.json b/testdata/d2oracle/TestMove/include_descendants_underscore_regression.exp.json index 44caff5d9..ba5d3050f 100644 --- a/testdata/d2oracle/TestMove/include_descendants_underscore_regression.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_underscore_regression.exp.json @@ -71,6 +71,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -118,6 +119,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -163,6 +165,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/include_descendants_underscore_regression_2.exp.json b/testdata/d2oracle/TestMove/include_descendants_underscore_regression_2.exp.json index 14b463daf..4c52f6ba6 100644 --- a/testdata/d2oracle/TestMove/include_descendants_underscore_regression_2.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_underscore_regression_2.exp.json @@ -82,6 +82,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -129,6 +130,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -185,6 +187,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -241,6 +244,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 2d4b8dd57..0a378b1b8 100644 --- a/testdata/d2oracle/TestMove/into_container_existing_map.exp.json +++ b/testdata/d2oracle/TestMove/into_container_existing_map.exp.json @@ -94,6 +94,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -141,6 +142,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -186,6 +188,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -231,6 +234,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 8f07eb54c..57727eb3c 100644 --- a/testdata/d2oracle/TestMove/into_container_nonexisting_map.exp.json +++ b/testdata/d2oracle/TestMove/into_container_nonexisting_map.exp.json @@ -71,6 +71,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -118,6 +119,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -163,6 +165,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 409433d81..e669af681 100644 --- a/testdata/d2oracle/TestMove/into_container_with_flat_keys.exp.json +++ b/testdata/d2oracle/TestMove/into_container_with_flat_keys.exp.json @@ -205,6 +205,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -252,6 +253,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -307,6 +309,7 @@ "value": "#FFFFFF" } }, + "iconStyle": {}, "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 1d1344607..7c87b9557 100644 --- a/testdata/d2oracle/TestMove/into_container_with_flat_style.exp.json +++ b/testdata/d2oracle/TestMove/into_container_with_flat_style.exp.json @@ -111,6 +111,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -162,6 +163,7 @@ "value": "5" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -207,6 +209,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/layers-basic.exp.json b/testdata/d2oracle/TestMove/layers-basic.exp.json index 130354a87..8f94bc02d 100644 --- a/testdata/d2oracle/TestMove/layers-basic.exp.json +++ b/testdata/d2oracle/TestMove/layers-basic.exp.json @@ -152,6 +152,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -199,6 +200,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -284,6 +286,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -331,6 +334,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -376,6 +380,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 e5eb38532..5e67fd8db 100644 --- a/testdata/d2oracle/TestMove/map_transplant.exp.json +++ b/testdata/d2oracle/TestMove/map_transplant.exp.json @@ -214,6 +214,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -261,6 +262,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -306,6 +308,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -351,6 +354,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -400,6 +404,7 @@ "value": "0.4" } }, + "iconStyle": {}, "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 fd11c8959..d8d45770f 100644 --- a/testdata/d2oracle/TestMove/map_with_label.exp.json +++ b/testdata/d2oracle/TestMove/map_with_label.exp.json @@ -104,6 +104,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -151,6 +152,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -196,6 +198,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -241,6 +244,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 7d9fbadc8..2eee34503 100644 --- a/testdata/d2oracle/TestMove/merge_nested_maps.exp.json +++ b/testdata/d2oracle/TestMove/merge_nested_maps.exp.json @@ -265,6 +265,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -312,6 +313,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -461,6 +463,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -517,6 +520,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -593,6 +597,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -660,6 +665,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -727,6 +733,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -772,6 +779,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -817,6 +825,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 26d98f1c7..10a25753d 100644 --- a/testdata/d2oracle/TestMove/merge_reserved.exp.json +++ b/testdata/d2oracle/TestMove/merge_reserved.exp.json @@ -256,6 +256,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -303,6 +304,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -441,6 +443,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -497,6 +500,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -553,6 +557,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -609,6 +614,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -654,6 +660,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 c987f6b4e..6f261e618 100644 --- a/testdata/d2oracle/TestMove/middle_container.exp.json +++ b/testdata/d2oracle/TestMove/middle_container.exp.json @@ -94,6 +94,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -141,6 +142,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -186,6 +188,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -231,6 +234,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/middle_container_generated_conflict.exp.json b/testdata/d2oracle/TestMove/middle_container_generated_conflict.exp.json index 68f5d2343..38609370c 100644 --- a/testdata/d2oracle/TestMove/middle_container_generated_conflict.exp.json +++ b/testdata/d2oracle/TestMove/middle_container_generated_conflict.exp.json @@ -288,6 +288,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -319,6 +320,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -349,6 +351,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -489,6 +492,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -565,6 +569,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -641,6 +646,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -706,6 +712,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -782,6 +789,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -827,6 +835,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 25c452213..cbd771a7d 100644 --- a/testdata/d2oracle/TestMove/move_container_children.exp.json +++ b/testdata/d2oracle/TestMove/move_container_children.exp.json @@ -140,6 +140,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -187,6 +188,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -232,6 +234,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -277,6 +280,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -322,6 +326,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -367,6 +372,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 aad213c61..4cc6eb7ca 100644 --- a/testdata/d2oracle/TestMove/move_container_conflict_children.exp.json +++ b/testdata/d2oracle/TestMove/move_container_conflict_children.exp.json @@ -140,6 +140,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -187,6 +188,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -232,6 +234,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -277,6 +280,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -322,6 +326,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -367,6 +372,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 f50f54085..e27931f74 100644 --- a/testdata/d2oracle/TestMove/move_into_key_with_value.exp.json +++ b/testdata/d2oracle/TestMove/move_into_key_with_value.exp.json @@ -81,6 +81,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -128,6 +129,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -173,6 +175,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 6805aaf32..c33b02578 100644 --- a/testdata/d2oracle/TestMove/move_out_of_edge.exp.json +++ b/testdata/d2oracle/TestMove/move_out_of_edge.exp.json @@ -121,6 +121,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -152,6 +153,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -210,6 +212,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -266,6 +269,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -333,6 +337,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -400,6 +405,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -467,6 +473,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -512,6 +519,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 c92dbe439..4ae6f0cf8 100644 --- a/testdata/d2oracle/TestMove/move_out_of_nested_edge.exp.json +++ b/testdata/d2oracle/TestMove/move_out_of_nested_edge.exp.json @@ -161,6 +161,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -192,6 +193,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -250,6 +252,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -306,6 +309,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -404,6 +408,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -502,6 +507,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -569,6 +575,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -614,6 +621,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 7d2be161a..901e74a8c 100644 --- a/testdata/d2oracle/TestMove/multiple_nesting_levels.exp.json +++ b/testdata/d2oracle/TestMove/multiple_nesting_levels.exp.json @@ -276,6 +276,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -376,6 +377,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -516,6 +518,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -676,6 +679,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -721,6 +725,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -766,6 +771,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -833,6 +839,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -911,6 +918,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/near.exp.json b/testdata/d2oracle/TestMove/near.exp.json index bb04cafce..8e6f4a409 100644 --- a/testdata/d2oracle/TestMove/near.exp.json +++ b/testdata/d2oracle/TestMove/near.exp.json @@ -133,6 +133,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -180,6 +181,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": { "range": "d2/testdata/d2oracle/TestMove/near.d2,1:8:13-1:11:16", "path": [ @@ -251,6 +253,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -296,6 +299,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/nested-underscore-move-out.exp.json b/testdata/d2oracle/TestMove/nested-underscore-move-out.exp.json index 062b7e87b..e195c2c1f 100644 --- a/testdata/d2oracle/TestMove/nested-underscore-move-out.exp.json +++ b/testdata/d2oracle/TestMove/nested-underscore-move-out.exp.json @@ -94,6 +94,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -141,6 +142,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -186,6 +188,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -231,6 +234,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/nested_reserved_2.exp.json b/testdata/d2oracle/TestMove/nested_reserved_2.exp.json index 178643bd1..bf4d9309b 100644 --- a/testdata/d2oracle/TestMove/nested_reserved_2.exp.json +++ b/testdata/d2oracle/TestMove/nested_reserved_2.exp.json @@ -97,6 +97,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -155,6 +156,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -211,6 +213,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -267,6 +270,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "circle" diff --git a/testdata/d2oracle/TestMove/nested_reserved_3.exp.json b/testdata/d2oracle/TestMove/nested_reserved_3.exp.json index 6e727d799..4d478ad9b 100644 --- a/testdata/d2oracle/TestMove/nested_reserved_3.exp.json +++ b/testdata/d2oracle/TestMove/nested_reserved_3.exp.json @@ -189,6 +189,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -278,6 +279,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -365,6 +367,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -410,6 +413,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -486,6 +490,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "circle" diff --git a/testdata/d2oracle/TestMove/nhooyr_one.exp.json b/testdata/d2oracle/TestMove/nhooyr_one.exp.json index 10b00ea68..4de9a9ac5 100644 --- a/testdata/d2oracle/TestMove/nhooyr_one.exp.json +++ b/testdata/d2oracle/TestMove/nhooyr_one.exp.json @@ -123,6 +123,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -170,6 +171,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -215,6 +217,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -260,6 +263,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -305,6 +309,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 c6d2f7e36..f856c84ca 100644 --- a/testdata/d2oracle/TestMove/nhooyr_two.exp.json +++ b/testdata/d2oracle/TestMove/nhooyr_two.exp.json @@ -169,6 +169,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -200,6 +201,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -247,6 +249,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -292,6 +295,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -337,6 +341,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -382,6 +387,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -427,6 +433,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -472,6 +479,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/out_of_newline_container.exp.json b/testdata/d2oracle/TestMove/out_of_newline_container.exp.json index 406266d42..abf736664 100644 --- a/testdata/d2oracle/TestMove/out_of_newline_container.exp.json +++ b/testdata/d2oracle/TestMove/out_of_newline_container.exp.json @@ -65,6 +65,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -112,6 +113,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -157,6 +159,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/parentheses.exp.json b/testdata/d2oracle/TestMove/parentheses.exp.json index 8550114db..0f72f2fd5 100644 --- a/testdata/d2oracle/TestMove/parentheses.exp.json +++ b/testdata/d2oracle/TestMove/parentheses.exp.json @@ -104,6 +104,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -135,6 +136,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -182,6 +184,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -258,6 +261,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -314,6 +318,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 25c508d64..ecd6c3256 100644 --- a/testdata/d2oracle/TestMove/partial_edge_slice.exp.json +++ b/testdata/d2oracle/TestMove/partial_edge_slice.exp.json @@ -111,6 +111,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -142,6 +143,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -189,6 +191,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -254,6 +257,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -299,6 +303,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 adc1a450c..125c9159a 100644 --- a/testdata/d2oracle/TestMove/partial_slice.exp.json +++ b/testdata/d2oracle/TestMove/partial_slice.exp.json @@ -65,6 +65,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -112,6 +113,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -157,6 +159,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 91bc7ec8e..e4ca0f5f7 100644 --- a/testdata/d2oracle/TestMove/rename_2.exp.json +++ b/testdata/d2oracle/TestMove/rename_2.exp.json @@ -140,6 +140,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -187,6 +188,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -232,6 +234,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -277,6 +280,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -322,6 +326,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -367,6 +372,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 a630a7c6a..31733ba14 100644 --- a/testdata/d2oracle/TestMove/reuse_map.exp.json +++ b/testdata/d2oracle/TestMove/reuse_map.exp.json @@ -157,6 +157,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -204,6 +205,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -280,6 +282,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -325,6 +328,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -370,6 +374,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -426,6 +431,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 ab093f083..4d26bcaa8 100644 --- a/testdata/d2oracle/TestMove/slice_style.exp.json +++ b/testdata/d2oracle/TestMove/slice_style.exp.json @@ -132,6 +132,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -199,6 +200,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -288,6 +290,7 @@ "Fragment": "", "RawFragment": "" }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/underscore-connection.exp.json b/testdata/d2oracle/TestMove/underscore-connection.exp.json index 364083c4e..806d83db8 100644 --- a/testdata/d2oracle/TestMove/underscore-connection.exp.json +++ b/testdata/d2oracle/TestMove/underscore-connection.exp.json @@ -213,6 +213,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -244,6 +245,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -291,6 +293,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -420,6 +423,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -507,6 +511,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -594,6 +599,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 3076328ff..e7329d76d 100644 --- a/testdata/d2oracle/TestMove/underscore_children.exp.json +++ b/testdata/d2oracle/TestMove/underscore_children.exp.json @@ -105,6 +105,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -152,6 +153,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -228,6 +230,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 060e1bb9c..7896f9a0b 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_children.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_children.exp.json @@ -128,6 +128,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -159,6 +160,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -206,6 +208,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -282,6 +285,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -327,6 +331,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 adcab65e8..534f0c55e 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json @@ -94,6 +94,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -125,6 +126,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -172,6 +174,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -217,6 +220,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -262,6 +266,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 0c8db60f3..1c6f0c357 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json @@ -105,6 +105,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -136,6 +137,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -183,6 +185,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -259,6 +262,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -315,6 +319,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 7036b433c..7b389e9bf 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json @@ -105,6 +105,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -136,6 +137,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -183,6 +185,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -239,6 +242,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -284,6 +288,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 0fc0392c9..52bc634ab 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json @@ -94,6 +94,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -125,6 +126,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -172,6 +174,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -217,6 +220,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -262,6 +266,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 50271e49f..fc9452c25 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json @@ -127,6 +127,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -158,6 +159,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -205,6 +207,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -303,6 +306,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -370,6 +374,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_6.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_6.exp.json index 906801970..d34d69388 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_6.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_6.exp.json @@ -116,6 +116,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -147,6 +148,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -194,6 +196,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -281,6 +284,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -337,6 +341,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -393,6 +398,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 7dd497bd3..af435b294 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_split.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_split.exp.json @@ -157,6 +157,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -188,6 +189,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -235,6 +237,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -280,6 +283,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -336,6 +340,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -381,6 +386,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -426,6 +432,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 914e4dc1b..2cb1f389a 100644 --- a/testdata/d2oracle/TestMove/underscore_merge.exp.json +++ b/testdata/d2oracle/TestMove/underscore_merge.exp.json @@ -137,6 +137,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -184,6 +185,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -229,6 +231,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -294,6 +297,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 a78f65a45..6cdeb6f7f 100644 --- a/testdata/d2oracle/TestMove/underscore_split.exp.json +++ b/testdata/d2oracle/TestMove/underscore_split.exp.json @@ -134,6 +134,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -181,6 +182,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -226,6 +228,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -282,6 +285,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -327,6 +331,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 f50e03ce7..e135e1e86 100644 --- a/testdata/d2oracle/TestMove/underscore_split_out.exp.json +++ b/testdata/d2oracle/TestMove/underscore_split_out.exp.json @@ -192,6 +192,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -239,6 +240,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -284,6 +286,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -360,6 +363,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -405,6 +409,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -450,6 +455,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 f0d5a7646..52c383365 100644 --- a/testdata/d2oracle/TestMove/underscore_transplant.exp.json +++ b/testdata/d2oracle/TestMove/underscore_transplant.exp.json @@ -94,6 +94,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -141,6 +142,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -186,6 +188,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -231,6 +234,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 bde09595f..d52f4255f 100644 --- a/testdata/d2oracle/TestMove/unique_name.exp.json +++ b/testdata/d2oracle/TestMove/unique_name.exp.json @@ -151,6 +151,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -229,6 +230,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -305,6 +307,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -350,6 +353,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -395,6 +399,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 d71534069..81e390133 100644 --- a/testdata/d2oracle/TestMove/unique_name_with_references.exp.json +++ b/testdata/d2oracle/TestMove/unique_name_with_references.exp.json @@ -174,6 +174,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -205,6 +206,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -283,6 +285,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -328,6 +331,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -404,6 +408,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -449,6 +454,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -494,6 +500,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestReconnectEdge/basic.exp.json b/testdata/d2oracle/TestReconnectEdge/basic.exp.json index 8d1d03e08..1c4c52746 100644 --- a/testdata/d2oracle/TestReconnectEdge/basic.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/basic.exp.json @@ -134,6 +134,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -165,6 +166,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -232,6 +234,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -277,6 +280,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -342,6 +346,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestReconnectEdge/both.exp.json b/testdata/d2oracle/TestReconnectEdge/both.exp.json index 8350d974a..4de8c3207 100644 --- a/testdata/d2oracle/TestReconnectEdge/both.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/both.exp.json @@ -134,6 +134,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -165,6 +166,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -232,6 +234,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -297,6 +300,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -342,6 +346,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestReconnectEdge/contained.exp.json b/testdata/d2oracle/TestReconnectEdge/contained.exp.json index 96fc260b0..e2f43f63a 100644 --- a/testdata/d2oracle/TestReconnectEdge/contained.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/contained.exp.json @@ -155,6 +155,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -186,6 +187,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -337,6 +339,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -393,6 +396,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -480,6 +484,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -536,6 +541,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestReconnectEdge/in_chain_3.exp.json b/testdata/d2oracle/TestReconnectEdge/in_chain_3.exp.json index bf08c88b8..d2aa47c27 100644 --- a/testdata/d2oracle/TestReconnectEdge/in_chain_3.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/in_chain_3.exp.json @@ -148,6 +148,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -179,6 +180,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -209,6 +211,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -239,6 +242,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -286,6 +290,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -371,6 +376,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -436,6 +442,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestReconnectEdge/in_chain_4.exp.json b/testdata/d2oracle/TestReconnectEdge/in_chain_4.exp.json index 4d3111d03..4c2566ee2 100644 --- a/testdata/d2oracle/TestReconnectEdge/in_chain_4.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/in_chain_4.exp.json @@ -171,6 +171,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -202,6 +203,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -232,6 +234,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -262,6 +265,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -329,6 +333,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -414,6 +419,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -479,6 +485,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestReconnectEdge/indexed_ref.exp.json b/testdata/d2oracle/TestReconnectEdge/indexed_ref.exp.json index 02ecdaa4f..863817313 100644 --- a/testdata/d2oracle/TestReconnectEdge/indexed_ref.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/indexed_ref.exp.json @@ -199,6 +199,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -237,6 +238,7 @@ "value": "red" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -304,6 +306,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -389,6 +392,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -434,6 +438,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestReconnectEdge/layers-basic.exp.json b/testdata/d2oracle/TestReconnectEdge/layers-basic.exp.json index 13cd448fa..51ede5f50 100644 --- a/testdata/d2oracle/TestReconnectEdge/layers-basic.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/layers-basic.exp.json @@ -192,6 +192,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -239,6 +240,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -385,6 +387,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -416,6 +419,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -463,6 +467,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -528,6 +533,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -573,6 +579,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestReconnectEdge/loop.exp.json b/testdata/d2oracle/TestReconnectEdge/loop.exp.json index e7470d3fd..eedacbc52 100644 --- a/testdata/d2oracle/TestReconnectEdge/loop.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/loop.exp.json @@ -88,6 +88,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -119,6 +120,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -166,6 +168,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -231,6 +234,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestReconnectEdge/middle_chain.exp.json b/testdata/d2oracle/TestReconnectEdge/middle_chain.exp.json index e43b962c7..96455be96 100644 --- a/testdata/d2oracle/TestReconnectEdge/middle_chain.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/middle_chain.exp.json @@ -134,6 +134,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -165,6 +166,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -195,6 +197,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -242,6 +245,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -287,6 +291,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -332,6 +337,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -397,6 +403,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestReconnectEdge/middle_chain_both.exp.json b/testdata/d2oracle/TestReconnectEdge/middle_chain_both.exp.json index 72a5b6d19..de79d7b1b 100644 --- a/testdata/d2oracle/TestReconnectEdge/middle_chain_both.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/middle_chain_both.exp.json @@ -180,6 +180,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -211,6 +212,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -241,6 +243,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -271,6 +274,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -318,6 +322,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -363,6 +368,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -408,6 +414,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -453,6 +460,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -538,6 +546,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestReconnectEdge/middle_chain_first.exp.json b/testdata/d2oracle/TestReconnectEdge/middle_chain_first.exp.json index 2ed26f0b5..ac62b5625 100644 --- a/testdata/d2oracle/TestReconnectEdge/middle_chain_first.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/middle_chain_first.exp.json @@ -185,6 +185,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -216,6 +217,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -246,6 +248,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -276,6 +279,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -323,6 +327,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -388,6 +393,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -453,6 +459,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -518,6 +525,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -563,6 +571,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestReconnectEdge/middle_chain_last.exp.json b/testdata/d2oracle/TestReconnectEdge/middle_chain_last.exp.json index da052e0f4..4cb6d804c 100644 --- a/testdata/d2oracle/TestReconnectEdge/middle_chain_last.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/middle_chain_last.exp.json @@ -185,6 +185,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -216,6 +217,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -246,6 +248,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -276,6 +279,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -323,6 +327,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -388,6 +393,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -453,6 +459,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -518,6 +525,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -563,6 +571,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestReconnectEdge/middle_chain_src.exp.json b/testdata/d2oracle/TestReconnectEdge/middle_chain_src.exp.json index 23eec563f..7f2cee3e0 100644 --- a/testdata/d2oracle/TestReconnectEdge/middle_chain_src.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/middle_chain_src.exp.json @@ -134,6 +134,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -165,6 +166,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -195,6 +197,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -242,6 +245,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -287,6 +291,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -352,6 +357,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -397,6 +403,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestReconnectEdge/preserve_old_obj.exp.json b/testdata/d2oracle/TestReconnectEdge/preserve_old_obj.exp.json index aef393151..f6f0c2926 100644 --- a/testdata/d2oracle/TestReconnectEdge/preserve_old_obj.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/preserve_old_obj.exp.json @@ -199,6 +199,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -237,6 +238,7 @@ "value": "red" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -304,6 +306,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -389,6 +392,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -434,6 +438,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestReconnectEdge/reverse.exp.json b/testdata/d2oracle/TestReconnectEdge/reverse.exp.json index 601d36ca8..3a630215c 100644 --- a/testdata/d2oracle/TestReconnectEdge/reverse.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/reverse.exp.json @@ -65,6 +65,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -96,6 +97,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -143,6 +145,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -188,6 +191,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestReconnectEdge/scenarios-basic.exp.json b/testdata/d2oracle/TestReconnectEdge/scenarios-basic.exp.json index c96d88434..c796560b8 100644 --- a/testdata/d2oracle/TestReconnectEdge/scenarios-basic.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/scenarios-basic.exp.json @@ -192,6 +192,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -239,6 +240,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -385,6 +387,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -416,6 +419,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -483,6 +487,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -528,6 +533,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -593,6 +599,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestReconnectEdge/scenarios-outer-scope.exp.json b/testdata/d2oracle/TestReconnectEdge/scenarios-outer-scope.exp.json index d74975744..1c6573f91 100644 --- a/testdata/d2oracle/TestReconnectEdge/scenarios-outer-scope.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/scenarios-outer-scope.exp.json @@ -169,6 +169,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -216,6 +217,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -362,6 +364,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -393,6 +396,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -460,6 +464,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -505,6 +510,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -550,6 +556,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestReconnectEdge/scope_inner.exp.json b/testdata/d2oracle/TestReconnectEdge/scope_inner.exp.json index 00644f955..122922dd4 100644 --- a/testdata/d2oracle/TestReconnectEdge/scope_inner.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/scope_inner.exp.json @@ -180,6 +180,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -211,6 +212,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -258,6 +260,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -303,6 +306,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -379,6 +383,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -455,6 +460,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -500,6 +506,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestReconnectEdge/scope_outer.exp.json b/testdata/d2oracle/TestReconnectEdge/scope_outer.exp.json index 7d974c12b..8cff25bf2 100644 --- a/testdata/d2oracle/TestReconnectEdge/scope_outer.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/scope_outer.exp.json @@ -151,6 +151,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -182,6 +183,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -229,6 +231,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -274,6 +277,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -350,6 +354,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -395,6 +400,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestReconnectEdge/second_index.exp.json b/testdata/d2oracle/TestReconnectEdge/second_index.exp.json index 5f52b761f..9543dc3e0 100644 --- a/testdata/d2oracle/TestReconnectEdge/second_index.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/second_index.exp.json @@ -234,6 +234,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -269,6 +270,7 @@ "value": "blue" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -303,6 +305,7 @@ "value": "red" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -370,6 +373,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -415,6 +419,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -480,6 +485,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestReconnectEdge/src.exp.json b/testdata/d2oracle/TestReconnectEdge/src.exp.json index 9dfbcdefe..eaaee86a2 100644 --- a/testdata/d2oracle/TestReconnectEdge/src.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/src.exp.json @@ -134,6 +134,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -165,6 +166,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -212,6 +214,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -277,6 +280,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -342,6 +346,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestRename/arrows.exp.json b/testdata/d2oracle/TestRename/arrows.exp.json index a21353e07..efe7358da 100644 --- a/testdata/d2oracle/TestRename/arrows.exp.json +++ b/testdata/d2oracle/TestRename/arrows.exp.json @@ -65,6 +65,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -96,6 +97,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -143,6 +145,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -188,6 +191,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 f3ccd7a27..d12136ef0 100644 --- a/testdata/d2oracle/TestRename/arrows_chain.exp.json +++ b/testdata/d2oracle/TestRename/arrows_chain.exp.json @@ -139,6 +139,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -170,6 +171,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -200,6 +202,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -230,6 +233,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -277,6 +281,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -342,6 +347,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -407,6 +413,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -452,6 +459,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 9d5616878..6a4761a8b 100644 --- a/testdata/d2oracle/TestRename/arrows_complex.exp.json +++ b/testdata/d2oracle/TestRename/arrows_complex.exp.json @@ -119,6 +119,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -150,6 +151,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -208,6 +210,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -264,6 +267,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -309,6 +313,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -354,6 +359,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 eb75e2e55..35ff56022 100644 --- a/testdata/d2oracle/TestRename/arrows_trim_common.exp.json +++ b/testdata/d2oracle/TestRename/arrows_trim_common.exp.json @@ -155,6 +155,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -186,6 +187,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -216,6 +218,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -246,6 +249,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -293,6 +297,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -338,6 +343,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -403,6 +409,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -468,6 +475,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -513,6 +521,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 ab086e248..c533adbb7 100644 --- a/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json +++ b/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json @@ -205,6 +205,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -236,6 +237,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -266,6 +268,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -296,6 +299,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -509,6 +513,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -565,6 +570,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -652,6 +658,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -739,6 +746,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -795,6 +803,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 3446d9da4..6c7752ee6 100644 --- a/testdata/d2oracle/TestRename/complex_edge_1.exp.json +++ b/testdata/d2oracle/TestRename/complex_edge_1.exp.json @@ -119,6 +119,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -150,6 +151,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -208,6 +210,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -264,6 +267,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -309,6 +313,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -354,6 +359,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 43ca3dd0d..c3b5ddf48 100644 --- a/testdata/d2oracle/TestRename/complex_edge_2.exp.json +++ b/testdata/d2oracle/TestRename/complex_edge_2.exp.json @@ -119,6 +119,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -150,6 +151,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -208,6 +210,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -264,6 +267,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -309,6 +313,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -354,6 +359,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestRename/conflict.exp.json b/testdata/d2oracle/TestRename/conflict.exp.json index c882e1f56..9e6a685ed 100644 --- a/testdata/d2oracle/TestRename/conflict.exp.json +++ b/testdata/d2oracle/TestRename/conflict.exp.json @@ -65,6 +65,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -112,6 +113,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -157,6 +159,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 598ec3077..9470bb343 100644 --- a/testdata/d2oracle/TestRename/conflict_2.exp.json +++ b/testdata/d2oracle/TestRename/conflict_2.exp.json @@ -116,6 +116,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -185,6 +186,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -252,6 +254,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -319,6 +322,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -364,6 +368,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -409,6 +414,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 229aff72e..8f00ca8e9 100644 --- a/testdata/d2oracle/TestRename/conflict_with_dots.exp.json +++ b/testdata/d2oracle/TestRename/conflict_with_dots.exp.json @@ -65,6 +65,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -112,6 +113,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -157,6 +159,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestRename/conflict_with_numbers.exp.json b/testdata/d2oracle/TestRename/conflict_with_numbers.exp.json index 85b87e0db..91a338397 100644 --- a/testdata/d2oracle/TestRename/conflict_with_numbers.exp.json +++ b/testdata/d2oracle/TestRename/conflict_with_numbers.exp.json @@ -65,6 +65,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -112,6 +113,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -157,6 +159,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestRename/container.exp.json b/testdata/d2oracle/TestRename/container.exp.json index 1d4593223..becd9d77a 100644 --- a/testdata/d2oracle/TestRename/container.exp.json +++ b/testdata/d2oracle/TestRename/container.exp.json @@ -744,6 +744,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -778,6 +779,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -808,6 +810,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -838,6 +841,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -868,6 +872,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -898,6 +903,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -928,6 +934,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -958,6 +965,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -1246,6 +1254,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1532,6 +1541,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1807,6 +1817,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1925,6 +1936,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -2043,6 +2055,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -2130,6 +2143,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -2217,6 +2231,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -2262,6 +2277,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -2327,6 +2343,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -2372,6 +2389,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -2417,6 +2435,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -2484,6 +2503,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -2551,6 +2571,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -2618,6 +2639,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -2674,6 +2696,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -2730,6 +2753,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestRename/edges.exp.json b/testdata/d2oracle/TestRename/edges.exp.json index 6e5ab0650..4905b686a 100644 --- a/testdata/d2oracle/TestRename/edges.exp.json +++ b/testdata/d2oracle/TestRename/edges.exp.json @@ -409,6 +409,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -440,6 +441,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -470,6 +472,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -500,6 +503,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -530,6 +534,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -560,6 +565,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -590,6 +596,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -761,6 +768,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -950,6 +958,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1037,6 +1046,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1124,6 +1134,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1211,6 +1222,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1298,6 +1310,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1343,6 +1356,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1408,6 +1422,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestRename/flat.exp.json b/testdata/d2oracle/TestRename/flat.exp.json index 028991927..57cb11c1b 100644 --- a/testdata/d2oracle/TestRename/flat.exp.json +++ b/testdata/d2oracle/TestRename/flat.exp.json @@ -42,6 +42,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -89,6 +90,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestRename/generated-conflict.exp.json b/testdata/d2oracle/TestRename/generated-conflict.exp.json index c47aae643..69781b604 100644 --- a/testdata/d2oracle/TestRename/generated-conflict.exp.json +++ b/testdata/d2oracle/TestRename/generated-conflict.exp.json @@ -65,6 +65,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -112,6 +113,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -157,6 +159,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestRename/generated.exp.json b/testdata/d2oracle/TestRename/generated.exp.json index 7d2554939..d913858f9 100644 --- a/testdata/d2oracle/TestRename/generated.exp.json +++ b/testdata/d2oracle/TestRename/generated.exp.json @@ -42,6 +42,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -89,6 +90,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestRename/layers-basic.exp.json b/testdata/d2oracle/TestRename/layers-basic.exp.json index 980088b24..b0b454d6f 100644 --- a/testdata/d2oracle/TestRename/layers-basic.exp.json +++ b/testdata/d2oracle/TestRename/layers-basic.exp.json @@ -123,6 +123,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -170,6 +171,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -226,6 +228,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -273,6 +276,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestRename/near.exp.json b/testdata/d2oracle/TestRename/near.exp.json index 7c7ddf563..c80e6bb1a 100644 --- a/testdata/d2oracle/TestRename/near.exp.json +++ b/testdata/d2oracle/TestRename/near.exp.json @@ -104,6 +104,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -151,6 +152,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": { "range": "d2/testdata/d2oracle/TestRename/near.d2,1:8:13-1:9:14", "path": [ @@ -211,6 +213,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestRename/nested.exp.json b/testdata/d2oracle/TestRename/nested.exp.json index 9c0a5f917..937e4e6fe 100644 --- a/testdata/d2oracle/TestRename/nested.exp.json +++ b/testdata/d2oracle/TestRename/nested.exp.json @@ -171,6 +171,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -315,6 +316,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -457,6 +459,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -599,6 +602,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -741,6 +745,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -850,6 +855,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestRename/scenarios-basic.exp.json b/testdata/d2oracle/TestRename/scenarios-basic.exp.json index f29bd1b7e..f32fa0fdc 100644 --- a/testdata/d2oracle/TestRename/scenarios-basic.exp.json +++ b/testdata/d2oracle/TestRename/scenarios-basic.exp.json @@ -123,6 +123,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -170,6 +171,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -249,6 +251,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -296,6 +299,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -341,6 +345,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestRename/scenarios-conflict.exp.json b/testdata/d2oracle/TestRename/scenarios-conflict.exp.json index 767e1b40c..152b77114 100644 --- a/testdata/d2oracle/TestRename/scenarios-conflict.exp.json +++ b/testdata/d2oracle/TestRename/scenarios-conflict.exp.json @@ -123,6 +123,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -170,6 +171,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -249,6 +251,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -296,6 +299,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -341,6 +345,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/base.exp.json b/testdata/d2oracle/TestSet/base.exp.json index 18dbe52f0..52c6a4415 100644 --- a/testdata/d2oracle/TestSet/base.exp.json +++ b/testdata/d2oracle/TestSet/base.exp.json @@ -42,6 +42,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -89,6 +90,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 b42981de5..21ffc5ea8 100644 --- a/testdata/d2oracle/TestSet/block_string_multiline.exp.json +++ b/testdata/d2oracle/TestSet/block_string_multiline.exp.json @@ -49,6 +49,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -96,6 +97,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 2324b55be..420b6f2b0 100644 --- a/testdata/d2oracle/TestSet/block_string_oneline.exp.json +++ b/testdata/d2oracle/TestSet/block_string_oneline.exp.json @@ -49,6 +49,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -96,6 +97,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "language": "markdown", "shape": { diff --git a/testdata/d2oracle/TestSet/class-with-label.exp.json b/testdata/d2oracle/TestSet/class-with-label.exp.json index 1cfcb550d..6680e270e 100644 --- a/testdata/d2oracle/TestSet/class-with-label.exp.json +++ b/testdata/d2oracle/TestSet/class-with-label.exp.json @@ -200,6 +200,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -304,6 +305,7 @@ "value": "0.5" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/classes-style.exp.json b/testdata/d2oracle/TestSet/classes-style.exp.json index a99073d1f..f82fb327f 100644 --- a/testdata/d2oracle/TestSet/classes-style.exp.json +++ b/testdata/d2oracle/TestSet/classes-style.exp.json @@ -220,6 +220,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -324,6 +325,7 @@ "value": "green" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/dupe-classes-style.exp.json b/testdata/d2oracle/TestSet/dupe-classes-style.exp.json index 9c74249a8..6e4ae054d 100644 --- a/testdata/d2oracle/TestSet/dupe-classes-style.exp.json +++ b/testdata/d2oracle/TestSet/dupe-classes-style.exp.json @@ -220,6 +220,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -324,6 +325,7 @@ "value": "green" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/edge-arrowhead-filled/1.exp.json b/testdata/d2oracle/TestSet/edge-arrowhead-filled/1.exp.json index 6414372f0..75474bf2c 100644 --- a/testdata/d2oracle/TestSet/edge-arrowhead-filled/1.exp.json +++ b/testdata/d2oracle/TestSet/edge-arrowhead-filled/1.exp.json @@ -121,6 +121,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -151,6 +152,7 @@ "value": "true" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -174,6 +176,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -221,6 +224,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -266,6 +270,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/edge-arrowhead-filled/2.exp.json b/testdata/d2oracle/TestSet/edge-arrowhead-filled/2.exp.json index d4f4f21cc..a92a0c94d 100644 --- a/testdata/d2oracle/TestSet/edge-arrowhead-filled/2.exp.json +++ b/testdata/d2oracle/TestSet/edge-arrowhead-filled/2.exp.json @@ -185,6 +185,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -215,6 +216,7 @@ "value": "true" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "diamond" @@ -238,6 +240,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -285,6 +288,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -330,6 +334,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/edge-arrowhead-filled/3.exp.json b/testdata/d2oracle/TestSet/edge-arrowhead-filled/3.exp.json index d6077911e..690eaa45c 100644 --- a/testdata/d2oracle/TestSet/edge-arrowhead-filled/3.exp.json +++ b/testdata/d2oracle/TestSet/edge-arrowhead-filled/3.exp.json @@ -165,6 +165,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -195,6 +196,7 @@ "value": "true" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "diamond" @@ -218,6 +220,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -265,6 +268,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -310,6 +314,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/edge-arrowhead-filled/4.exp.json b/testdata/d2oracle/TestSet/edge-arrowhead-filled/4.exp.json index cf40b23a1..44336869e 100644 --- a/testdata/d2oracle/TestSet/edge-arrowhead-filled/4.exp.json +++ b/testdata/d2oracle/TestSet/edge-arrowhead-filled/4.exp.json @@ -165,6 +165,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -195,6 +196,7 @@ "value": "false" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "diamond" @@ -218,6 +220,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -265,6 +268,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -310,6 +314,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/edge-arrowhead-filled/5.exp.json b/testdata/d2oracle/TestSet/edge-arrowhead-filled/5.exp.json index 9e5f0ae80..c783adc63 100644 --- a/testdata/d2oracle/TestSet/edge-arrowhead-filled/5.exp.json +++ b/testdata/d2oracle/TestSet/edge-arrowhead-filled/5.exp.json @@ -183,6 +183,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -213,6 +214,7 @@ "value": "true" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "diamond" @@ -236,6 +238,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -283,6 +286,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -328,6 +332,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/edge-class-with-label.exp.json b/testdata/d2oracle/TestSet/edge-class-with-label.exp.json index fde7a3b65..bfe5a0d88 100644 --- a/testdata/d2oracle/TestSet/edge-class-with-label.exp.json +++ b/testdata/d2oracle/TestSet/edge-class-with-label.exp.json @@ -230,6 +230,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -265,6 +266,7 @@ "value": "0.5" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -315,6 +317,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -360,6 +363,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/edge-comment.exp.json b/testdata/d2oracle/TestSet/edge-comment.exp.json index 4458b4bc4..ab4fdc066 100644 --- a/testdata/d2oracle/TestSet/edge-comment.exp.json +++ b/testdata/d2oracle/TestSet/edge-comment.exp.json @@ -121,6 +121,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -156,6 +157,7 @@ "value": "green" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -203,6 +205,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -248,6 +251,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/edge.exp.json b/testdata/d2oracle/TestSet/edge.exp.json index f9568af91..90ea191b2 100644 --- a/testdata/d2oracle/TestSet/edge.exp.json +++ b/testdata/d2oracle/TestSet/edge.exp.json @@ -75,6 +75,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -106,6 +107,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -153,6 +155,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -198,6 +201,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 a215df715..fd2d9d6b0 100644 --- a/testdata/d2oracle/TestSet/edge_append_style.exp.json +++ b/testdata/d2oracle/TestSet/edge_append_style.exp.json @@ -110,6 +110,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -145,6 +146,7 @@ "value": "true" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -192,6 +194,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -237,6 +240,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 e36df946d..e1206c7e3 100644 --- a/testdata/d2oracle/TestSet/edge_chain.exp.json +++ b/testdata/d2oracle/TestSet/edge_chain.exp.json @@ -202,6 +202,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -236,6 +237,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -266,6 +268,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -313,6 +316,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -378,6 +382,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -463,6 +468,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -508,6 +514,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 193d30de7..c8070996c 100644 --- a/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json +++ b/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json @@ -185,6 +185,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -223,6 +224,7 @@ "value": "true" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -253,6 +255,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -320,6 +323,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -405,6 +409,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -450,6 +455,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 e688fa412..b23e53e2b 100644 --- a/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json +++ b/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json @@ -269,6 +269,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -300,6 +301,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -343,6 +345,7 @@ "value": "true" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -390,6 +393,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -495,6 +499,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -580,6 +585,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 3bd0f42a8..bde4bbcf2 100644 --- a/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json +++ b/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json @@ -225,6 +225,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -263,6 +264,7 @@ "value": "0.4" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -293,6 +295,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -340,6 +343,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -405,6 +409,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -490,6 +495,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -535,6 +541,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.exp.json b/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.exp.json index fe8208050..dfc9ac4cc 100644 --- a/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.exp.json +++ b/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.exp.json @@ -190,6 +190,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -216,6 +217,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "circle" @@ -242,6 +244,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -272,6 +275,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -339,6 +343,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -424,6 +429,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -469,6 +475,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 d1eb8f9c3..55af4a12d 100644 --- a/testdata/d2oracle/TestSet/edge_index_case.exp.json +++ b/testdata/d2oracle/TestSet/edge_index_case.exp.json @@ -179,6 +179,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -210,6 +211,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -240,6 +242,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -287,6 +290,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -332,6 +336,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -377,6 +382,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -422,6 +428,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -467,6 +474,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -512,6 +520,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/edge_index_merge_style.exp.json b/testdata/d2oracle/TestSet/edge_index_merge_style.exp.json index c9a5de043..f26a90724 100644 --- a/testdata/d2oracle/TestSet/edge_index_merge_style.exp.json +++ b/testdata/d2oracle/TestSet/edge_index_merge_style.exp.json @@ -186,6 +186,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -224,6 +225,7 @@ "value": "0.5" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -254,6 +256,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -321,6 +324,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -406,6 +410,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -451,6 +456,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 1abf22a57..8ff757aac 100644 --- a/testdata/d2oracle/TestSet/edge_index_nested.exp.json +++ b/testdata/d2oracle/TestSet/edge_index_nested.exp.json @@ -104,6 +104,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -135,6 +136,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -182,6 +184,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -227,6 +230,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -272,6 +276,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 b2b5df2bc..07425c661 100644 --- a/testdata/d2oracle/TestSet/edge_key_and_key.exp.json +++ b/testdata/d2oracle/TestSet/edge_key_and_key.exp.json @@ -155,6 +155,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -190,6 +191,7 @@ "value": "true" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -299,6 +301,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -355,6 +358,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -411,6 +415,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 bc87c278f..3468d9d84 100644 --- a/testdata/d2oracle/TestSet/edge_label.exp.json +++ b/testdata/d2oracle/TestSet/edge_label.exp.json @@ -120,6 +120,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -155,6 +156,7 @@ "value": "true" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -202,6 +204,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -247,6 +250,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/edge_merge_arrowhead.exp.json b/testdata/d2oracle/TestSet/edge_merge_arrowhead.exp.json index e647ebf85..77a473d6e 100644 --- a/testdata/d2oracle/TestSet/edge_merge_arrowhead.exp.json +++ b/testdata/d2oracle/TestSet/edge_merge_arrowhead.exp.json @@ -162,6 +162,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -188,6 +189,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "diamond" @@ -211,6 +213,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -258,6 +261,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -303,6 +307,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 dd6f28c99..d78925d90 100644 --- a/testdata/d2oracle/TestSet/edge_merge_style.exp.json +++ b/testdata/d2oracle/TestSet/edge_merge_style.exp.json @@ -157,6 +157,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -195,6 +196,7 @@ "value": "true" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -242,6 +244,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -287,6 +290,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 64f975592..cd559926f 100644 --- a/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json +++ b/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json @@ -104,6 +104,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -135,6 +136,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -182,6 +184,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -227,6 +230,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -272,6 +276,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 cddd2cccb..ef0c5efa8 100644 --- a/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json +++ b/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json @@ -150,6 +150,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -185,6 +186,7 @@ "value": "0.4" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -232,6 +234,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -277,6 +280,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -322,6 +326,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/edge_replace_arrowhead.exp.json b/testdata/d2oracle/TestSet/edge_replace_arrowhead.exp.json index 88538296c..c9fc2da34 100644 --- a/testdata/d2oracle/TestSet/edge_replace_arrowhead.exp.json +++ b/testdata/d2oracle/TestSet/edge_replace_arrowhead.exp.json @@ -115,6 +115,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -141,6 +142,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "diamond" @@ -164,6 +166,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -211,6 +214,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -256,6 +260,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.exp.json b/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.exp.json index 7b3b4168a..76c51dfe6 100644 --- a/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.exp.json +++ b/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.exp.json @@ -153,6 +153,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -179,6 +180,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "diamond" @@ -205,6 +207,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -272,6 +275,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -337,6 +341,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/edge_set_arrowhead.exp.json b/testdata/d2oracle/TestSet/edge_set_arrowhead.exp.json index 4a3477968..9718c2ab7 100644 --- a/testdata/d2oracle/TestSet/edge_set_arrowhead.exp.json +++ b/testdata/d2oracle/TestSet/edge_set_arrowhead.exp.json @@ -115,6 +115,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -141,6 +142,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "diamond" @@ -164,6 +166,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -211,6 +214,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -256,6 +260,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 cd0111b35..b9a5e4ca8 100644 --- a/testdata/d2oracle/TestSet/expanded_map_style.exp.json +++ b/testdata/d2oracle/TestSet/expanded_map_style.exp.json @@ -106,6 +106,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -157,6 +158,7 @@ "value": "0.2" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/glob-field/1.exp.json b/testdata/d2oracle/TestSet/glob-field/1.exp.json index ef0bae2ce..05a3908e7 100644 --- a/testdata/d2oracle/TestSet/glob-field/1.exp.json +++ b/testdata/d2oracle/TestSet/glob-field/1.exp.json @@ -173,6 +173,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -224,6 +225,7 @@ "value": "blue" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -273,6 +275,7 @@ "value": "red" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/glob-field/2.exp.json b/testdata/d2oracle/TestSet/glob-field/2.exp.json index c4f0ab737..1a9612c8e 100644 --- a/testdata/d2oracle/TestSet/glob-field/2.exp.json +++ b/testdata/d2oracle/TestSet/glob-field/2.exp.json @@ -255,6 +255,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -293,6 +294,7 @@ "value": "blue" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -330,6 +332,7 @@ "value": "red" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -397,6 +400,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -462,6 +466,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/glob-field/3.exp.json b/testdata/d2oracle/TestSet/glob-field/3.exp.json index 290195f8f..15891da3b 100644 --- a/testdata/d2oracle/TestSet/glob-field/3.exp.json +++ b/testdata/d2oracle/TestSet/glob-field/3.exp.json @@ -255,6 +255,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -293,6 +294,7 @@ "value": "green" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -330,6 +332,7 @@ "value": "red" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -397,6 +400,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -462,6 +466,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/glob-with-label.exp.json b/testdata/d2oracle/TestSet/glob-with-label.exp.json index f41339c5c..d061fdcbb 100644 --- a/testdata/d2oracle/TestSet/glob-with-label.exp.json +++ b/testdata/d2oracle/TestSet/glob-with-label.exp.json @@ -135,6 +135,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -228,6 +229,7 @@ "value": "0.5" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/icon.exp.json b/testdata/d2oracle/TestSet/icon.exp.json index ab79c0a72..99e7f3522 100644 --- a/testdata/d2oracle/TestSet/icon.exp.json +++ b/testdata/d2oracle/TestSet/icon.exp.json @@ -81,6 +81,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -141,6 +142,7 @@ "Fragment": "", "RawFragment": "" }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/import/1.exp.json b/testdata/d2oracle/TestSet/import/1.exp.json index a2186cf1f..aabf1198e 100644 --- a/testdata/d2oracle/TestSet/import/1.exp.json +++ b/testdata/d2oracle/TestSet/import/1.exp.json @@ -146,6 +146,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -200,6 +201,7 @@ "value": "blue" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -245,6 +247,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/import/2.exp.json b/testdata/d2oracle/TestSet/import/2.exp.json index 929277298..f4ea8bd5d 100644 --- a/testdata/d2oracle/TestSet/import/2.exp.json +++ b/testdata/d2oracle/TestSet/import/2.exp.json @@ -146,6 +146,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -197,6 +198,7 @@ "value": "red" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -242,6 +244,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/import/3.exp.json b/testdata/d2oracle/TestSet/import/3.exp.json index feeebe288..3221ef86c 100644 --- a/testdata/d2oracle/TestSet/import/3.exp.json +++ b/testdata/d2oracle/TestSet/import/3.exp.json @@ -146,6 +146,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -197,6 +198,7 @@ "value": "yellow" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -242,6 +244,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/import/4.exp.json b/testdata/d2oracle/TestSet/import/4.exp.json index 19de4ef48..b969af5e1 100644 --- a/testdata/d2oracle/TestSet/import/4.exp.json +++ b/testdata/d2oracle/TestSet/import/4.exp.json @@ -117,6 +117,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -210,6 +211,7 @@ "value": "red" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -255,6 +257,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/import/5.exp.json b/testdata/d2oracle/TestSet/import/5.exp.json index fe34e8801..40563f34d 100644 --- a/testdata/d2oracle/TestSet/import/5.exp.json +++ b/testdata/d2oracle/TestSet/import/5.exp.json @@ -146,6 +146,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -193,6 +194,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -284,6 +286,7 @@ "value": "red" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -329,6 +332,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/import/6.exp.json b/testdata/d2oracle/TestSet/import/6.exp.json index 9b0e876c3..5ce8503b3 100644 --- a/testdata/d2oracle/TestSet/import/6.exp.json +++ b/testdata/d2oracle/TestSet/import/6.exp.json @@ -150,6 +150,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -197,6 +198,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -299,6 +301,7 @@ "value": "red" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -417,6 +420,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/import/7.exp.json b/testdata/d2oracle/TestSet/import/7.exp.json index ce85d720a..ff461a795 100644 --- a/testdata/d2oracle/TestSet/import/7.exp.json +++ b/testdata/d2oracle/TestSet/import/7.exp.json @@ -145,6 +145,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -283,6 +284,7 @@ "value": "red" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/import/8.exp.json b/testdata/d2oracle/TestSet/import/8.exp.json index 9d6e7b937..354ff6378 100644 --- a/testdata/d2oracle/TestSet/import/8.exp.json +++ b/testdata/d2oracle/TestSet/import/8.exp.json @@ -175,6 +175,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -222,6 +223,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -346,6 +348,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -439,6 +442,7 @@ "value": "red" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/import/9.exp.json b/testdata/d2oracle/TestSet/import/9.exp.json index 3c942e675..c1a4a9202 100644 --- a/testdata/d2oracle/TestSet/import/9.exp.json +++ b/testdata/d2oracle/TestSet/import/9.exp.json @@ -127,6 +127,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -165,6 +166,7 @@ "value": "red" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -232,6 +234,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -297,6 +300,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 032b0654e..f505c5593 100644 --- a/testdata/d2oracle/TestSet/inline_style.exp.json +++ b/testdata/d2oracle/TestSet/inline_style.exp.json @@ -132,6 +132,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -186,6 +187,7 @@ "value": "red" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/label-near/1.exp.json b/testdata/d2oracle/TestSet/label-near/1.exp.json index 5a4b9b691..4cd86b573 100644 --- a/testdata/d2oracle/TestSet/label-near/1.exp.json +++ b/testdata/d2oracle/TestSet/label-near/1.exp.json @@ -92,6 +92,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -139,6 +140,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/label-near/2.exp.json b/testdata/d2oracle/TestSet/label-near/2.exp.json index 2352d151b..1c92daa51 100644 --- a/testdata/d2oracle/TestSet/label-near/2.exp.json +++ b/testdata/d2oracle/TestSet/label-near/2.exp.json @@ -74,6 +74,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -143,6 +144,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/label-near/3.exp.json b/testdata/d2oracle/TestSet/label-near/3.exp.json index 1a3e49305..24e88c517 100644 --- a/testdata/d2oracle/TestSet/label-near/3.exp.json +++ b/testdata/d2oracle/TestSet/label-near/3.exp.json @@ -92,6 +92,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -139,6 +140,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/label-near/4.exp.json b/testdata/d2oracle/TestSet/label-near/4.exp.json index b259afc2c..063de6728 100644 --- a/testdata/d2oracle/TestSet/label-near/4.exp.json +++ b/testdata/d2oracle/TestSet/label-near/4.exp.json @@ -120,6 +120,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -167,6 +168,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/label-near/5.exp.json b/testdata/d2oracle/TestSet/label-near/5.exp.json index ab5708901..d63713dc3 100644 --- a/testdata/d2oracle/TestSet/label-near/5.exp.json +++ b/testdata/d2oracle/TestSet/label-near/5.exp.json @@ -120,6 +120,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -167,6 +168,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/label.exp.json b/testdata/d2oracle/TestSet/label.exp.json index b091d0d7e..397860074 100644 --- a/testdata/d2oracle/TestSet/label.exp.json +++ b/testdata/d2oracle/TestSet/label.exp.json @@ -52,6 +52,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -99,6 +100,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 612f2cff8..bee189046 100644 --- a/testdata/d2oracle/TestSet/label_primary.exp.json +++ b/testdata/d2oracle/TestSet/label_primary.exp.json @@ -100,6 +100,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -131,6 +132,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -178,6 +180,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -223,6 +226,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -268,6 +272,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 976aa222f..19322842f 100644 --- a/testdata/d2oracle/TestSet/label_replace.exp.json +++ b/testdata/d2oracle/TestSet/label_replace.exp.json @@ -52,6 +52,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -99,6 +100,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 c1cd12102..cf95c66c2 100644 --- a/testdata/d2oracle/TestSet/label_unset.exp.json +++ b/testdata/d2oracle/TestSet/label_unset.exp.json @@ -42,6 +42,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -89,6 +90,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/labeled_set_position.exp.json b/testdata/d2oracle/TestSet/labeled_set_position.exp.json index 653bfbead..b1f367682 100644 --- a/testdata/d2oracle/TestSet/labeled_set_position.exp.json +++ b/testdata/d2oracle/TestSet/labeled_set_position.exp.json @@ -103,6 +103,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -192,6 +193,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "top": { "value": "200" }, diff --git a/testdata/d2oracle/TestSet/layers-unusable-ref-style.exp.json b/testdata/d2oracle/TestSet/layers-unusable-ref-style.exp.json index 05f2486c0..97b3399f2 100644 --- a/testdata/d2oracle/TestSet/layers-unusable-ref-style.exp.json +++ b/testdata/d2oracle/TestSet/layers-unusable-ref-style.exp.json @@ -174,6 +174,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -221,6 +222,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -364,6 +366,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -411,6 +414,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -482,6 +486,7 @@ "value": "0.2" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/layers-usable-ref-style.exp.json b/testdata/d2oracle/TestSet/layers-usable-ref-style.exp.json index acae03738..d55c89dc6 100644 --- a/testdata/d2oracle/TestSet/layers-usable-ref-style.exp.json +++ b/testdata/d2oracle/TestSet/layers-usable-ref-style.exp.json @@ -169,6 +169,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -216,6 +217,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -336,6 +338,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -387,6 +390,7 @@ "value": "0.2" } }, + "iconStyle": {}, "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 e26a74490..f71507435 100644 --- a/testdata/d2oracle/TestSet/map_key_missing.exp.json +++ b/testdata/d2oracle/TestSet/map_key_missing.exp.json @@ -98,6 +98,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -129,6 +130,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -196,6 +198,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -241,6 +244,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/nested-edge-chained/1.exp.json b/testdata/d2oracle/TestSet/nested-edge-chained/1.exp.json index 892a665c1..daf3c91ed 100644 --- a/testdata/d2oracle/TestSet/nested-edge-chained/1.exp.json +++ b/testdata/d2oracle/TestSet/nested-edge-chained/1.exp.json @@ -348,6 +348,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -379,6 +380,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -416,6 +418,7 @@ "value": "green" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -640,6 +643,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -862,6 +866,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -991,6 +996,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1036,6 +1042,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/nested-edge-chained/2.exp.json b/testdata/d2oracle/TestSet/nested-edge-chained/2.exp.json index 162b3f2a5..3cd9eb892 100644 --- a/testdata/d2oracle/TestSet/nested-edge-chained/2.exp.json +++ b/testdata/d2oracle/TestSet/nested-edge-chained/2.exp.json @@ -377,6 +377,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -408,6 +409,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -445,6 +447,7 @@ "value": "green" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -492,6 +495,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -714,6 +718,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -936,6 +941,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1065,6 +1071,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1110,6 +1117,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 97bb445e0..253cb6faf 100644 --- a/testdata/d2oracle/TestSet/nested_alex.exp.json +++ b/testdata/d2oracle/TestSet/nested_alex.exp.json @@ -170,6 +170,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -201,6 +202,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -248,6 +250,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -293,6 +296,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -358,6 +362,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 4a8400833..648bb085e 100644 --- a/testdata/d2oracle/TestSet/new_style.exp.json +++ b/testdata/d2oracle/TestSet/new_style.exp.json @@ -88,6 +88,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -139,6 +140,7 @@ "value": "0.2" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/replace_arrowhead.exp.json b/testdata/d2oracle/TestSet/replace_arrowhead.exp.json index 9870e4e34..888319515 100644 --- a/testdata/d2oracle/TestSet/replace_arrowhead.exp.json +++ b/testdata/d2oracle/TestSet/replace_arrowhead.exp.json @@ -115,6 +115,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -141,6 +142,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "circle" @@ -164,6 +166,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -211,6 +214,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -256,6 +260,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/replace_arrowhead_map.exp.json b/testdata/d2oracle/TestSet/replace_arrowhead_map.exp.json index 2c26e580a..fdaa282dd 100644 --- a/testdata/d2oracle/TestSet/replace_arrowhead_map.exp.json +++ b/testdata/d2oracle/TestSet/replace_arrowhead_map.exp.json @@ -133,6 +133,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -159,6 +160,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "circle" @@ -182,6 +184,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -229,6 +232,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -274,6 +278,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/replace_dimensions.exp.json b/testdata/d2oracle/TestSet/replace_dimensions.exp.json index 892cd96b3..bbd52960e 100644 --- a/testdata/d2oracle/TestSet/replace_dimensions.exp.json +++ b/testdata/d2oracle/TestSet/replace_dimensions.exp.json @@ -77,6 +77,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -124,6 +125,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "width": { "value": "200" }, diff --git a/testdata/d2oracle/TestSet/replace_edge_style.exp.json b/testdata/d2oracle/TestSet/replace_edge_style.exp.json index 6704cc4f9..d94e11224 100644 --- a/testdata/d2oracle/TestSet/replace_edge_style.exp.json +++ b/testdata/d2oracle/TestSet/replace_edge_style.exp.json @@ -151,6 +151,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -189,6 +190,7 @@ "value": "3" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -236,6 +238,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -281,6 +284,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/replace_edge_style_map.exp.json b/testdata/d2oracle/TestSet/replace_edge_style_map.exp.json index 97d772826..1b98b999e 100644 --- a/testdata/d2oracle/TestSet/replace_edge_style_map.exp.json +++ b/testdata/d2oracle/TestSet/replace_edge_style_map.exp.json @@ -129,6 +129,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -164,6 +165,7 @@ "value": "4" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -211,6 +213,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -256,6 +259,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/replace_fill_pattern.exp.json b/testdata/d2oracle/TestSet/replace_fill_pattern.exp.json index e85fb417b..297ec7b31 100644 --- a/testdata/d2oracle/TestSet/replace_fill_pattern.exp.json +++ b/testdata/d2oracle/TestSet/replace_fill_pattern.exp.json @@ -92,6 +92,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -143,6 +144,7 @@ "value": "grain" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/replace_link.exp.json b/testdata/d2oracle/TestSet/replace_link.exp.json index e6ac31625..f8b84f64b 100644 --- a/testdata/d2oracle/TestSet/replace_link.exp.json +++ b/testdata/d2oracle/TestSet/replace_link.exp.json @@ -81,6 +81,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -128,6 +129,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "link": { "value": "https://apple.com" }, diff --git a/testdata/d2oracle/TestSet/replace_position.exp.json b/testdata/d2oracle/TestSet/replace_position.exp.json index 464357f3e..527819046 100644 --- a/testdata/d2oracle/TestSet/replace_position.exp.json +++ b/testdata/d2oracle/TestSet/replace_position.exp.json @@ -135,6 +135,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -182,6 +183,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "width": { "value": "100" }, diff --git a/testdata/d2oracle/TestSet/replace_shape.exp.json b/testdata/d2oracle/TestSet/replace_shape.exp.json index 9fa391b04..d3a119f45 100644 --- a/testdata/d2oracle/TestSet/replace_shape.exp.json +++ b/testdata/d2oracle/TestSet/replace_shape.exp.json @@ -63,6 +63,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -121,6 +122,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 47a623194..3d2afde1e 100644 --- a/testdata/d2oracle/TestSet/replace_style.exp.json +++ b/testdata/d2oracle/TestSet/replace_style.exp.json @@ -70,6 +70,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -143,6 +144,7 @@ "value": "0.2" } }, + "iconStyle": {}, "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 197c9461b..6d054f57d 100644 --- a/testdata/d2oracle/TestSet/replace_style_edgecase.exp.json +++ b/testdata/d2oracle/TestSet/replace_style_edgecase.exp.json @@ -125,6 +125,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -243,6 +244,7 @@ "value": "orange" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/replace_tooltip.exp.json b/testdata/d2oracle/TestSet/replace_tooltip.exp.json index c1490dc89..c6307c6c2 100644 --- a/testdata/d2oracle/TestSet/replace_tooltip.exp.json +++ b/testdata/d2oracle/TestSet/replace_tooltip.exp.json @@ -81,6 +81,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -128,6 +129,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "tooltip": { "value": "y" }, diff --git a/testdata/d2oracle/TestSet/scenario-child.exp.json b/testdata/d2oracle/TestSet/scenario-child.exp.json index 23857f4d8..5ac73722c 100644 --- a/testdata/d2oracle/TestSet/scenario-child.exp.json +++ b/testdata/d2oracle/TestSet/scenario-child.exp.json @@ -230,6 +230,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -261,6 +262,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -308,6 +310,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -353,6 +356,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -563,6 +567,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -601,6 +606,7 @@ "value": "3" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -668,6 +674,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -733,6 +740,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -778,6 +786,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/scenario-grandchild.exp.json b/testdata/d2oracle/TestSet/scenario-grandchild.exp.json index d1b9bf02c..64873797b 100644 --- a/testdata/d2oracle/TestSet/scenario-grandchild.exp.json +++ b/testdata/d2oracle/TestSet/scenario-grandchild.exp.json @@ -348,6 +348,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -379,6 +380,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -426,6 +428,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -471,6 +474,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -834,6 +838,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -865,6 +870,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -912,6 +918,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -957,6 +964,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1172,6 +1180,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -1216,6 +1225,7 @@ "value": "true" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -1303,6 +1313,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1388,6 +1399,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/scenarios-arrowhead.exp.json b/testdata/d2oracle/TestSet/scenarios-arrowhead.exp.json index bdc156c7f..6154cace4 100644 --- a/testdata/d2oracle/TestSet/scenarios-arrowhead.exp.json +++ b/testdata/d2oracle/TestSet/scenarios-arrowhead.exp.json @@ -366,6 +366,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -392,6 +393,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "triangle" @@ -415,6 +417,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -445,6 +448,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -492,6 +496,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -537,6 +542,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -582,6 +588,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -627,6 +634,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -998,6 +1006,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -1024,6 +1033,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "diamond" @@ -1050,6 +1060,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -1080,6 +1091,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -1110,6 +1122,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -1177,6 +1190,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1242,6 +1256,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1287,6 +1302,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1332,6 +1348,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1377,6 +1394,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1422,6 +1440,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/scenarios-edge-set.exp.json b/testdata/d2oracle/TestSet/scenarios-edge-set.exp.json index 3579ed1eb..138b327d7 100644 --- a/testdata/d2oracle/TestSet/scenarios-edge-set.exp.json +++ b/testdata/d2oracle/TestSet/scenarios-edge-set.exp.json @@ -230,6 +230,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -261,6 +262,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -308,6 +310,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -353,6 +356,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -563,6 +567,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -601,6 +606,7 @@ "value": "0.2" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -668,6 +674,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -733,6 +740,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -778,6 +786,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/scenarios-existing-edge-set.exp.json b/testdata/d2oracle/TestSet/scenarios-existing-edge-set.exp.json index ded83476d..561707163 100644 --- a/testdata/d2oracle/TestSet/scenarios-existing-edge-set.exp.json +++ b/testdata/d2oracle/TestSet/scenarios-existing-edge-set.exp.json @@ -238,6 +238,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -269,6 +270,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -316,6 +318,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -361,6 +364,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -615,6 +619,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -646,6 +651,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -680,6 +686,7 @@ "value": "0.2" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -747,6 +754,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -812,6 +820,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -857,6 +866,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/scenarios-label-primary-missing.exp.json b/testdata/d2oracle/TestSet/scenarios-label-primary-missing.exp.json index 8bcde57b5..17575be51 100644 --- a/testdata/d2oracle/TestSet/scenarios-label-primary-missing.exp.json +++ b/testdata/d2oracle/TestSet/scenarios-label-primary-missing.exp.json @@ -202,6 +202,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -253,6 +254,7 @@ "value": "0.2" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -406,6 +408,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -477,6 +480,7 @@ "value": "0.2" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -522,6 +526,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/scenarios-label-primary.exp.json b/testdata/d2oracle/TestSet/scenarios-label-primary.exp.json index 8e48af6a4..d79e4dffc 100644 --- a/testdata/d2oracle/TestSet/scenarios-label-primary.exp.json +++ b/testdata/d2oracle/TestSet/scenarios-label-primary.exp.json @@ -225,6 +225,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -276,6 +277,7 @@ "value": "0.2" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -406,6 +408,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -477,6 +480,7 @@ "value": "0.3" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/scenarios-multiple.exp.json b/testdata/d2oracle/TestSet/scenarios-multiple.exp.json index 292409196..f61a8e9be 100644 --- a/testdata/d2oracle/TestSet/scenarios-multiple.exp.json +++ b/testdata/d2oracle/TestSet/scenarios-multiple.exp.json @@ -229,6 +229,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -276,6 +277,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -452,6 +454,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -590,6 +593,7 @@ "value": "red" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -635,6 +639,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.exp.json b/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.exp.json index f0759e415..83a61214a 100644 --- a/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.exp.json +++ b/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.exp.json @@ -247,6 +247,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -294,6 +295,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -339,6 +341,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -498,6 +501,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -565,6 +569,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -634,6 +639,7 @@ "value": "0.2" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.exp.json b/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.exp.json index 6d9dbce55..7e9747aa5 100644 --- a/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.exp.json +++ b/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.exp.json @@ -174,6 +174,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -221,6 +222,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -364,6 +366,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -457,6 +460,7 @@ "value": "0.2" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -502,6 +506,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/scenarios-usable-ref-style.exp.json b/testdata/d2oracle/TestSet/scenarios-usable-ref-style.exp.json index 0199cd60a..8271c8999 100644 --- a/testdata/d2oracle/TestSet/scenarios-usable-ref-style.exp.json +++ b/testdata/d2oracle/TestSet/scenarios-usable-ref-style.exp.json @@ -189,6 +189,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -236,6 +237,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -366,6 +368,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -437,6 +440,7 @@ "value": "0.2" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/set_dimensions.exp.json b/testdata/d2oracle/TestSet/set_dimensions.exp.json index 548d0f7b7..cebfc5fc0 100644 --- a/testdata/d2oracle/TestSet/set_dimensions.exp.json +++ b/testdata/d2oracle/TestSet/set_dimensions.exp.json @@ -77,6 +77,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -124,6 +125,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "width": { "value": "200" }, diff --git a/testdata/d2oracle/TestSet/set_fill_pattern.exp.json b/testdata/d2oracle/TestSet/set_fill_pattern.exp.json index 476a81bc1..8f0abe1e8 100644 --- a/testdata/d2oracle/TestSet/set_fill_pattern.exp.json +++ b/testdata/d2oracle/TestSet/set_fill_pattern.exp.json @@ -92,6 +92,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -143,6 +144,7 @@ "value": "grain" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/set_position.exp.json b/testdata/d2oracle/TestSet/set_position.exp.json index 699f78ae8..0177d5130 100644 --- a/testdata/d2oracle/TestSet/set_position.exp.json +++ b/testdata/d2oracle/TestSet/set_position.exp.json @@ -77,6 +77,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -124,6 +125,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "top": { "value": "200" }, diff --git a/testdata/d2oracle/TestSet/set_tooltip.exp.json b/testdata/d2oracle/TestSet/set_tooltip.exp.json index a832f994d..7f62f46f4 100644 --- a/testdata/d2oracle/TestSet/set_tooltip.exp.json +++ b/testdata/d2oracle/TestSet/set_tooltip.exp.json @@ -81,6 +81,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -128,6 +129,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "tooltip": { "value": "y" }, diff --git a/testdata/d2oracle/TestSet/shape.exp.json b/testdata/d2oracle/TestSet/shape.exp.json index bd4bedb40..d9ff9b0f5 100644 --- a/testdata/d2oracle/TestSet/shape.exp.json +++ b/testdata/d2oracle/TestSet/shape.exp.json @@ -81,6 +81,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -128,6 +129,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "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 25e8aeedb..22b041728 100644 --- a/testdata/d2oracle/TestSet/shape_nested_style_set.exp.json +++ b/testdata/d2oracle/TestSet/shape_nested_style_set.exp.json @@ -88,6 +88,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -139,6 +140,7 @@ "value": "0.4" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/step-connection.exp.json b/testdata/d2oracle/TestSet/step-connection.exp.json index 81564f768..ff3902361 100644 --- a/testdata/d2oracle/TestSet/step-connection.exp.json +++ b/testdata/d2oracle/TestSet/step-connection.exp.json @@ -224,6 +224,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -480,6 +481,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -515,6 +517,7 @@ "value": "1" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -562,6 +565,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -653,6 +657,7 @@ "value": "red" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/unapplied-classes-style-2.exp.json b/testdata/d2oracle/TestSet/unapplied-classes-style-2.exp.json index fce9058ea..717072ce9 100644 --- a/testdata/d2oracle/TestSet/unapplied-classes-style-2.exp.json +++ b/testdata/d2oracle/TestSet/unapplied-classes-style-2.exp.json @@ -194,6 +194,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -245,6 +246,7 @@ "value": "green" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/unapplied-classes-style.exp.json b/testdata/d2oracle/TestSet/unapplied-classes-style.exp.json index b7ac7a166..22266b4ff 100644 --- a/testdata/d2oracle/TestSet/unapplied-classes-style.exp.json +++ b/testdata/d2oracle/TestSet/unapplied-classes-style.exp.json @@ -176,6 +176,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -249,6 +250,7 @@ "value": "green" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/var-with-label.exp.json b/testdata/d2oracle/TestSet/var-with-label.exp.json index c31d31557..b6c12b0d5 100644 --- a/testdata/d2oracle/TestSet/var-with-label.exp.json +++ b/testdata/d2oracle/TestSet/var-with-label.exp.json @@ -170,6 +170,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -221,6 +222,7 @@ "value": "0.5" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle"