diff --git a/ci/release/changelogs/next.md b/ci/release/changelogs/next.md index 5c37f0360..007940101 100644 --- a/ci/release/changelogs/next.md +++ b/ci/release/changelogs/next.md @@ -8,7 +8,21 @@ - Watch mode browser uses an error favicon to easily indicate compiler errors. Thanks @sinyo-matu ! [#1240](https://github.com/terrastruct/d2/pull/1240) - Improves grid layout performance when there are many similarly sized shapes. [#1315](https://github.com/terrastruct/d2/pull/1315) - Connections and labels now are adjusted for shapes with `3d` or `multiple`. [#1340](https://github.com/terrastruct/d2/pull/1340) +- `sql_table` now alternatively takes an array of constraints instead of being limited to a single one. Thanks @satoqz ! [#1245](https://github.com/terrastruct/d2/pull/1245) +- Constraints in `sql_table` render even if they have no matching abbreviation [#1372](https://github.com/terrastruct/d2/pull/1372) +- Constraints in `sql_table` sheds their excessive letter-spacing and is padded from the end consistently [#1372](https://github.com/terrastruct/d2/pull/1372) +- Duplicate image URLs in icons are only fetched once [#1373](https://github.com/terrastruct/d2/pull/1373) +- In watch mode, images are cached by default across compiles. Can be disabled with flag `--img-cache=0`. [#1373](https://github.com/terrastruct/d2/pull/1373) +- Common invalid array separator `,` usage in class arrays returns a helpful error message [#1376](https://github.com/terrastruct/d2/pull/1376) #### Bugfixes ⛑️ - Shadow is cut off when `--pad` is 0. Thank you @LeonardsonCC ! [#1326](https://github.com/terrastruct/d2/pull/1326) +- Fixes grid layout overwriting label placements for nested objects. [#1345](https://github.com/terrastruct/d2/pull/1345) +- Fixes fonts not rendering correctly on certain platforms. Thanks @mikeday for identifying the solution. [#1356](https://github.com/terrastruct/d2/pull/1356) +- Fixes folders not rendering in animations (`--animate-interval`) [#1357](https://github.com/terrastruct/d2/pull/1357) +- Fixes panic using reserved keywords as containers [#1358](https://github.com/terrastruct/d2/pull/1358) +- When multiple classes are applied changing different attributes of arrowheads, they are + all applied instead of only the last one [#1362](https://github.com/terrastruct/d2/pull/1362) +- Prevent empty block strings [#1364](https://github.com/terrastruct/d2/pull/1364) +- Fixes dagre mis-aligning a nested shape's connection. [#1370](https://github.com/terrastruct/d2/pull/1370) diff --git a/ci/release/template/man/d2.1 b/ci/release/template/man/d2.1 index 81bc4e895..ff8263105 100644 --- a/ci/release/template/man/d2.1 +++ b/ci/release/template/man/d2.1 @@ -109,6 +109,9 @@ An appendix for tooltips and links is added to PNG exports since they are not in .Ns . .It Fl d , -debug Print debug logs. +.It Fl -img-cache Ar true +In watch mode, images used in icons are cached for subsequent compilations. This should be disabled if images might change +.Ns . .It Fl h , -help Print usage information and exit. .It Fl v , -version diff --git a/d2cli/main.go b/d2cli/main.go index 67a9cb631..74a24c17e 100644 --- a/d2cli/main.go +++ b/d2cli/main.go @@ -67,6 +67,10 @@ func Run(ctx context.Context, ms *xmain.State) (err error) { if err != nil { return err } + imgCacheFlag, err := ms.Opts.Bool("IMG_CACHE", "img-cache", "", true, "in watch mode, images used in icons are cached for subsequent compilations. This should be disabled if images might change.") + if err != nil { + return err + } layoutFlag := ms.Opts.String("D2_LAYOUT", "layout", "l", "dagre", `the layout engine used`) themeFlag, err := ms.Opts.Int64("D2_THEME", "theme", "t", 0, "the diagram theme ID") if err != nil { @@ -150,6 +154,9 @@ func Run(ctx context.Context, ms *xmain.State) (err error) { if *debugFlag { ms.Env.Setenv("DEBUG", "1") } + if *imgCacheFlag { + ms.Env.Setenv("IMG_CACHE", "1") + } if *browserFlag != "" { ms.Env.Setenv("BROWSER", *browserFlag) } @@ -642,10 +649,9 @@ func render(ctx context.Context, ms *xmain.State, compileDur time.Duration, plug ms.Log.Success.Printf("successfully compiled %s to %s in %s", ms.HumanPath(inputPath), ms.HumanPath(boardOutputPath), dur) } boards = append([][]byte{out}, boards...) - return boards, nil } - return nil, nil + return boards, nil } func _render(ctx context.Context, ms *xmain.State, plugin d2plugin.Plugin, opts d2svg.RenderOpts, outputPath string, bundle, forceAppendix bool, page playwright.Page, ruler *textmeasure.Ruler, diagram *d2target.Diagram) ([]byte, error) { diff --git a/d2compiler/compile.go b/d2compiler/compile.go index 5467d044c..9ef9c3937 100644 --- a/d2compiler/compile.go +++ b/d2compiler/compile.go @@ -160,6 +160,21 @@ func (c *compiler) compileMap(obj *d2graph.Object, m *d2ir.Map) { classMap := m.GetClassMap(className) if classMap != nil { c.compileMap(obj, classMap) + } else { + if strings.Contains(className, ",") { + split := strings.Split(className, ",") + allFound := true + for _, maybeClassName := range split { + maybeClassName = strings.TrimSpace(maybeClassName) + if m.GetClassMap(maybeClassName) == nil { + allFound = false + break + } + } + if allFound { + c.errorf(class.LastRef().AST(), `class "%s" not found. Did you mean to use ";" to separate array items?`, className) + } + } } } } @@ -285,6 +300,9 @@ func (c *compiler) compileLabel(attrs *d2graph.Attributes, f d2ir.Node) { // TODO: Delete instead. attrs.Label.Value = scalar.ScalarString() case *d2ast.BlockString: + if strings.TrimSpace(scalar.ScalarString()) == "" { + c.errorf(f.LastPrimaryKey(), "block string cannot be empty") + } attrs.Language = scalar.Tag fullTag, ok := ShortToFullLanguageAliases[scalar.Tag] if ok { @@ -322,8 +340,27 @@ func (c *compiler) compileLabel(attrs *d2graph.Attributes, f d2ir.Node) { func (c *compiler) compileReserved(attrs *d2graph.Attributes, f *d2ir.Field) { if f.Primary() == nil { - if f.Composite != nil && !strings.EqualFold(f.Name, "class") { - c.errorf(f.LastPrimaryKey(), "reserved field %v does not accept composite", f.Name) + if f.Composite != nil { + switch f.Name { + case "class": + if arr, ok := f.Composite.(*d2ir.Array); ok { + for _, class := range arr.Values { + if scalar, ok := class.(*d2ir.Scalar); ok { + attrs.Classes = append(attrs.Classes, scalar.Value.ScalarString()) + } + } + } + case "constraint": + if arr, ok := f.Composite.(*d2ir.Array); ok { + for _, constraint := range arr.Values { + if scalar, ok := constraint.(*d2ir.Scalar); ok { + attrs.Constraint = append(attrs.Constraint, scalar.Value.ScalarString()) + } + } + } + default: + c.errorf(f.LastPrimaryKey(), "reserved field %v does not accept composite", f.Name) + } } return } @@ -424,8 +461,7 @@ func (c *compiler) compileReserved(attrs *d2graph.Attributes, f *d2ir.Field) { c.errorf(f.LastPrimaryKey(), "constraint value must be a string") return } - attrs.Constraint.Value = scalar.ScalarString() - attrs.Constraint.MapKey = f.LastPrimaryKey() + attrs.Constraint = append(attrs.Constraint, scalar.ScalarString()) case "grid-rows": v, err := strconv.Atoi(scalar.ScalarString()) if err != nil { @@ -492,17 +528,7 @@ func (c *compiler) compileReserved(attrs *d2graph.Attributes, f *d2ir.Field) { attrs.HorizontalGap.Value = scalar.ScalarString() attrs.HorizontalGap.MapKey = f.LastPrimaryKey() case "class": - if f.Primary() != nil { - attrs.Classes = append(attrs.Classes, scalar.ScalarString()) - } else if f.Composite != nil { - if arr, ok := f.Composite.(*d2ir.Array); ok { - for _, class := range arr.Values { - if scalar, ok := class.(*d2ir.Scalar); ok { - attrs.Classes = append(attrs.Classes, scalar.Value.ScalarString()) - } - } - } - } + attrs.Classes = append(attrs.Classes, scalar.ScalarString()) case "classes": } @@ -684,10 +710,14 @@ func (c *compiler) compileEdgeField(edge *d2graph.Edge, f *d2ir.Field) { func (c *compiler) compileArrowheads(edge *d2graph.Edge, f *d2ir.Field) { var attrs *d2graph.Attributes if f.Name == "source-arrowhead" { - edge.SrcArrowhead = &d2graph.Attributes{} + if edge.SrcArrowhead == nil { + edge.SrcArrowhead = &d2graph.Attributes{} + } attrs = edge.SrcArrowhead } else { - edge.DstArrowhead = &d2graph.Attributes{} + if edge.DstArrowhead == nil { + edge.DstArrowhead = &d2graph.Attributes{} + } attrs = edge.DstArrowhead } @@ -794,11 +824,9 @@ func (c *compiler) compileSQLTable(obj *d2graph.Object) { typ = "" } d2Col := d2target.SQLColumn{ - Name: d2target.Text{Label: col.IDVal}, - Type: d2target.Text{Label: typ}, - } - if col.Constraint.Value != "" { - d2Col.Constraint = col.Constraint.Value + Name: d2target.Text{Label: col.IDVal}, + Type: d2target.Text{Label: typ}, + Constraint: col.Constraint, } obj.SQLTable.Columns = append(obj.SQLTable.Columns, d2Col) } diff --git a/d2compiler/compile_test.go b/d2compiler/compile_test.go index 657d09575..1ecd7ff30 100644 --- a/d2compiler/compile_test.go +++ b/d2compiler/compile_test.go @@ -610,6 +610,24 @@ x: { expErr: `d2/testdata/d2compiler/TestCompile/md_block_string_err.d2:4:19: unexpected text after md block string. See https://d2lang.com/tour/text#advanced-block-strings. d2/testdata/d2compiler/TestCompile/md_block_string_err.d2:5:1: block string must be terminated with |`, }, + { + name: "no_empty_block_string", + text: `Text: |md |`, + expErr: `d2/testdata/d2compiler/TestCompile/no_empty_block_string.d2:1:1: block string cannot be empty`, + }, + { + name: "no_white_spaces_only_block_string", + text: `Text: |md |`, + expErr: `d2/testdata/d2compiler/TestCompile/no_white_spaces_only_block_string.d2:1:1: block string cannot be empty`, + }, + { + name: "no_new_lines_only_block_string", + text: `Text: |md + + +|`, + expErr: `d2/testdata/d2compiler/TestCompile/no_new_lines_only_block_string.d2:1:1: block string cannot be empty`, + }, { name: "underscore_edge_existing", @@ -1722,6 +1740,13 @@ y -> x.style `, expErr: `d2/testdata/d2compiler/TestCompile/edge_to_style.d2:2:8: reserved keywords are prohibited in edges`, }, + { + name: "keyword-container", + + text: `a.near.b +`, + expErr: `d2/testdata/d2compiler/TestCompile/keyword-container.d2:1:3: "near" must be the last part of the key`, + }, { name: "escaped_id", @@ -2145,13 +2170,17 @@ ok: { }, }, { - name: "sql-panic", - text: `test { - shape: sql_table - test_id: varchar(64) {constraint: [primary_key, foreign_key]} -} -`, - expErr: `d2/testdata/d2compiler/TestCompile/sql-panic.d2:3:27: reserved field constraint does not accept composite`, + name: "sql-constraints", + text: `x: { + shape: sql_table + a: int {constraint: primary_key} + b: int {constraint: [primary_key; foreign_key]} +}`, + assertions: func(t *testing.T, g *d2graph.Graph) { + table := g.Objects[0].SQLTable + tassert.Equal(t, []string{"primary_key"}, table.Columns[0].Constraint) + tassert.Equal(t, []string{"primary_key", "foreign_key"}, table.Columns[1].Constraint) + }, }, { name: "wrong_column_index", @@ -2453,6 +2482,23 @@ nostar -> 1star: { class: [path; path2] } tassert.Equal(t, "2", g.Edges[0].Style.StrokeWidth.Value) }, }, + { + name: "comma-array-class", + + text: `classes: { + dragon_ball: { + label: "" + shape: circle + style.fill: orange + } + path: { + label: "then" + style.stroke-width: 4 + } +} +nostar: { class: [dragon_ball, path] }`, + expErr: `d2/testdata/d2compiler/TestCompile/comma-array-class.d2:12:11: class "dragon_ball, path" not found. Did you mean to use ";" to separate array items?`, + }, { name: "reordered-classes", text: `classes: { @@ -2468,6 +2514,29 @@ classes.x.shape: diamond tassert.Equal(t, "diamond", g.Objects[0].Shape.Value) }, }, + { + name: "nested-array-classes", + text: `classes: { + one target: { + target-arrowhead.label: 1 + } + association: { + target-arrowhead.shape: arrow + } +} + +a -> b: { class: [one target; association] } +a -> b: { class: [association; one target] } +`, + assertions: func(t *testing.T, g *d2graph.Graph) { + // They have the same, regardless of order of class application + // since the classes modify attributes exclusive of each other + tassert.Equal(t, "1", g.Edges[0].DstArrowhead.Label.Value) + tassert.Equal(t, "1", g.Edges[1].DstArrowhead.Label.Value) + tassert.Equal(t, "arrow", g.Edges[0].DstArrowhead.Shape.Value) + tassert.Equal(t, "arrow", g.Edges[1].DstArrowhead.Shape.Value) + }, + }, { name: "class-shape-class", text: `classes: { diff --git a/d2graph/d2graph.go b/d2graph/d2graph.go index 006bfae85..54862f292 100644 --- a/d2graph/d2graph.go +++ b/d2graph/d2graph.go @@ -132,8 +132,8 @@ type Attributes struct { // TODO: default to ShapeRectangle instead of empty string Shape Scalar `json:"shape"` - Direction Scalar `json:"direction"` - Constraint Scalar `json:"constraint"` + Direction Scalar `json:"direction"` + Constraint []string `json:"constraint"` GridRows *Scalar `json:"gridRows,omitempty"` GridColumns *Scalar `json:"gridColumns,omitempty"` @@ -1005,7 +1005,7 @@ func (obj *Object) GetDefaultSize(mtexts []*d2target.MText, ruler *textmeasure.R case d2target.ShapeSQLTable: maxNameWidth := 0 maxTypeWidth := 0 - constraintWidth := 0 + maxConstraintWidth := 0 colFontSize := d2fonts.FONT_SIZE_L if obj.Style.FontSize != nil { @@ -1032,21 +1032,24 @@ func (obj *Object) GetDefaultSize(mtexts []*d2target.MText, ruler *textmeasure.R } c.Type.LabelWidth = typeDims.Width c.Type.LabelHeight = typeDims.Height - if maxTypeWidth < typeDims.Width { - maxTypeWidth = typeDims.Width - } maxTypeWidth = go2.Max(maxTypeWidth, typeDims.Width) - if c.Constraint != "" { - // covers UNQ constraint with padding - constraintWidth = 60 + if l := len(c.Constraint); l > 0 { + constraintDims := GetTextDimensions(mtexts, ruler, ctexts[2], fontFamily) + if constraintDims == nil { + return nil, fmt.Errorf("dimensions for sql_table constraint %#v not found", ctexts[2].Text) + } + maxConstraintWidth = go2.Max(maxConstraintWidth, constraintDims.Width) } } // The rows get padded a little due to header font being larger than row font dims.Height = go2.Max(12, labelDims.Height*(len(obj.SQLTable.Columns)+1)) headerWidth := d2target.HeaderPadding + labelDims.Width + d2target.HeaderPadding - rowsWidth := d2target.NamePadding + maxNameWidth + d2target.TypePadding + maxTypeWidth + d2target.TypePadding + constraintWidth + rowsWidth := d2target.NamePadding + maxNameWidth + d2target.TypePadding + maxTypeWidth + d2target.TypePadding + maxConstraintWidth + if maxConstraintWidth != 0 { + rowsWidth += d2target.ConstraintPadding + } dims.Width = go2.Max(12, go2.Max(headerWidth, rowsWidth)) } @@ -1618,9 +1621,6 @@ func Key(k *d2ast.KeyPath) []string { // All reserved keywords. See init below. var ReservedKeywords map[string]struct{} -// All reserved keywords not including style keywords. -var ReservedKeywords2 map[string]struct{} - // Non Style/Holder keywords. var SimpleReservedKeywords = map[string]struct{}{ "label": {}, @@ -1642,16 +1642,20 @@ var SimpleReservedKeywords = map[string]struct{}{ "vertical-gap": {}, "horizontal-gap": {}, "class": {}, - "classes": {}, } -// ReservedKeywordHolders are reserved keywords that are meaningless on its own and exist solely to hold a set of reserved keywords +// ReservedKeywordHolders are reserved keywords that are meaningless on its own and must hold composites var ReservedKeywordHolders = map[string]struct{}{ "style": {}, "source-arrowhead": {}, "target-arrowhead": {}, } +// CompositeReservedKeywords are reserved keywords that can hold composites +var CompositeReservedKeywords = map[string]struct{}{ + "classes": {}, +} + // StyleKeywords are reserved keywords which cannot exist outside of the "style" keyword var StyleKeywords = map[string]struct{}{ "opacity": {}, @@ -1725,23 +1729,15 @@ func init() { ReservedKeywords[k] = v } for k, v := range ReservedKeywordHolders { - ReservedKeywords[k] = v + CompositeReservedKeywords[k] = v } for k, v := range BoardKeywords { + CompositeReservedKeywords[k] = v + } + for k, v := range CompositeReservedKeywords { ReservedKeywords[k] = v } - ReservedKeywords2 = make(map[string]struct{}) - for k, v := range SimpleReservedKeywords { - ReservedKeywords2[k] = v - } - for k, v := range ReservedKeywordHolders { - ReservedKeywords2[k] = v - } - for k, v := range BoardKeywords { - ReservedKeywords2[k] = v - } - NearConstants = make(map[string]struct{}, len(NearConstantsArray)) for _, k := range NearConstantsArray { NearConstants[k] = struct{}{} @@ -1817,90 +1813,6 @@ func (g *Graph) ApplyTheme(themeID int64) error { return nil } -func (obj *Object) MoveWithDescendants(dx, dy float64) { - obj.TopLeft.X += dx - obj.TopLeft.Y += dy - for _, child := range obj.ChildrenArray { - child.MoveWithDescendants(dx, dy) - } -} - -func (obj *Object) MoveWithDescendantsTo(x, y float64) { - dx := x - obj.TopLeft.X - dy := y - obj.TopLeft.Y - obj.MoveWithDescendants(dx, dy) -} - -func (parent *Object) removeChild(child *Object) { - delete(parent.Children, strings.ToLower(child.ID)) - for i := 0; i < len(parent.ChildrenArray); i++ { - if parent.ChildrenArray[i] == child { - parent.ChildrenArray = append(parent.ChildrenArray[:i], parent.ChildrenArray[i+1:]...) - break - } - } -} - -// remove obj and all descendants from graph, as a new Graph -func (g *Graph) ExtractAsNestedGraph(obj *Object) *Graph { - descendantObjects, edges := pluckObjAndEdges(g, obj) - - tempGraph := NewGraph() - tempGraph.Root.ChildrenArray = []*Object{obj} - tempGraph.Root.Children[strings.ToLower(obj.ID)] = obj - - for _, descendantObj := range descendantObjects { - descendantObj.Graph = tempGraph - } - tempGraph.Objects = descendantObjects - tempGraph.Edges = edges - - obj.Parent.removeChild(obj) - obj.Parent = tempGraph.Root - - return tempGraph -} - -func pluckObjAndEdges(g *Graph, obj *Object) (descendantsObjects []*Object, edges []*Edge) { - for i := 0; i < len(g.Edges); i++ { - edge := g.Edges[i] - if edge.Src == obj || edge.Dst == obj { - edges = append(edges, edge) - g.Edges = append(g.Edges[:i], g.Edges[i+1:]...) - i-- - } - } - - for i := 0; i < len(g.Objects); i++ { - temp := g.Objects[i] - if temp.AbsID() == obj.AbsID() { - descendantsObjects = append(descendantsObjects, obj) - g.Objects = append(g.Objects[:i], g.Objects[i+1:]...) - for _, child := range obj.ChildrenArray { - subObjects, subEdges := pluckObjAndEdges(g, child) - descendantsObjects = append(descendantsObjects, subObjects...) - edges = append(edges, subEdges...) - } - break - } - } - - return descendantsObjects, edges -} - -func (g *Graph) InjectNestedGraph(tempGraph *Graph, parent *Object) { - obj := tempGraph.Root.ChildrenArray[0] - obj.MoveWithDescendantsTo(0, 0) - obj.Parent = parent - for _, obj := range tempGraph.Objects { - obj.Graph = g - } - g.Objects = append(g.Objects, tempGraph.Objects...) - parent.Children[strings.ToLower(obj.ID)] = obj - parent.ChildrenArray = append(parent.ChildrenArray, obj) - g.Edges = append(g.Edges, tempGraph.Edges...) -} - func (g *Graph) PrintString() string { buf := &bytes.Buffer{} fmt.Fprint(buf, "Objects: [") @@ -1918,54 +1830,6 @@ func (obj *Object) IterDescendants(apply func(parent, child *Object)) { } } -// ShiftDescendants moves Object's descendants (not including itself) -// descendants' edges are also moved by the same dx and dy (the whole route is moved if both ends are a descendant) -func (obj *Object) ShiftDescendants(dx, dy float64) { - // also need to shift edges of descendants that are shifted - movedEdges := make(map[*Edge]struct{}) - for _, e := range obj.Graph.Edges { - isSrcDesc := e.Src.IsDescendantOf(obj) - isDstDesc := e.Dst.IsDescendantOf(obj) - - if isSrcDesc && isDstDesc { - movedEdges[e] = struct{}{} - for _, p := range e.Route { - p.X += dx - p.Y += dy - } - } - } - - obj.IterDescendants(func(_, curr *Object) { - curr.TopLeft.X += dx - curr.TopLeft.Y += dy - for _, e := range obj.Graph.Edges { - if _, ok := movedEdges[e]; ok { - continue - } - isSrc := e.Src == curr - isDst := e.Dst == curr - - if isSrc && isDst { - for _, p := range e.Route { - p.X += dx - p.Y += dy - } - } else if isSrc { - e.Route[0].X += dx - e.Route[0].Y += dy - } else if isDst { - e.Route[len(e.Route)-1].X += dx - e.Route[len(e.Route)-1].Y += dy - } - - if isSrc || isDst { - movedEdges[e] = struct{}{} - } - } - }) -} - func (obj *Object) IsMultiple() bool { return obj.Style.Multiple != nil && obj.Style.Multiple.Value == "true" } @@ -1973,19 +1837,3 @@ func (obj *Object) IsMultiple() bool { func (obj *Object) Is3D() bool { return obj.Style.ThreeDee != nil && obj.Style.ThreeDee.Value == "true" } - -// GetModifierElementAdjustments returns width/height adjustments to account for shapes with 3d or multiple -func (obj *Object) GetModifierElementAdjustments() (dx, dy float64) { - if obj.Is3D() { - if obj.Shape.Value == d2target.ShapeHexagon { - dy = d2target.THREE_DEE_OFFSET / 2 - } else { - dy = d2target.THREE_DEE_OFFSET - } - dx = d2target.THREE_DEE_OFFSET - } else if obj.IsMultiple() { - dy = d2target.MULTIPLE_OFFSET - dx = d2target.MULTIPLE_OFFSET - } - return dx, dy -} diff --git a/d2graph/layout.go b/d2graph/layout.go new file mode 100644 index 000000000..1bec09adc --- /dev/null +++ b/d2graph/layout.go @@ -0,0 +1,315 @@ +package d2graph + +import ( + "strings" + + "oss.terrastruct.com/d2/d2target" + "oss.terrastruct.com/d2/lib/geo" + "oss.terrastruct.com/d2/lib/label" + "oss.terrastruct.com/d2/lib/shape" +) + +func (obj *Object) MoveWithDescendants(dx, dy float64) { + obj.TopLeft.X += dx + obj.TopLeft.Y += dy + for _, child := range obj.ChildrenArray { + child.MoveWithDescendants(dx, dy) + } +} + +func (obj *Object) MoveWithDescendantsTo(x, y float64) { + dx := x - obj.TopLeft.X + dy := y - obj.TopLeft.Y + obj.MoveWithDescendants(dx, dy) +} + +func (parent *Object) removeChild(child *Object) { + delete(parent.Children, strings.ToLower(child.ID)) + for i := 0; i < len(parent.ChildrenArray); i++ { + if parent.ChildrenArray[i] == child { + parent.ChildrenArray = append(parent.ChildrenArray[:i], parent.ChildrenArray[i+1:]...) + break + } + } +} + +// remove obj and all descendants from graph, as a new Graph +func (g *Graph) ExtractAsNestedGraph(obj *Object) *Graph { + descendantObjects, edges := pluckObjAndEdges(g, obj) + + tempGraph := NewGraph() + tempGraph.Root.ChildrenArray = []*Object{obj} + tempGraph.Root.Children[strings.ToLower(obj.ID)] = obj + + for _, descendantObj := range descendantObjects { + descendantObj.Graph = tempGraph + } + tempGraph.Objects = descendantObjects + tempGraph.Edges = edges + + obj.Parent.removeChild(obj) + obj.Parent = tempGraph.Root + + return tempGraph +} + +func pluckObjAndEdges(g *Graph, obj *Object) (descendantsObjects []*Object, edges []*Edge) { + for i := 0; i < len(g.Edges); i++ { + edge := g.Edges[i] + if edge.Src == obj || edge.Dst == obj { + edges = append(edges, edge) + g.Edges = append(g.Edges[:i], g.Edges[i+1:]...) + i-- + } + } + + for i := 0; i < len(g.Objects); i++ { + temp := g.Objects[i] + if temp.AbsID() == obj.AbsID() { + descendantsObjects = append(descendantsObjects, obj) + g.Objects = append(g.Objects[:i], g.Objects[i+1:]...) + for _, child := range obj.ChildrenArray { + subObjects, subEdges := pluckObjAndEdges(g, child) + descendantsObjects = append(descendantsObjects, subObjects...) + edges = append(edges, subEdges...) + } + break + } + } + + return descendantsObjects, edges +} + +func (g *Graph) InjectNestedGraph(tempGraph *Graph, parent *Object) { + obj := tempGraph.Root.ChildrenArray[0] + obj.MoveWithDescendantsTo(0, 0) + obj.Parent = parent + for _, obj := range tempGraph.Objects { + obj.Graph = g + } + g.Objects = append(g.Objects, tempGraph.Objects...) + parent.Children[strings.ToLower(obj.ID)] = obj + parent.ChildrenArray = append(parent.ChildrenArray, obj) + g.Edges = append(g.Edges, tempGraph.Edges...) +} + +// ShiftDescendants moves Object's descendants (not including itself) +// descendants' edges are also moved by the same dx and dy (the whole route is moved if both ends are a descendant) +func (obj *Object) ShiftDescendants(dx, dy float64) { + // also need to shift edges of descendants that are shifted + movedEdges := make(map[*Edge]struct{}) + for _, e := range obj.Graph.Edges { + isSrcDesc := e.Src.IsDescendantOf(obj) + isDstDesc := e.Dst.IsDescendantOf(obj) + + if isSrcDesc && isDstDesc { + movedEdges[e] = struct{}{} + for _, p := range e.Route { + p.X += dx + p.Y += dy + } + } + } + + obj.IterDescendants(func(_, curr *Object) { + curr.TopLeft.X += dx + curr.TopLeft.Y += dy + for _, e := range obj.Graph.Edges { + if _, ok := movedEdges[e]; ok { + continue + } + isSrc := e.Src == curr + isDst := e.Dst == curr + + if isSrc && isDst { + for _, p := range e.Route { + p.X += dx + p.Y += dy + } + } else if isSrc { + if dx == 0 { + e.ShiftStart(dy, false) + } else if dy == 0 { + e.ShiftStart(dx, true) + } else { + e.Route[0].X += dx + e.Route[0].Y += dy + } + } else if isDst { + if dx == 0 { + e.ShiftEnd(dy, false) + } else if dy == 0 { + e.ShiftEnd(dx, true) + } else { + e.Route[len(e.Route)-1].X += dx + e.Route[len(e.Route)-1].Y += dy + } + } + + if isSrc || isDst { + movedEdges[e] = struct{}{} + } + } + }) +} + +// ShiftStart moves the starting point of the route by delta either horizontally or vertically +// if subsequent points are in line with the movement, they will be removed (unless it is the last point) +// start end +// . ├────┼────┼───┼────┼───┤ before +// . ├──dx──► +// . ├──┼───┼────┼───┤ after +func (edge *Edge) ShiftStart(delta float64, isHorizontal bool) { + position := func(p *geo.Point) float64 { + if isHorizontal { + return p.X + } + return p.Y + } + + start := edge.Route[0] + next := edge.Route[1] + isIncreasing := position(start) < position(next) + if isHorizontal { + start.X += delta + } else { + start.Y += delta + } + + if isIncreasing == (delta < 0) { + // nothing more to do when moving away from the next point + return + } + + isAligned := func(p *geo.Point) bool { + if isHorizontal { + return p.Y == start.Y + } + return p.X == start.X + } + isPastStart := func(p *geo.Point) bool { + if delta > 0 { + return position(p) < position(start) + } else { + return position(p) > position(start) + } + } + + needsRemoval := false + toRemove := make([]bool, len(edge.Route)) + for i := 1; i < len(edge.Route)-1; i++ { + if !isAligned(edge.Route[i]) { + break + } + if isPastStart(edge.Route[i]) { + toRemove[i] = true + needsRemoval = true + } + } + if needsRemoval { + edge.Route = geo.RemovePoints(edge.Route, toRemove) + } +} + +// ShiftEnd moves the ending point of the route by delta either horizontally or vertically +// if prior points are in line with the movement, they will be removed (unless it is the first point) +func (edge *Edge) ShiftEnd(delta float64, isHorizontal bool) { + position := func(p *geo.Point) float64 { + if isHorizontal { + return p.X + } + return p.Y + } + + end := edge.Route[len(edge.Route)-1] + prev := edge.Route[len(edge.Route)-2] + isIncreasing := position(prev) < position(end) + if isHorizontal { + end.X += delta + } else { + end.Y += delta + } + + if isIncreasing == (delta > 0) { + // nothing more to do when moving away from the next point + return + } + + isAligned := func(p *geo.Point) bool { + if isHorizontal { + return p.Y == end.Y + } + return p.X == end.X + } + isPastEnd := func(p *geo.Point) bool { + if delta > 0 { + return position(p) < position(end) + } else { + return position(p) > position(end) + } + } + + needsRemoval := false + toRemove := make([]bool, len(edge.Route)) + for i := len(edge.Route) - 2; i > 0; i-- { + if !isAligned(edge.Route[i]) { + break + } + if isPastEnd(edge.Route[i]) { + toRemove[i] = true + needsRemoval = true + } + } + if needsRemoval { + edge.Route = geo.RemovePoints(edge.Route, toRemove) + } +} + +// GetModifierElementAdjustments returns width/height adjustments to account for shapes with 3d or multiple +func (obj *Object) GetModifierElementAdjustments() (dx, dy float64) { + if obj.Is3D() { + if obj.Shape.Value == d2target.ShapeHexagon { + dy = d2target.THREE_DEE_OFFSET / 2 + } else { + dy = d2target.THREE_DEE_OFFSET + } + dx = d2target.THREE_DEE_OFFSET + } else if obj.IsMultiple() { + dy = d2target.MULTIPLE_OFFSET + dx = d2target.MULTIPLE_OFFSET + } + return dx, dy +} + +func (obj *Object) ToShape() shape.Shape { + tl := obj.TopLeft + if tl == nil { + tl = geo.NewPoint(0, 0) + } + dslShape := strings.ToLower(obj.Shape.Value) + shapeType := d2target.DSL_SHAPE_TO_SHAPE_TYPE[dslShape] + contentBox := geo.NewBox(tl, obj.Width, obj.Height) + return shape.NewShape(shapeType, contentBox) +} + +func (obj *Object) GetLabelTopLeft() *geo.Point { + if obj.LabelPosition == nil { + return nil + } + + s := obj.ToShape() + labelPosition := label.Position(*obj.LabelPosition) + + var box *geo.Box + if labelPosition.IsOutside() { + box = s.GetBox() + } else { + box = s.GetInnerBox() + } + + labelTL := labelPosition.GetPointOnBox(box, label.PADDING, + float64(obj.LabelDimensions.Width), + float64(obj.LabelDimensions.Height), + ) + return labelTL +} diff --git a/d2ir/d2ir.go b/d2ir/d2ir.go index 50fb8c104..bf4b6cdd9 100644 --- a/d2ir/d2ir.go +++ b/d2ir/d2ir.go @@ -669,10 +669,9 @@ func (m *Map) ensureField(i int, kp *d2ast.KeyPath, refctx *RefContext) (*Field, if _, ok := d2graph.ReservedKeywords[strings.ToLower(head)]; ok { head = strings.ToLower(head) - } - - if head == "class" && i < len(kp.Path)-1 { - return nil, d2parser.Errorf(kp.Path[i].Unbox(), `"class" must be the last part of the key`) + if _, ok := d2graph.CompositeReservedKeywords[head]; !ok && i < len(kp.Path)-1 { + return nil, d2parser.Errorf(kp.Path[i].Unbox(), fmt.Sprintf(`"%s" must be the last part of the key`, head)) + } } if head == "_" { diff --git a/d2layouts/d2dagrelayout/layout.go b/d2layouts/d2dagrelayout/layout.go index db9c4f4b3..97734237d 100644 --- a/d2layouts/d2dagrelayout/layout.go +++ b/d2layouts/d2dagrelayout/layout.go @@ -119,9 +119,7 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err } if obj.Icon != nil && obj.Shape.Value != d2target.ShapeImage { - contentBox := geo.NewBox(geo.NewPoint(0, 0), float64(obj.Width), float64(obj.Height)) - shapeType := d2target.DSL_SHAPE_TO_SHAPE_TYPE[obj.Shape.Value] - s := shape.NewShape(shapeType, contentBox) + s := obj.ToShape() iconSize := d2target.GetIconSize(s.GetInnerBox(), string(label.InsideTopLeft)) // Since dagre container labels are pushed up, we don't want a child container to collide maxContainerLabelHeight = go2.Max(maxContainerLabelHeight, (iconSize+label.PADDING*2)*2) @@ -240,7 +238,7 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err obj.Width = math.Ceil(dn.Width) obj.Height = math.Ceil(dn.Height) - if obj.HasLabel() { + if obj.HasLabel() && obj.LabelPosition == nil { if len(obj.ChildrenArray) > 0 { obj.LabelPosition = go2.Pointer(string(label.OutsideTopCenter)) } else if obj.HasOutsideBottomLabel() { @@ -253,7 +251,7 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err obj.LabelPosition = go2.Pointer(string(label.InsideMiddleCenter)) } } - if obj.Icon != nil { + if obj.Icon != nil && obj.IconPosition == nil { if len(obj.ChildrenArray) > 0 { obj.IconPosition = go2.Pointer(string(label.OutsideTopLeft)) obj.LabelPosition = go2.Pointer(string(label.OutsideTopRight)) @@ -386,7 +384,7 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err if isHorizontal && e.Src.Parent != g.Root && e.Dst.Parent != g.Root { moveWholeEdge = true } else { - e.Route[0].Y += stepSize + e.ShiftStart(stepSize, false) } } } @@ -395,7 +393,7 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err if isHorizontal && e.Dst.Parent != g.Root && e.Src.Parent != g.Root { moveWholeEdge = true } else { - e.Route[len(e.Route)-1].Y += stepSize + e.ShiftEnd(stepSize, false) } } } @@ -491,8 +489,8 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err } } - srcShape := shape.NewShape(d2target.DSL_SHAPE_TO_SHAPE_TYPE[strings.ToLower(edge.Src.Shape.Value)], edge.Src.Box) - dstShape := shape.NewShape(d2target.DSL_SHAPE_TO_SHAPE_TYPE[strings.ToLower(edge.Dst.Shape.Value)], edge.Dst.Box) + srcShape := edge.Src.ToShape() + dstShape := edge.Dst.ToShape() // trace the edge to the specific shape's border points[startIndex] = shape.TraceToShapeBorder(srcShape, start, points[startIndex+1]) diff --git a/d2layouts/d2elklayout/layout.go b/d2layouts/d2elklayout/layout.go index 5c29020a2..2fb5e160d 100644 --- a/d2layouts/d2elklayout/layout.go +++ b/d2layouts/d2elklayout/layout.go @@ -407,7 +407,7 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err obj.Width = math.Ceil(n.Width) obj.Height = math.Ceil(n.Height) - if obj.HasLabel() { + if obj.HasLabel() && obj.LabelPosition == nil { if len(obj.ChildrenArray) > 0 { obj.LabelPosition = go2.Pointer(string(label.InsideTopCenter)) } else if obj.HasOutsideBottomLabel() { @@ -419,7 +419,7 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err obj.LabelPosition = go2.Pointer(string(label.InsideMiddleCenter)) } } - if obj.Icon != nil { + if obj.Icon != nil && obj.IconPosition == nil { if len(obj.ChildrenArray) > 0 { obj.IconPosition = go2.Pointer(string(label.InsideTopLeft)) obj.LabelPosition = go2.Pointer(string(label.InsideTopRight)) @@ -501,8 +501,8 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err } } - srcShape := shape.NewShape(d2target.DSL_SHAPE_TO_SHAPE_TYPE[strings.ToLower(edge.Src.Shape.Value)], edge.Src.Box) - dstShape := shape.NewShape(d2target.DSL_SHAPE_TO_SHAPE_TYPE[strings.ToLower(edge.Dst.Shape.Value)], edge.Dst.Box) + srcShape := edge.Src.ToShape() + dstShape := edge.Dst.ToShape() // trace the edge to the specific shape's border points[startIndex] = shape.TraceToShapeBorder(srcShape, points[startIndex], points[startIndex+1]) diff --git a/d2layouts/d2grid/layout.go b/d2layouts/d2grid/layout.go index 5ddc75839..390470583 100644 --- a/d2layouts/d2grid/layout.go +++ b/d2layouts/d2grid/layout.go @@ -6,13 +6,11 @@ import ( "fmt" "math" "sort" - "strings" "oss.terrastruct.com/d2/d2graph" "oss.terrastruct.com/d2/d2target" "oss.terrastruct.com/d2/lib/geo" "oss.terrastruct.com/d2/lib/label" - "oss.terrastruct.com/d2/lib/shape" "oss.terrastruct.com/util-go/go2" ) @@ -104,42 +102,99 @@ func withoutGridDiagrams(ctx context.Context, g *d2graph.Graph, layout d2graph.L if obj.GridGap != nil || obj.VerticalGap != nil { verticalPadding = gd.verticalGap } + // size shape according to grid - obj.SizeToContent(float64(gd.width), float64(gd.height), float64(2*horizontalPadding), float64(2*verticalPadding)) + obj.SizeToContent(gd.width, gd.height, float64(2*horizontalPadding), float64(2*verticalPadding)) // compute where the grid should be placed inside shape - dslShape := strings.ToLower(obj.Shape.Value) - shapeType := d2target.DSL_SHAPE_TO_SHAPE_TYPE[dslShape] - s := shape.NewShape(shapeType, geo.NewBox(geo.NewPoint(0, 0), obj.Width, obj.Height)) + s := obj.ToShape() innerBox := s.GetInnerBox() if innerBox.TopLeft.X != 0 || innerBox.TopLeft.Y != 0 { gd.shift(innerBox.TopLeft.X, innerBox.TopLeft.Y) } + // compute how much space the label and icon occupy + var occupiedWidth, occupiedHeight float64 + if obj.Icon != nil { + iconSpace := float64(d2target.MAX_ICON_SIZE + 2*label.PADDING) + occupiedWidth = iconSpace + occupiedHeight = iconSpace + } + var dx, dy float64 - if obj.LabelDimensions.Width != 0 { - labelWidth := float64(obj.LabelDimensions.Width) + 2*label.PADDING - if labelWidth > obj.Width { - dx = (labelWidth - obj.Width) / 2 - obj.Width = labelWidth - } - } if obj.LabelDimensions.Height != 0 { - labelHeight := float64(obj.LabelDimensions.Height) + 2*label.PADDING - if labelHeight > float64(verticalPadding) { - // if the label doesn't fit within the padding, we need to add more - grow := labelHeight - float64(verticalPadding) - dy = grow - obj.Height += grow + occupiedHeight = math.Max( + occupiedHeight, + float64(obj.LabelDimensions.Height)+2*label.PADDING, + ) + } + if obj.LabelDimensions.Width != 0 { + // . ├────┤───────├────┤ + // . icon label icon + // with an icon in top left we need 2x the space to fit the label in the center + occupiedWidth *= 2 + occupiedWidth += float64(obj.LabelDimensions.Width) + 2*label.PADDING + if occupiedWidth > obj.Width { + dx = (occupiedWidth - obj.Width) / 2 + obj.Width = occupiedWidth } } + + // also check for grid cells with outside top labels or icons + // the first grid object is at the top (and always exists) + topY := gd.objects[0].TopLeft.Y + highestOutside := topY + for _, o := range gd.objects { + // we only want to compute label positions for objects at the top of the grid + if o.TopLeft.Y > topY { + if gd.rowDirected { + // if the grid is rowDirected (row1, row2, etc) we can stop after finishing the first row + break + } else { + // otherwise we continue until the next column + continue + } + } + if o.LabelPosition != nil { + labelPosition := label.Position(*o.LabelPosition) + if labelPosition.IsOutside() { + labelTL := o.GetLabelTopLeft() + if labelTL.Y < highestOutside { + highestOutside = labelTL.Y + } + } + } + if o.IconPosition != nil { + switch label.Position(*o.IconPosition) { + case label.OutsideTopLeft, label.OutsideTopCenter, label.OutsideTopRight: + iconSpace := float64(d2target.MAX_ICON_SIZE + label.PADDING) + if topY-iconSpace < highestOutside { + highestOutside = topY - iconSpace + } + } + } + } + if highestOutside < topY { + occupiedHeight += topY - highestOutside + 2*label.PADDING + } + if occupiedHeight > float64(verticalPadding) { + // if the label doesn't fit within the padding, we need to add more + dy = occupiedHeight - float64(verticalPadding) + obj.Height += dy + } + // we need to center children if we have to expand to fit the container label if dx != 0 || dy != 0 { gd.shift(dx, dy) } } - obj.LabelPosition = go2.Pointer(string(label.InsideTopCenter)) + if obj.HasLabel() { + obj.LabelPosition = go2.Pointer(string(label.InsideTopCenter)) + } + if obj.Icon != nil { + obj.IconPosition = go2.Pointer(string(label.InsideTopLeft)) + } gridDiagrams[obj.AbsID()] = gd for _, o := range gd.objects { @@ -191,10 +246,17 @@ func layoutGrid(g *d2graph.Graph, obj *d2graph.Object) (*gridDiagram, error) { // position labels and icons for _, o := range gd.objects { if o.Icon != nil { - o.LabelPosition = go2.Pointer(string(label.InsideTopCenter)) - o.IconPosition = go2.Pointer(string(label.InsideMiddleCenter)) + // don't overwrite position if nested graph layout positioned label/icon + if o.LabelPosition == nil { + o.LabelPosition = go2.Pointer(string(label.InsideTopCenter)) + } + if o.IconPosition == nil { + o.IconPosition = go2.Pointer(string(label.InsideMiddleCenter)) + } } else { - o.LabelPosition = go2.Pointer(string(label.InsideMiddleCenter)) + if o.LabelPosition == nil { + o.LabelPosition = go2.Pointer(string(label.InsideMiddleCenter)) + } } } diff --git a/d2oracle/edit.go b/d2oracle/edit.go index 9549c65b2..165d6886c 100644 --- a/d2oracle/edit.go +++ b/d2oracle/edit.go @@ -2735,7 +2735,7 @@ func RenameIDDeltas(g *d2graph.Graph, key, newName string) (deltas map[string]st } mk.Key.Path[len(mk.Key.Path)-1].Unbox().SetString(newName) - uniqueKeyStr, _, err := generateUniqueKey(g, strings.Join(d2graph.Key(mk.Key), "."), nil, nil) + uniqueKeyStr, _, err := generateUniqueKey(g, strings.Join(d2graph.Key(mk.Key), "."), obj, nil) if err != nil { return nil, err } @@ -2749,19 +2749,23 @@ func RenameIDDeltas(g *d2graph.Graph, key, newName string) (deltas map[string]st beforeObjID := obj.ID appendNodeDelta := func(ch *d2graph.Object) { - beforeID := ch.AbsID() - obj.ID = newNameKey - deltas[beforeID] = ch.AbsID() - obj.ID = beforeObjID + if obj.ID != newNameKey { + beforeID := ch.AbsID() + obj.ID = newNameKey + deltas[beforeID] = ch.AbsID() + obj.ID = beforeObjID + } } appendEdgeDelta := func(ch *d2graph.Object) { for _, e := range obj.Graph.Edges { if e.Src == ch || e.Dst == ch { - beforeID := e.AbsID() - obj.ID = newNameKey - deltas[beforeID] = e.AbsID() - obj.ID = beforeObjID + if obj.ID != newNameKey { + beforeID := e.AbsID() + obj.ID = newNameKey + deltas[beforeID] = e.AbsID() + obj.ID = beforeObjID + } } } } diff --git a/d2oracle/edit_test.go b/d2oracle/edit_test.go index 7f2afb369..a48bcc0d1 100644 --- a/d2oracle/edit_test.go +++ b/d2oracle/edit_test.go @@ -1840,6 +1840,19 @@ func TestRename(t *testing.T) { newName: `Square`, exp: `Square +`, + }, + { + name: "generated-conflict", + + text: `Square +Square 2 +`, + key: `Square 2`, + newName: `Square`, + + exp: `Square +Square 2 `, }, { @@ -7261,6 +7274,17 @@ y "x": "y 2" }`, }, + { + name: "generated-conflict", + + text: `Square +Square 2 +`, + key: `Square 2`, + newName: `Square`, + + exp: `{}`, + }, { name: "rename_conflict_with_dots", diff --git a/d2renderers/d2fonts/d2fonts.go b/d2renderers/d2fonts/d2fonts.go index 058371017..2c692ab35 100644 --- a/d2renderers/d2fonts/d2fonts.go +++ b/d2renderers/d2fonts/d2fonts.go @@ -10,8 +10,7 @@ import ( "fmt" "strings" - "github.com/jung-kurt/gofpdf" - + "oss.terrastruct.com/d2/lib/font" fontlib "oss.terrastruct.com/d2/lib/font" ) @@ -44,7 +43,7 @@ func (f Font) GetEncodedSubset(corpus string) string { fontBuf := make([]byte, len(FontFaces[f])) copy(fontBuf, FontFaces[f]) - fontBuf = gofpdf.UTF8CutFont(fontBuf, uniqueChars) + fontBuf = font.UTF8CutFont(fontBuf, uniqueChars) fontBuf, err := fontlib.Sfnt2Woff(fontBuf) if err != nil { diff --git a/d2renderers/d2fonts/d2fonts_test.go b/d2renderers/d2fonts/d2fonts_test.go index 0d28aece8..fc95ff310 100644 --- a/d2renderers/d2fonts/d2fonts_test.go +++ b/d2renderers/d2fonts/d2fonts_test.go @@ -4,8 +4,7 @@ import ( "path/filepath" "testing" - "github.com/jung-kurt/gofpdf" - + "oss.terrastruct.com/d2/lib/font" "oss.terrastruct.com/util-go/assert" "oss.terrastruct.com/util-go/diff" ) @@ -17,7 +16,7 @@ func TestCutFont(t *testing.T) { } fontBuf := make([]byte, len(FontFaces[f])) copy(fontBuf, FontFaces[f]) - fontBuf = gofpdf.UTF8CutFont(fontBuf, " 1") + fontBuf = font.UTF8CutFont(fontBuf, " 1") err := diff.Testdata(filepath.Join("testdata", "d2fonts", "cut"), ".txt", fontBuf) assert.Success(t, err) } diff --git a/d2renderers/d2fonts/testdata/d2fonts/cut.exp.txt b/d2renderers/d2fonts/testdata/d2fonts/cut.exp.txt index 358066a59..0dcff9675 100644 Binary files a/d2renderers/d2fonts/testdata/d2fonts/cut.exp.txt and b/d2renderers/d2fonts/testdata/d2fonts/cut.exp.txt differ diff --git a/d2renderers/d2sketch/testdata/all_shapes/sketch.exp.svg b/d2renderers/d2sketch/testdata/all_shapes/sketch.exp.svg index 9d1f0775f..052e94abc 100644 --- a/d2renderers/d2sketch/testdata/all_shapes/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/all_shapes/sketch.exp.svg @@ -4,7 +4,7 @@ } @font-face { font-family: d2-2495420426-font-bold; - src: url("data:application/font-woff;base64,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"); + src: url("data:application/font-woff;base64,d09GRgABAAAAAB3oAA4AAAAAMawAAQKPAAAAAAAAAAAAAAAAAAAAAAAAAABPUy8yAAABRAAAAFwAAABgY8E/zmNtYXAAAAGgAAAAawAAAIoCDgLmY3Z0IAAAAgwAAAAyAAAASgVEEfRmcGdtAAACQAAABxAAAA4MYi79fGdhc3AAAAlQAAAACAAAAAgAAAAQZ2x5ZgAACVgAABERAAAbtIPlYgtoZWFkAAAabAAAADYAAAA2HceN7GhoZWEAABqkAAAAJAAAACQIDQG0aG10eAAAGsgAAABcAAAAXDOZBINsb2NhAAAbJAAAADAAAAAwUXBYnG1heHAAABtUAAAAIAAAACACPRPRbmFtZQAAG3QAAAG0AAAD5F+agdBwb3N0AAAdKAAAABwAAAAg/34AFHByZXAAAB1EAAAApAAAALJqvdaoeJxiYGEKZ9rDwMrAwNTFFMHAwOANoRnjGEQY7RiQwAIGhvoABgZvGN/d39+dYQED728m5pZ/ixgYWNYwZjEwME4GyTFxMK1gYGBQYGAGAAAA//8BAAD//1KODSd4nFTMSQ4BURgA4e95bW484/VERESsddi4ieEQ7vcLsVFJbWpRSLKEWuWKoshY29g5OGlcIn5la++ocY6IVzzjEfe4ffw+/plLWrJKW0dXT9/AUG1kbKKYmllYWvEGAAD//wEAAP//KTEW6AB4nGLADbIgkGkDAxfTN8Zn/3//ewZhMwmB2AwSEMh0ndEYhAEAAAD//wEAAP//nS0QQgAAeJysVml328YVnQFBaoksydZiN0jTh4yhusSAVlrHYWzGUTCiGEdNS8tyCzhNC4iUuy9JN3ffN+bP3KHaU/dbflrPG5Cs7Fju6TnlB7478+6bt2IACE0Q97JuTrT/SCzf2Ufj7v0M1wJcyYsHNLqXwYvKf82LeTEYqKMgDCFyCKN2x0IKU6QJpAYVDxJ4WoUqTFDTNDyprW+I1GDNUFGk1ls3qY1qBp45fEhYUvCMKYfw+w/HnueZIkV4/ELIu+PlDZm+QPCMSsdrcs0UqYLoZ8f5eFN6zqGvUYuxYTL2h01jJoSAhoSP+vC37o+vyHOmO+ii0c1C1KL84N0sVGEwygj9fhZiJw8IbUbtPCdbscshrvSzcLIibLN+m5kf9TN6QKNRSVjsZ0VAINYtMrrO6HoRFHmeB/AiLJkBxEEGsc/kEEsm2MeLjF7cLx+tigEzHtXFUZ4PyxwyzvNJBjkNsWlUmieoa+oS/KgcEuZMP8OcSjGv0iAMc8giQcOVG7WYhnbuKCVWcrpBFT7/wyu6A9SbIWHe0IhGkLHdrkfwt+5kRT8oD/JM5WFO2LmbQcYB12USSoI5jQUTj4VXtXleY0GliiBUWsI7egA5gCww10ywoImjXTaDR744Ij4BO0XOlGLXRbuoxwvLwnTTZjgbnOf044O0VJ0iYwVh4EcFdUeq5Ka6YouAGwIKsDMrGGqRKncrF+fOMMflfsbGO08zWtYuoZNzS6LW7WdhoMK8GSZY0dbzuhiWuwlWNWRBhBXzNh9AWFFpjlVeHWSEVdev85qw6opCj3wxGKkS501Bo4JwXqUqwQW9f5hZf7ibX8a5Y/UwwZrev5Pt3602gzC/jDW3v66tuGDuZfbCBQNZpjgf8yMHL0rtCv+telEKuakItaifWS4f/CgdjYjdrjZDBVlOcVDp2cSL3E6OFdPDqukV8B5v1hkttEKsqV1IA3FrLKV03drQwgqve5jhgkqpi2WV4pyCV6RU/PPSJSnOizWRpilXYF2lkKVdn4/xYRy8lCfY1FZsxAkuaitZXtLWY/kJbWssn9fWZxloW2f5grYNlp/Udo7li9rOs/yUtgssY62m9Uej2D/MFLUg3+OnJYE+pdycKd+vlMkp5dZM+UGlJC2wEp+ZJ2T5jypVzvN0fqG2guIEL2krWSptPZaXta2xjLT1WW5pW2f5aW0bLK9oO8fyM9rOs2xqu8CypanjBvaqpgKXCjIKsjCupbJAi2d2W+NqjKvNBC9roh6d0U1VthVf7M9kBJz9Z6cttsuNLk8cXm7autzoZtu5y/Jzp8pzFueapldc5K9oMeF0P+4TMn5qLLwvNv8u+Ld7S7XtNbnBuV7X1KHeGfFDmLKd4FXduthJ0P5vVEgzaCd4TVtPbEbUoh5fCfCi26NRT/VUSdlRwLeuSsdtKTfWmwluaIhNXFQp/Ah+5Gh2SaR4zsTHo5Yi6ozaCW4+TqNWdR4aKp2yCQXfKTt3shOf6hSc+Fv15/OUb9pFQyPlLNRegYZ58nEt+Lar3kq+KYYKdVMO+xl8Uwaom4JvuidtSkUEf0vtle1AYdHs8Rtr0TgvBT3Niaru1IYpuBn1qET9Y6fC3+IgIg6iFhXDyU36H195gs60FkSE+takFqrTTvD6TIVFp99TPXbKXbw1KyEnU1Ua4jBrUUeF7n072SSOa9IKNCLUo9unv12qJj5t2ifdUjzyb5yKxEzbVfAHzpMpT1u8oxW1uIp7uGiyfnCQZ9TJW3ZbrscJ3nxMexD0H9OmT7V9loXRuBE/y+Guxs14RNThGRu1z6aiYVrYjhN0Xco8n1tV5UssqbRKnQdUUYdaqj05f0/bRT9Kpyb/40j3/l9TzDnxPdZR7SA8NS9hPomzp624EU+r8pa24mYcqkldJtnMSnBbQ2xUj/1Y8BO+1sL1ZoK3z9jf11bI9TW82kzweY3Xmgne4Sp2FbVob6TKabW+oHmg8U6c4It6LMRenKCvx0IyuKPH0u0c6LF0O3eZ04sTHDKHwT3mMPgScxh8WZ8IIUycINMn/OkUJ8j1iaz27usTWe29yzzJ6CvMc+g95jn0VeY59DX22Y0TFOyTQck+GRyxTwYD5rwVJxgyh8Excxg8YA6Dr7u4duME33BxMfqmi4vRt1xcjL7t4mL0HRcXo++6uBh9z8XF6Pvais6sgT9wK+zECd6v4Jtxgg+46G6Vxgl+qK2ccH5UQeb82HHkhPMTbcXrs1N/6lbO4mEF2eJnFWT6z7WVE8IvKsiEX1aQCb/SVtyanfdrt3L031SQ6b+tINN/p62cEH5fQSb8oYJM+KO24o3ZeX9yK0f/cwWZ/pcKMv2v2soJ4W8VZMKogkz4UI+fc1+2aARj36t1MxUGYZ6nMeaPUbvcfzh9WSf/BgAA//8BAAD//2NMAUcAAQAB//8AD3icjHlriBzZefZ7bnWqqruruuvaXdVdfanuqr73TPd092guPS3N6PJpZ6RZe73SaG3Ls5Z3V76j9Rdng1nLBhsMJiYQMCQQCGsnBPLDxjeCk/yKIcEmv0z+JYYkLPkRnBicxXHYUaiq7tFo1loCA1LVeY7Qec/zPs/z1gCFJgD6J/xbwCEFKrjw/vkRw5iA6xTytmUaupZLMSogjDDZB0oYoewhRwwThl8HAEKBvAwYIXwLMEZ3BYQwuplOA6TVtKpkUrIkAgeui4LdGYW5adXO8UY1V9Vz1Vxjak/DachDbvMVUUTflKSTe+j3Tz7uo5snv7rzgn7njv7CHf3OHQl/WJbe/kMxi9/39k9w9u3/3H3jjdo3vul/4xv+G38CABiGj97CAW5DAOvwo3lKQQzVKKYM7z/zLfnw9rwOGMMxETCAeQCMoWNAyDngiNLla7jhPvOt9OHteQkwdt4NpB3enlfPgYAQbYEUUAKclwEBo4jdB4zJ8TsRR0dHc7sZIlgdhOvN9XJJy6YkCFAgcqtj14IgHK/N8GhoWfZkMhpapiGYhmWahuBHi6GCw+EMj9eCwK8p2DQs6+f9w4nYvP7SdqFRVsVivmQyOVdybU5obTzf9neGRaXqVXeGnlqT21d7o/UHx5uajltuozj96Hr3g13TalQHOq2tVz/SubxfLYzq/asH5cKwCgCAYAIqzuEqNOF+UocGYMIIZg+BUcLo60DIsiLLk2pRLfzzOAQEI3L/LOporiOoVbyiqedUiUMTNTm3Oo1aEIzXogp4eHH25XlHw8l0NDQNhaDstePV3c/u2xcmfsXOB0G+OgnM1tVu62rd6LXm12bq1VcvPfP6gWQHnpUvFJqzy95oalZyPTcoKAJg8B79Ah8QHbqwAz9PTqcUEOAMEmAbMYHsu8sXaPHi6JlvZZMiYHLMKSbEPABBgGOEAJwDETG2fE+WzKmdASyJYcZQehzRw6QRcnh4ex4CAgGQ8BAABAbC/afB5/XzSBExjiijHzndQmK6mf0ewPqkt9PfgS50Os1cU+JOx+7jBdXs6YxME7aZQky3BdsC3xcEPyFcH8cXYFrWd4e71fW7r120OxZFlEuC6BUKqqLKqYJTTFOM6donrgrhtQtVMZ1hK8/vhmKgZnaeH1x87e56BmW0yeYka1cr+cKrP/vU6HisN0pdQ71w6aX23s26VG+64aXn+s1SNenxX6BfYg2asA4//t4YMQHtJyWtiIhF/ML3QRAW9KOIEDjmaNm0/cPbcy8qE0NxeRL8edQw1orowuiDJ8A0+scJgReX2Hnr6TAAcrQEE3hPVPhCuxX1eWu9vV6rlEtaThahiUKJWx0W8ztpdNNQsF8LwiAMAt/Do2HS9womw8lkvBYs6462r712Pbz+ysXuwSC49N4eX1FkAcuY9zZdPbSsittqzb3N0C85G6OKs6b2Pnxz68EHpv7uSv+5Sw1OsYBYKdRY3rXyIkKW3a+VasXuKE9pChD0Tt7EGtbgBvx4nr4yNonAswgLeFHwVeBUoDziG0YY0EOGKI155kT8x8eAsXkACInHEhJFS4xqmz+8PR+c3wiEIcoJvf+UbfMxUMYZ5Q+BC4wLrz/eGCvJU/YdHc1zAHADDlpBtREOaoHMvY4e0TyqqDUazvB0hsfjNd+PK37mBiK+R29NM4FNJklDWLZpKNT/VWlcrepWqZovdb0cirqMejs3RuFee/Khz183uuWqnS1njenRmliw+90gqwbZlKEUbBkztTI+vHDyplztFGzLdYOtPY8P1tKy6F9fbe61L3/l03tK2bGLcvbZj01rpdpolHMGjiK7Te2Z1iufeuW5YaLDm8DwNfxfMIW/SEwrJSOMyjoGivfd0ydCcaRREcAGhPRIlONqGQeE4USakxt1zy3HbsXQElI9vD0vAAZKML2fQM8C5sUoCVACD5/ALJYj/ucQrPQbvltQ0jBFU4FbnWktkvXxWjAeL8Q9F6lPXGnbNATBr/Vx2Kd+TeBC9POg6KoqLyh2KcsF5K6OL3aCaYV5VLedUppiRARZTeVqqbW7AzHPQmfrcxv3/vqek81U+n315LsCcvd22s25/1Mv6+dbWxs5HgwH5aK69/VrGSvOEc+CCr/Eb0EKBnD7B15WJZgsVcamCCBWl/j0xgFDGGv4hnt+BR8vVo7meiaNwMmnB5kBZ5BCqejgenzwxNBJLXH56YJ9piHw2NviHy4I3/S6a265M9rTDcY4x0TKW3mTYsw5QZjQIn4laDS8IKh7b/9p0/gC62xOs8ZK3a5pPs6IftU20vVSpqCouUIr4c6jt/AMP4LL8EZiX2mGMJkHlACOyHP6SDFeOpwDmADB8PDx6Sl7IhB5gEl082cQQGlCkVgvK0AQRgQ/BEwRjhJAQrhTSMKS9UnR0XIpCS6jy0KSg8ZjPfH/uDv5oneT+nGFcNO2LNsj9mk8CPsk9DkXhE9aJZ8WykWbSSiNK91ORuv2DdttGvJovmUyrnJ16/JmJuPZrp4fdHR5uruZpdSgJbli6OgT/2xOmsGasfHa1ZSaEyRbq9quKTKrYIuEcZlLzX4oyqar5SvFIMPr3WZK+rbhxHV+/6P/gX8hXXChMi/pCBDaB4TgGCfHRZBTwUUuWYS9uBeW5suX3vt7ts0RpkKK84aeyxNdkx1W7ufTtpy/94WvfnG1N5nMXv2HBysfWin7S22QCcUa3EPt+PJ+sBHmicDQvpv8jaOlJlSjsMCE+FajnMsYPiYoan8qnqpDNpZtgVEm0MfAWOyNxZ5EMaKrFNFZUemBwClfboPTXcD5b97kHN6et043EWA8UngMXMD8foyNK7jcMO+cYilwCq+/Y8sZ9FEctxHcet/+9d2L03GvUy3nVLiH7kmPxWi8Fjlv3J0etiO+WfZCkqwoG+FYpxJxCiJ0EMdvXyFcOKVeECmWgnn88stWlbEUZYZjOgonWKQ4U22NypWqIVNMU8Zo3qz0SopkGXYRE5pOS56XVTK87DpuhmI5JWNBkAwmWDrBet4gsimXrOqscqn1bDPtKkar3OupGU9BMrOnq5Vyz5LNVLa4u9rYmDk/Vf1CRfs+MSwm1jxn0B95Tq/U1qX2sJeSnLTUa3Ohv7ki6pWEOwb+DLZhBj9MIlMqhSiumUtfWTwtfEVb+Irzm30l2m9GhgCJIcDxmcUoaf0m14DjU1Opni5Hjn90HoTg2YWzjEdho+SqGZih2cJZnrCW5PZGsbl4xE5UIr6pOGfVYnfhCv5CIS8wQzJy5aKEUZSu9fZoFg6vrHgazztugWJBFDAxJano5sNSqtC0pWzRKHWM/vvbvfe0QlMNx1ZqXqTF+bp/4YWP3qsXrE7RklqrHdmYGma/1teahwN9tQ7J3AqAP42LYEAAB8uCno5QkY3AMV0qqLkcmp54fzTXLROBVzQDK0jLYCAjqkF1MTVNl4NTNC3GGXJ5YNOw0KVrn9vv7Na0oXPxt++ur9362P70xZ3NO4O8l88Wu8/NHuyvHd2oabnizsvXt+9dCz8V3twY7VWVfLZ0uXtlFp9h8+RNfIBnsAGH8MN5WhWxwFdJzJjkRGEyK3O+SIgSEgR6HEXGM/1swTIjdoAAFwiPxp0l7Klb5q0zaHYMjC3BcB57dDR3tzYR7F3aPNw67HXazapXsA0NNtCGnNhyGGtAnBKnCxGIRswZHp0J53E2NHhCGT2ZwJOMkkznlvXZrCEVuK6k8o1MTpNFLtuy6ORxd/bxvZXnPrGth4aEGEUIM0Qyha+1rq1XnlnTa+rUw07j5E1Nu3z8l/c+lkpns7pVeClr6I6eJoSzzu29rc9+eFMu7KylKBGUkqL6BfSV1u7NYLJCeH4zzDaMmzmdR/finXwdVzGBIezC/blywRUIob0OI4CWN1OM2+jLy+51DgS0IJ+JbrhzZ7G8aLyzi0dzc22EYHtztLu2a+ppGYZoGE3rKOLdWH9nquaWZSd+bQiCaRqjSfQWDWdkejrQo+806qmOWLr0/4LebrD50hevuBcHQkpVcS2FRUnEjNF6/sLJvxY3Ni+M86xh9j9wY2CcfD3YqtRQxxlWVm90rn7+eF1r1zPZNB9Upy+PpcF0kBJb7bTMiRcGK+jvm7Mr27rbaF+51St1lpkI/RUm0IevJiRMGWlMEI0aLtI9I40pTp4WuqfTuBoYJY26jELRXoMiAogcRWuJnJlPy8iny4mQ+dWKV7CzCvRRX3j8EehsSLafGFOiTlYIV/ArmiYQWRZd1bIkUSqNN+tay2tpaSvtb/cVSqP/TKoo56uZ6+uvTp2VgqsqhZqL9bqdLZlOXvZXTKk9HmrV7TDJEfVHv0B/hwlM4Q+W33ooi2gb6TFD+PWlocffMR5/90q03T8PXs5rZ6Hz5lNRAPhoicWR0s91BO1mUC+X1IzEoyGCxxVazHQeGcXy1qcJ5yLJ8/1E7EzDo5Fn/3fx2l7PKWmGajYq9rQZbF3aCoLtq1V9uFLpZ7y2m+7U4pfbd1UpvxI6oea4WspzbNcwK+N2uN7ISYbv9HMa04ycZeQb6+3t69W4Xv6jf0d/i/8YpvBHSWqSXURJHaHYOhcPjJ5magsowxgBRfeBkNzB4/pF01YJI8SAIYiyDUOUvfwEaF57vE4okKMzqLhmZFmzVlir5K20LImPaxa16NpkGkWW6M/pjC44JZhmkqsFP5K05SgiCD8rexJDBV/rp/XbuRRiBc80RUx+x8oLWeUhEihmFDHBMoKpHew8vI5oL1emBvUHfc+uqNi2SKVlUksnjLhVV59+cttolxZ5Fd9C/wE78Pxc2ug1hYiry5kLKEXHBCFkxCR78TQcmAQhoIDo/bPvz8SBrAI7aCeJA/1o0p9Mkuky0qJYq6Pxnsb+GEUC01zOD1EsiB3yJ50LlYwQzVxqQXNLKcozVLNyg/FkUOOipgwkRoxc0fbqsqBytWFUnpcbW1f9VdJaSSudTqli63U92A+Vbq175b03t9MppVvv3mptZp1Czq60itqFojPKNy9FdYBHD8j40Z9DBnrfFu7tzWvyYmYAQLcirbiLIzm+iUBkkEHpaHD4tgB7djJOVuOT+WtGRTfxP+bKWet302rKULPUTvp5Fbz4+9kQ/v/3OwX8eLC1ll+wkxrHweJxHrcAEfQlIJh86YnVuXt24bRd6bJd1ahdaxU1EzkDi7/j9nEcrhfTrxUPbJZpxEk76t7p6WVE7opyjUlYTOk+Uoq2qzIsSVI6m8GiyuVchnwwVSrkU4r6orrmteZXioOPr/GsaDW8dk5tNtKyIZNyWGHZgl3k/2aU7Er1kvejUi+pxfDRW5hgDW7C3yxy7qCIETlAyQgcP9HkaaH3DiCCCcIPI92PFU87I/v984jYT88iIk2sACWIJGpHYrU7j5t774AABoLvs8e/MogZ3gxi072JbgrJJ8Swj8M+jg2BR94bzZLJNBPXfDSMym3b0+nyVwnJeGIa0eRsxV970Z9ZTgqbFmOaxllOxaVMPTRbXrfnYap2TSXfzPtZXqlyRfqaaMmaxUWp0amLMmXMrTgkLWaysqmzWkPknqMbuJEJir3CsNeuKyLl3gUn17RbpazUacsK+5qIHUPVU1JzJeSyxCTGe+M204uamxGiOzr5NS7iDGzAZ77noXenq/WudLX+b3TtdYJ63oriIDv9SjOdkfF46Snxb2Ai4bAT7RgNEy1JouBPNK2YYqoqT693LY4lU2/YTOCYeW5lNazXO27PzKq1THO3LOYbJ7/2c5ULpUyr7WFCh/svfLCV6XS9ScUKbJn3V9LV1eHh0eFwWJuVSuul933njr3eBPhfAAAA//8BAAD//0hpfGQAAAAAAQAAAAECj3OmGeBfDzz1AA8D6AAAAADcdfC+AAAAAN2nVnn/iP6XBP4ErAABAAYAAgAAAAAAAAABAAADhP6iAAAFKf+I/dEE/gABAAAAAAAAAAAAAAAAAAAAFwIGACgCYQAyAkMANgKJAB4CKgAyAkgALQJrADsBBgBRAlwAOwEFAFwDQAA7AqIAOwKmADICawA7AlwAHgGVADsB9wAkAeUAIwKNADsDQAAAAhQAMQI+ADICQwAyAAAAZAEYAYYCVgMMA9wEiAT6Ba4F6gcIB8AIIgjuCYQKDgqmC0ILxgv2DHwNTg3aAAEAAAAXBKsACQC6AAUAAgAuAF0AjQAAAVkODAADAAF4nJyS32oTQRTGf7utpUXrA3g1hF5YsZtUsZT2qhVThEDUini7m8z+qWtm2ZltSK59Di98EPHRZI+TsikGRELYHztnzved7yywzw+2CLb3gJ/hN88BT8IbzyG7YeJ5i9PwmedtDsIdzw8YBr8879ALvnve5SBYet7r8EN6wWfPjzq8H/Q48fyYEyDH4aiwnNGnj2VCTUGFwxJhKSiJMNRk9BkzZMRHcgosiiGGGQ7FNYYUx5yYGo3yFSUFEzQzLJopioYZUzQ1Ckcutde8ZYRiTCW13c6jtQ7PUXyS2603I7XHRPJXHWfruis3MbfEMlNMQikncwrx0Z62uhe8F3acof4zobn8IhwLmaj14EQnYoLhKx8wJDJHO+MbcT9C04hCzhc0QxqWLFlwSUPiHVuOuMRQMv1rEgOOGXAu6TpSYhocRpL5k+hTbqXylIiXHHZ01D0ldafU7XzFmDFXnP+Dw9Vzs8ZrDBULSTWTvBUvGDDgld+olr1s9viOGsMNmoncvpCJc9mJlXnvbzHzO2/7rDbSvjUYMumb+u/P0ie90z4iWdM+/A0AAP//AQAA///3gZyweJxiYGYAg//VDCIMWAAAAAD//wEAAP//JRYBknicNIkxqsJAFEXvvD8/Pg0oVoIWIgpKVjGE11kpFkmdLMAl2AhpdC15hEBiNuCulEnwVueci2OD9zlRY55paVoGI7sqRnGFJSHyVK/tjGky8JYWQc/juGNYgBBGijDu4OB6a/EHiO5McUpKVyTec9GD94YxBEi60r1PL77BWFdkl9/hV29oHtA0asznXtqHEqT6zwOIfAEAAP//AQAA//+b8iuH"); }]]> + .d2-2607227077 .fill-N1{fill:#0A0F25;} + .d2-2607227077 .fill-N2{fill:#676C7E;} + .d2-2607227077 .fill-N3{fill:#9499AB;} + .d2-2607227077 .fill-N4{fill:#CFD2DD;} + .d2-2607227077 .fill-N5{fill:#DEE1EB;} + .d2-2607227077 .fill-N6{fill:#EEF1F8;} + .d2-2607227077 .fill-N7{fill:#FFFFFF;} + .d2-2607227077 .fill-B1{fill:#0D32B2;} + .d2-2607227077 .fill-B2{fill:#0D32B2;} + .d2-2607227077 .fill-B3{fill:#E3E9FD;} + .d2-2607227077 .fill-B4{fill:#E3E9FD;} + .d2-2607227077 .fill-B5{fill:#EDF0FD;} + .d2-2607227077 .fill-B6{fill:#F7F8FE;} + .d2-2607227077 .fill-AA2{fill:#4A6FF3;} + .d2-2607227077 .fill-AA4{fill:#EDF0FD;} + .d2-2607227077 .fill-AA5{fill:#F7F8FE;} + .d2-2607227077 .fill-AB4{fill:#EDF0FD;} + .d2-2607227077 .fill-AB5{fill:#F7F8FE;} + .d2-2607227077 .stroke-N1{stroke:#0A0F25;} + .d2-2607227077 .stroke-N2{stroke:#676C7E;} + .d2-2607227077 .stroke-N3{stroke:#9499AB;} + .d2-2607227077 .stroke-N4{stroke:#CFD2DD;} + .d2-2607227077 .stroke-N5{stroke:#DEE1EB;} + .d2-2607227077 .stroke-N6{stroke:#EEF1F8;} + .d2-2607227077 .stroke-N7{stroke:#FFFFFF;} + .d2-2607227077 .stroke-B1{stroke:#0D32B2;} + .d2-2607227077 .stroke-B2{stroke:#0D32B2;} + .d2-2607227077 .stroke-B3{stroke:#E3E9FD;} + .d2-2607227077 .stroke-B4{stroke:#E3E9FD;} + .d2-2607227077 .stroke-B5{stroke:#EDF0FD;} + .d2-2607227077 .stroke-B6{stroke:#F7F8FE;} + .d2-2607227077 .stroke-AA2{stroke:#4A6FF3;} + .d2-2607227077 .stroke-AA4{stroke:#EDF0FD;} + .d2-2607227077 .stroke-AA5{stroke:#F7F8FE;} + .d2-2607227077 .stroke-AB4{stroke:#EDF0FD;} + .d2-2607227077 .stroke-AB5{stroke:#F7F8FE;} + .d2-2607227077 .background-color-N1{background-color:#0A0F25;} + .d2-2607227077 .background-color-N2{background-color:#676C7E;} + .d2-2607227077 .background-color-N3{background-color:#9499AB;} + .d2-2607227077 .background-color-N4{background-color:#CFD2DD;} + .d2-2607227077 .background-color-N5{background-color:#DEE1EB;} + .d2-2607227077 .background-color-N6{background-color:#EEF1F8;} + .d2-2607227077 .background-color-N7{background-color:#FFFFFF;} + .d2-2607227077 .background-color-B1{background-color:#0D32B2;} + .d2-2607227077 .background-color-B2{background-color:#0D32B2;} + .d2-2607227077 .background-color-B3{background-color:#E3E9FD;} + .d2-2607227077 .background-color-B4{background-color:#E3E9FD;} + .d2-2607227077 .background-color-B5{background-color:#EDF0FD;} + .d2-2607227077 .background-color-B6{background-color:#F7F8FE;} + .d2-2607227077 .background-color-AA2{background-color:#4A6FF3;} + .d2-2607227077 .background-color-AA4{background-color:#EDF0FD;} + .d2-2607227077 .background-color-AA5{background-color:#F7F8FE;} + .d2-2607227077 .background-color-AB4{background-color:#EDF0FD;} + .d2-2607227077 .background-color-AB5{background-color:#F7F8FE;} + .d2-2607227077 .color-N1{color:#0A0F25;} + .d2-2607227077 .color-N2{color:#676C7E;} + .d2-2607227077 .color-N3{color:#9499AB;} + .d2-2607227077 .color-N4{color:#CFD2DD;} + .d2-2607227077 .color-N5{color:#DEE1EB;} + .d2-2607227077 .color-N6{color:#EEF1F8;} + .d2-2607227077 .color-N7{color:#FFFFFF;} + .d2-2607227077 .color-B1{color:#0D32B2;} + .d2-2607227077 .color-B2{color:#0D32B2;} + .d2-2607227077 .color-B3{color:#E3E9FD;} + .d2-2607227077 .color-B4{color:#E3E9FD;} + .d2-2607227077 .color-B5{color:#EDF0FD;} + .d2-2607227077 .color-B6{color:#F7F8FE;} + .d2-2607227077 .color-AA2{color:#4A6FF3;} + .d2-2607227077 .color-AA4{color:#EDF0FD;} + .d2-2607227077 .color-AA5{color:#F7F8FE;} + .d2-2607227077 .color-AB4{color:#EDF0FD;} + .d2-2607227077 .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);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]> @@ -112,7 +112,7 @@ -aidintPKdiskintFKjsonjsonbUNQlast_updatedtimestamp with time zoneb+field[]string+method(a uint64)(x, y int)cd - +aidintPKdiskintFKjsonjsonbUNQlast_updatedtimestamp with time zoneb+field[]string+method(a uint64)(x, y int)cd + \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/class_dark/sketch.exp.svg b/d2renderers/d2sketch/testdata/class_dark/sketch.exp.svg index 959db217a..b78e4a5f0 100644 --- a/d2renderers/d2sketch/testdata/class_dark/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/class_dark/sketch.exp.svg @@ -4,7 +4,7 @@ } @font-face { font-family: d2-3945613123-font-mono; - src: url("data:application/font-woff;base64,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"); + src: url("data:application/font-woff;base64,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"); }]]> @@ -852,7 +852,7 @@ x

linux: because a PC is a terrible thing to waste

-
auserslast_logindatetime You don't have to know how the computer works,just how to work the computer. +auserslast_logindatetime You don't have to know how the computer works,just how to work the computer. \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/opacity_dark/sketch.exp.svg b/d2renderers/d2sketch/testdata/opacity_dark/sketch.exp.svg index 6a3c3fcc0..75cdd729b 100644 --- a/d2renderers/d2sketch/testdata/opacity_dark/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/opacity_dark/sketch.exp.svg @@ -1,28 +1,28 @@ - @@ -850,7 +850,7 @@ x

linux: because a PC is a terrible thing to waste

-
auserslast_logindatetime You don't have to know how the computer works,just how to work the computer. +auserslast_logindatetime You don't have to know how the computer works,just how to work the computer. \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/overlay/sketch.exp.svg b/d2renderers/d2sketch/testdata/overlay/sketch.exp.svg index 97e0bd8a5..b08faacee 100644 --- a/d2renderers/d2sketch/testdata/overlay/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/overlay/sketch.exp.svg @@ -4,7 +4,7 @@ } @font-face { font-family: d2-2779170942-font-bold; - src: url("data:application/font-woff;base64,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"); + src: url("data:application/font-woff;base64,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"); } .sketch-overlay-bright { fill: url(#streaks-bright); diff --git a/d2renderers/d2sketch/testdata/paper-real/sketch.exp.svg b/d2renderers/d2sketch/testdata/paper-real/sketch.exp.svg index 21aa2ef1f..e21488bfa 100644 --- a/d2renderers/d2sketch/testdata/paper-real/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/paper-real/sketch.exp.svg @@ -4,14 +4,14 @@ } @font-face { font-family: d2-3255560050-font-mono; - src: url("data:application/font-woff;base64,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"); + src: url("data:application/font-woff;base64,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"); } .d2-3255560050 .text-mono-italic { font-family: "d2-3255560050-font-mono-italic"; } @font-face { font-family: d2-3255560050-font-mono-italic; - src: url("data:application/font-woff;base64,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"); + src: url("data:application/font-woff;base64,d09GRgABAAAAAAvAAAwAAAAAFRgAAQQZAAAAAAAAAAAAAAAAAAAAAAAAAABPUy8yAAABHAAAAGAAAABglO/WomNtYXAAAAF8AAAAaAAAAHwBUgHoZ2FzcAAAAeQAAAAIAAAACAAAABBnbHlmAAAB7AAABCAAAATQahT5QGhlYWQAAAYMAAAANgAAADYa8dmqaGhlYQAABkQAAAAkAAAAJAbDBCtobXR4AAAGaAAAAEAAAABAJYECqmxvY2EAAAaoAAAAIgAAACIJvghYbWF4cAAABswAAAAgAAAAIABEAmxuYW1lAAAG7AAABKkAAA2O9UFlqnBvc3QAAAuYAAAAIAAAACD/rQAzcHJlcAAAC7gAAAAHAAAAB2gGjIUABAJYAZAABQAAAooCWP/xAEsCigJYAEQBXgAyAR4AAAILAwkDBAMJAgQgAAB3AgA4AwAAAAAAAAAAQURCTwCBACD//wPY/u8AAAQkAcZgAAGTAAAAAAHeApQAAAAgAAN4nFTMT6pBYQCH4ee737n+Hpwl2IpkcDJQUrZheRLFUqzkJzLxDp/Bi6IqaDVO6HQqllY2ejsHx+Qra72t/VvyzCP33HLNJefP47fiT9X4NzA0MjYx1ZqZW/ACAAD//wEAAP//bi0VLgABAAH//wAPeJxElE1wE3UYxt//+9/slubLskmWQPO5ZNd8NGmzyW7ahDQfpNDQph+CAaW0UGix4ljlSxg52EBx0HGWAT1x0UEuHhx1PHhxGA+e1PHg13DyqowzztjB4ZCts0mF2cO+l/d9nnef37tggTIACngbKGwDG2wHN8DZvlBfJCTLIsdpsqBomhjAvjL5xXiPWCdURju3tvYJMzS2MbbwFt5un9FuLC0dfvjX/bkrV248JL8Bbv4BQP5FHezQB7BIFF6kkiSLLMtRTQtxAjl5ZGY6YtnGMv3p/m8OOEnQinp7lVzKvpJRlzXj2veFAgCByc0NrOAdCAPUwpKUzRSpkvYInCSJYQd1uzweJa1qggOJeuC0Ghw5eHpPbsar8aqUmhpNeML1vLw3uNs7XLVVL04V31iZSarxaEiSa4ePDxaOZoO70u6wGxA8ADiAOvSCC+Asr6Q9bpcDRVlJq2o2I4mip9Vaf2dw7trBZrP5ZvXkwijq65eP3FoZKc28f2p+2fRaAMDnUAerOSHE/f8UrpJbduOrGOmzG38rZNqOevnnyqMKmD0iAO7Z6tEUXtRCnEgVTnR89NJdJ/nA8fHKPWcF7eVy+58KAEIMAFdQhx6wAZQJJ/IKVQjVeBFXjFx8stWoMeTw4+Evm6gbe39C3fiUzBg/5I1l6OgtAiBFHSydLWmIW2w1LpCaHfX25xUg4ATASdRNX2d5hRcUjVeoyBepJjqQoyJNUrlTOVvHJJZJ3J1bG28wNoedZSw7dva+WwoThqHIUK6HmUbd+PX4Aom1V8kan0wP8takwhuPCfbsju/e5qsUeOMCEPAC4H7UzQy6mkXaUd1S8ram1iPmwB5mrN5qXI8wTK+VraFuvHB9h6oOuclie5Xcezu0fyxofAgI0c0N1PAO8CADNJ9SY0ZK5XSRZjNP8TGq80q/OnFipDqf7s9OnFDi+3IRl784aL7dgaKtfK4xevnl2VTpfGP00pnZVDW67+iyMnwoGd13dEkZOZQEANrJUerw7oGdWwR1ERIpr6S7DPEaL4qtz4pzmVj9ePZcrjZ/7NT4+HyievV51AN7c9rssM/4kxyaHdOSxo9B4+tuZpHNDfTiHUh0bkDWOsybE2XZ3E1Vn1wEy7pdHkHwo9vFssTSWA1nAwdzsZKUiEzESsqL+dIpX0aoD4lZfzIwFRjalV+ylbPxgSG/Folk3APexnB6OpmLxv0JX6o/MsinXAN5udhMdXycAMDXUAfO3K9L6rcXHtgRHQ/O42S12v6i61cFwDW8aX59kzEHct1ETV9PspWkbOdvoD5bDyNrQYY6+WfoxQqPFguLPdZeXK9/t7AdGQvntb+ON428Pxft7ZGTMkdsvwvVisB16vvtV0mvb1zYsd9nPAKA/wAAAP//AQAA///58P75AAEAAAABBBlwuwfIXw889QADA+gAAAAA3BxzsAAAAADdlx6g/vT+OgMxBCQAAgAGAAIAAAAAAAAAAQAAA9j+7wAAAlj+9P8nAzED6ADC/8UAAAAAAAAAAAAAABACWABBAlgAAAJY/+kCWABNAlgAFgJYADwCWAAjAlgAKgJYAGMCWAAPAlgAGQJYACkCWAAjAlgAJQJYAGICWAA2AAAAKgAqAE4AggCkAL4A1gD2AQYBQAFoAaIB0AIUAigCaAAAAAEAAAAQAfgAKgBxAAYAAQAAAAAAAAAAAAAAAAADAAJ4nJyVz28b1RfFP45Te5ym+eZbSkkKlEcppQ3OxLHaqGoRIv2lGkJSYpcKqiIm9sQZ4l/yjNsG8UewYMWCJRIb/gAWiAXqiiUrViwQKxasWKN35zoet02Ko0r1eXnv3nvuOfe9Aa6m50iTGs8Bj0BxipM8UjzGJH8oTvM2fyseJ59yFR+ilvpYcYazqR8VZ/kp9adih/Nj3yrOcX7sN8WHKaanFB9Jm/Q7iqc4n/lU8SxnMl/FOAUTmR8UpwbcUmNMZ35WnGY686vicSYz/TOHMBnln8qQz04rzlLIvqXYwc02FOcoZr9WPMHF7C+KDydqTSZqHUnUmkrk+V+C83SC8/855owrPsqEM6P4OaacU4qPMekUFD/PtNPneRzHWVH8AhNORfFMgvNsotYJJp1PFL+Y+PtLCQ4vJzicTHB4JcHBJDi8muBwiqPOZ4pfS/A5naj1eoLDGU45Xyh+gyXnG8VnmXH6ep4j7/yleI5Crs/tTU7kbirO4+Y2FM9zMvelYpdi7nvFCxzP/a64wFzuH8WLzEwYxUXyExcVX0hwvi46fIehSIFFChjmdVWU1TI12mzgYyizQ0iET5MQQ4kWVdp06cj/nuzVMJxli4iIDpdYYIEH8s/F283mSmSTBc6Rx/CAgIgtDOv4hPh0ua/ZbtCmRYRhFY+m5WJmKNOmR5cqvpnFTa4xXKVNTdAturQpEeHRIKDKIq50u8RllrnGFda4PBTfj45j54ei969jhs5+KH2EBNKBGaq8RZtIVGhxf3fPZVH3m3hs48upTXweSpUiLhdwWeICS5LrYLwDcdDDEIlzNXHVo8s2hjabB/Y+kE6tlzbuNi1xNt4rC59IHLbVW9RYkHgjfW6JXkYy98TzLoGcdg/E5hYePRoYruFiuKlZ7cRVRFv725NJtLx9WiNMbsQOHXwqbKmeg0kti4YRD0TTgeKxF7ZOqJr0RIW4775qZUqsYFiT/K2hzCtDGWwnT5uyRel3wGy47sD/+3gENPDYoCE7g5voSd1lPhAccQnzmDohVXGoQyQehZLLFQ/qLLDGDVYeY/JsjWryG3u/QW93euLu7NTY+79MWZwvm1kMV2RdoiyK3KFEhZuscZuKrJdZZ51lVqlQ4rrErrEuN3iNVa5JRElwvHdDbsAqH2F4j5Kcsbl91Sd2zN7LjrAPhXs8ywFNOqK5Ze5Kr750OLrDhk3N2o8NJaZKwKacNOJfizo9POo6FR1h2BQt+7MxuHXxRDSlF+vtYL9OW17ertxcm9Wwo2+HndaYU/xCRP/BVfdAM7P3q5Z809blJnrCvK+5Lz0Or+uU5csRYFLvEopeoahplfhcurVvwV0K3NN73aYuL0lHeqzK7O/IKvbrLvP7nPX0feqKPttyfo57T9S2r0pD/tYVZwPqmv0096TPSL2I3zRDi558A7uyG98KXyIW9+XzeKZQe8gLr+s81C/BinCwng2Q/SbX5SW1PN8X7oHwKMsbbO+p7aPGld1fe7bKNnfkxsR5BlX6555W1+z53epPQnJ//hncR802iHz22b11GbXqfpqOmmsvT0bN86SXo2fQyH8BAAD//wEAAP//MIYSVAAAAAADAAD/9QAA/7UAMgAAAAEAAAAAAAAAAAAAAAAAAAAAuAH/hbAEjQA="); } .sketch-overlay-bright { fill: url(#streaks-bright); diff --git a/d2renderers/d2sketch/testdata/root-fill/sketch.exp.svg b/d2renderers/d2sketch/testdata/root-fill/sketch.exp.svg index fb40dcdbc..36f535cbe 100644 --- a/d2renderers/d2sketch/testdata/root-fill/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/root-fill/sketch.exp.svg @@ -4,18 +4,18 @@ } @font-face { font-family: d2-2192944715-font-regular; - src: url("data:application/font-woff;base64,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"); + src: url("data:application/font-woff;base64,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"); } @font-face { font-family: d2-2192944715-font-semibold; - src: url("data:application/font-woff;base64,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"); + src: url("data:application/font-woff;base64,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"); } .d2-2192944715 .text-bold { font-family: "d2-2192944715-font-bold"; } @font-face { font-family: d2-2192944715-font-bold; - src: url("data:application/font-woff;base64,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"); + src: url("data:application/font-woff;base64,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"); }]]> + .d2-4027692135 .fill-N1{fill:#0A0F25;} + .d2-4027692135 .fill-N2{fill:#676C7E;} + .d2-4027692135 .fill-N3{fill:#9499AB;} + .d2-4027692135 .fill-N4{fill:#CFD2DD;} + .d2-4027692135 .fill-N5{fill:#DEE1EB;} + .d2-4027692135 .fill-N6{fill:#EEF1F8;} + .d2-4027692135 .fill-N7{fill:#FFFFFF;} + .d2-4027692135 .fill-B1{fill:#0D32B2;} + .d2-4027692135 .fill-B2{fill:#0D32B2;} + .d2-4027692135 .fill-B3{fill:#E3E9FD;} + .d2-4027692135 .fill-B4{fill:#E3E9FD;} + .d2-4027692135 .fill-B5{fill:#EDF0FD;} + .d2-4027692135 .fill-B6{fill:#F7F8FE;} + .d2-4027692135 .fill-AA2{fill:#4A6FF3;} + .d2-4027692135 .fill-AA4{fill:#EDF0FD;} + .d2-4027692135 .fill-AA5{fill:#F7F8FE;} + .d2-4027692135 .fill-AB4{fill:#EDF0FD;} + .d2-4027692135 .fill-AB5{fill:#F7F8FE;} + .d2-4027692135 .stroke-N1{stroke:#0A0F25;} + .d2-4027692135 .stroke-N2{stroke:#676C7E;} + .d2-4027692135 .stroke-N3{stroke:#9499AB;} + .d2-4027692135 .stroke-N4{stroke:#CFD2DD;} + .d2-4027692135 .stroke-N5{stroke:#DEE1EB;} + .d2-4027692135 .stroke-N6{stroke:#EEF1F8;} + .d2-4027692135 .stroke-N7{stroke:#FFFFFF;} + .d2-4027692135 .stroke-B1{stroke:#0D32B2;} + .d2-4027692135 .stroke-B2{stroke:#0D32B2;} + .d2-4027692135 .stroke-B3{stroke:#E3E9FD;} + .d2-4027692135 .stroke-B4{stroke:#E3E9FD;} + .d2-4027692135 .stroke-B5{stroke:#EDF0FD;} + .d2-4027692135 .stroke-B6{stroke:#F7F8FE;} + .d2-4027692135 .stroke-AA2{stroke:#4A6FF3;} + .d2-4027692135 .stroke-AA4{stroke:#EDF0FD;} + .d2-4027692135 .stroke-AA5{stroke:#F7F8FE;} + .d2-4027692135 .stroke-AB4{stroke:#EDF0FD;} + .d2-4027692135 .stroke-AB5{stroke:#F7F8FE;} + .d2-4027692135 .background-color-N1{background-color:#0A0F25;} + .d2-4027692135 .background-color-N2{background-color:#676C7E;} + .d2-4027692135 .background-color-N3{background-color:#9499AB;} + .d2-4027692135 .background-color-N4{background-color:#CFD2DD;} + .d2-4027692135 .background-color-N5{background-color:#DEE1EB;} + .d2-4027692135 .background-color-N6{background-color:#EEF1F8;} + .d2-4027692135 .background-color-N7{background-color:#FFFFFF;} + .d2-4027692135 .background-color-B1{background-color:#0D32B2;} + .d2-4027692135 .background-color-B2{background-color:#0D32B2;} + .d2-4027692135 .background-color-B3{background-color:#E3E9FD;} + .d2-4027692135 .background-color-B4{background-color:#E3E9FD;} + .d2-4027692135 .background-color-B5{background-color:#EDF0FD;} + .d2-4027692135 .background-color-B6{background-color:#F7F8FE;} + .d2-4027692135 .background-color-AA2{background-color:#4A6FF3;} + .d2-4027692135 .background-color-AA4{background-color:#EDF0FD;} + .d2-4027692135 .background-color-AA5{background-color:#F7F8FE;} + .d2-4027692135 .background-color-AB4{background-color:#EDF0FD;} + .d2-4027692135 .background-color-AB5{background-color:#F7F8FE;} + .d2-4027692135 .color-N1{color:#0A0F25;} + .d2-4027692135 .color-N2{color:#676C7E;} + .d2-4027692135 .color-N3{color:#9499AB;} + .d2-4027692135 .color-N4{color:#CFD2DD;} + .d2-4027692135 .color-N5{color:#DEE1EB;} + .d2-4027692135 .color-N6{color:#EEF1F8;} + .d2-4027692135 .color-N7{color:#FFFFFF;} + .d2-4027692135 .color-B1{color:#0D32B2;} + .d2-4027692135 .color-B2{color:#0D32B2;} + .d2-4027692135 .color-B3{color:#E3E9FD;} + .d2-4027692135 .color-B4{color:#E3E9FD;} + .d2-4027692135 .color-B5{color:#EDF0FD;} + .d2-4027692135 .color-B6{color:#F7F8FE;} + .d2-4027692135 .color-AA2{color:#4A6FF3;} + .d2-4027692135 .color-AA4{color:#EDF0FD;} + .d2-4027692135 .color-AA5{color:#F7F8FE;} + .d2-4027692135 .color-AB4{color:#EDF0FD;} + .d2-4027692135 .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);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]> @@ -97,7 +97,7 @@ -usersidintnamestringemailstringpasswordstringlast_logindatetimeproductsidintpricedecimalskustringnamestringordersidintuser_idintproduct_idintshipmentsidintorder_idinttracking_numberstringPKstatusstring - +usersidintnamestringemailstringpasswordstringlast_logindatetimeproductsidintpricedecimalskustringnamestringordersidintuser_idintproduct_idintshipmentsidintorder_idinttracking_numberstringPKstatusstring + \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/sql_tables_dark/sketch.exp.svg b/d2renderers/d2sketch/testdata/sql_tables_dark/sketch.exp.svg index 202f0a126..7184cfd6c 100644 --- a/d2renderers/d2sketch/testdata/sql_tables_dark/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/sql_tables_dark/sketch.exp.svg @@ -1,10 +1,10 @@ - + .d2-4027692135 .fill-N1{fill:#CDD6F4;} + .d2-4027692135 .fill-N2{fill:#BAC2DE;} + .d2-4027692135 .fill-N3{fill:#A6ADC8;} + .d2-4027692135 .fill-N4{fill:#585B70;} + .d2-4027692135 .fill-N5{fill:#45475A;} + .d2-4027692135 .fill-N6{fill:#313244;} + .d2-4027692135 .fill-N7{fill:#1E1E2E;} + .d2-4027692135 .fill-B1{fill:#CBA6f7;} + .d2-4027692135 .fill-B2{fill:#CBA6f7;} + .d2-4027692135 .fill-B3{fill:#6C7086;} + .d2-4027692135 .fill-B4{fill:#585B70;} + .d2-4027692135 .fill-B5{fill:#45475A;} + .d2-4027692135 .fill-B6{fill:#313244;} + .d2-4027692135 .fill-AA2{fill:#f38BA8;} + .d2-4027692135 .fill-AA4{fill:#45475A;} + .d2-4027692135 .fill-AA5{fill:#313244;} + .d2-4027692135 .fill-AB4{fill:#45475A;} + .d2-4027692135 .fill-AB5{fill:#313244;} + .d2-4027692135 .stroke-N1{stroke:#CDD6F4;} + .d2-4027692135 .stroke-N2{stroke:#BAC2DE;} + .d2-4027692135 .stroke-N3{stroke:#A6ADC8;} + .d2-4027692135 .stroke-N4{stroke:#585B70;} + .d2-4027692135 .stroke-N5{stroke:#45475A;} + .d2-4027692135 .stroke-N6{stroke:#313244;} + .d2-4027692135 .stroke-N7{stroke:#1E1E2E;} + .d2-4027692135 .stroke-B1{stroke:#CBA6f7;} + .d2-4027692135 .stroke-B2{stroke:#CBA6f7;} + .d2-4027692135 .stroke-B3{stroke:#6C7086;} + .d2-4027692135 .stroke-B4{stroke:#585B70;} + .d2-4027692135 .stroke-B5{stroke:#45475A;} + .d2-4027692135 .stroke-B6{stroke:#313244;} + .d2-4027692135 .stroke-AA2{stroke:#f38BA8;} + .d2-4027692135 .stroke-AA4{stroke:#45475A;} + .d2-4027692135 .stroke-AA5{stroke:#313244;} + .d2-4027692135 .stroke-AB4{stroke:#45475A;} + .d2-4027692135 .stroke-AB5{stroke:#313244;} + .d2-4027692135 .background-color-N1{background-color:#CDD6F4;} + .d2-4027692135 .background-color-N2{background-color:#BAC2DE;} + .d2-4027692135 .background-color-N3{background-color:#A6ADC8;} + .d2-4027692135 .background-color-N4{background-color:#585B70;} + .d2-4027692135 .background-color-N5{background-color:#45475A;} + .d2-4027692135 .background-color-N6{background-color:#313244;} + .d2-4027692135 .background-color-N7{background-color:#1E1E2E;} + .d2-4027692135 .background-color-B1{background-color:#CBA6f7;} + .d2-4027692135 .background-color-B2{background-color:#CBA6f7;} + .d2-4027692135 .background-color-B3{background-color:#6C7086;} + .d2-4027692135 .background-color-B4{background-color:#585B70;} + .d2-4027692135 .background-color-B5{background-color:#45475A;} + .d2-4027692135 .background-color-B6{background-color:#313244;} + .d2-4027692135 .background-color-AA2{background-color:#f38BA8;} + .d2-4027692135 .background-color-AA4{background-color:#45475A;} + .d2-4027692135 .background-color-AA5{background-color:#313244;} + .d2-4027692135 .background-color-AB4{background-color:#45475A;} + .d2-4027692135 .background-color-AB5{background-color:#313244;} + .d2-4027692135 .color-N1{color:#CDD6F4;} + .d2-4027692135 .color-N2{color:#BAC2DE;} + .d2-4027692135 .color-N3{color:#A6ADC8;} + .d2-4027692135 .color-N4{color:#585B70;} + .d2-4027692135 .color-N5{color:#45475A;} + .d2-4027692135 .color-N6{color:#313244;} + .d2-4027692135 .color-N7{color:#1E1E2E;} + .d2-4027692135 .color-B1{color:#CBA6f7;} + .d2-4027692135 .color-B2{color:#CBA6f7;} + .d2-4027692135 .color-B3{color:#6C7086;} + .d2-4027692135 .color-B4{color:#585B70;} + .d2-4027692135 .color-B5{color:#45475A;} + .d2-4027692135 .color-B6{color:#313244;} + .d2-4027692135 .color-AA2{color:#f38BA8;} + .d2-4027692135 .color-AA4{color:#45475A;} + .d2-4027692135 .color-AA5{color:#313244;} + .d2-4027692135 .color-AB4{color:#45475A;} + .d2-4027692135 .color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker);mix-blend-mode:lighten}.light-code{display: none}.dark-code{display: block}]]> -usersidintnamestringemailstringpasswordstringlast_logindatetimeproductsidintpricedecimalskustringnamestringordersidintuser_idintproduct_idintshipmentsidintorder_idinttracking_numberstringPKstatusstring - +usersidintnamestringemailstringpasswordstringlast_logindatetimeproductsidintpricedecimalskustringnamestringordersidintuser_idintproduct_idintshipmentsidintorder_idinttracking_numberstringPKstatusstring + \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/terminal/sketch.exp.svg b/d2renderers/d2sketch/testdata/terminal/sketch.exp.svg index 1f42855b1..371d60fe2 100644 --- a/d2renderers/d2sketch/testdata/terminal/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/terminal/sketch.exp.svg @@ -4,14 +4,14 @@ } @font-face { font-family: d2-2687318495-font-mono; - src: url("data:application/font-woff;base64,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"); + src: url("data:application/font-woff;base64,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"); } .d2-2687318495 .text-mono-italic { font-family: "d2-2687318495-font-mono-italic"; } @font-face { font-family: d2-2687318495-font-mono-italic; - src: url("data:application/font-woff;base64,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"); + src: url("data:application/font-woff;base64,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"); }]]>x

linux: because a PC is a terrible thing to waste

-
auserslast_logindatetime You don't have to know how the computer works,just how to work the computer. +auserslast_logindatetime You don't have to know how the computer works,just how to work the computer. \ No newline at end of file diff --git a/d2renderers/d2svg/dark_theme/testdata/overlay/dark_theme.exp.svg b/d2renderers/d2svg/dark_theme/testdata/overlay/dark_theme.exp.svg index 01e49c628..c5d95bd43 100644 --- a/d2renderers/d2svg/dark_theme/testdata/overlay/dark_theme.exp.svg +++ b/d2renderers/d2svg/dark_theme/testdata/overlay/dark_theme.exp.svg @@ -4,7 +4,7 @@ } @font-face { font-family: d2-2779170942-font-bold; - src: url("data:application/font-woff;base64,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"); + src: url("data:application/font-woff;base64,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"); }]]>usersidintnamestringemailstringpasswordstringlast_logindatetimeproductsidintpricedecimalskustringnamestringordersidintuser_idintproduct_idintshipmentsidintorder_idinttracking_numberstringPKstatusstring - + .d2-4027692135 .fill-N1{fill:#CDD6F4;} + .d2-4027692135 .fill-N2{fill:#BAC2DE;} + .d2-4027692135 .fill-N3{fill:#A6ADC8;} + .d2-4027692135 .fill-N4{fill:#585B70;} + .d2-4027692135 .fill-N5{fill:#45475A;} + .d2-4027692135 .fill-N6{fill:#313244;} + .d2-4027692135 .fill-N7{fill:#1E1E2E;} + .d2-4027692135 .fill-B1{fill:#CBA6f7;} + .d2-4027692135 .fill-B2{fill:#CBA6f7;} + .d2-4027692135 .fill-B3{fill:#6C7086;} + .d2-4027692135 .fill-B4{fill:#585B70;} + .d2-4027692135 .fill-B5{fill:#45475A;} + .d2-4027692135 .fill-B6{fill:#313244;} + .d2-4027692135 .fill-AA2{fill:#f38BA8;} + .d2-4027692135 .fill-AA4{fill:#45475A;} + .d2-4027692135 .fill-AA5{fill:#313244;} + .d2-4027692135 .fill-AB4{fill:#45475A;} + .d2-4027692135 .fill-AB5{fill:#313244;} + .d2-4027692135 .stroke-N1{stroke:#CDD6F4;} + .d2-4027692135 .stroke-N2{stroke:#BAC2DE;} + .d2-4027692135 .stroke-N3{stroke:#A6ADC8;} + .d2-4027692135 .stroke-N4{stroke:#585B70;} + .d2-4027692135 .stroke-N5{stroke:#45475A;} + .d2-4027692135 .stroke-N6{stroke:#313244;} + .d2-4027692135 .stroke-N7{stroke:#1E1E2E;} + .d2-4027692135 .stroke-B1{stroke:#CBA6f7;} + .d2-4027692135 .stroke-B2{stroke:#CBA6f7;} + .d2-4027692135 .stroke-B3{stroke:#6C7086;} + .d2-4027692135 .stroke-B4{stroke:#585B70;} + .d2-4027692135 .stroke-B5{stroke:#45475A;} + .d2-4027692135 .stroke-B6{stroke:#313244;} + .d2-4027692135 .stroke-AA2{stroke:#f38BA8;} + .d2-4027692135 .stroke-AA4{stroke:#45475A;} + .d2-4027692135 .stroke-AA5{stroke:#313244;} + .d2-4027692135 .stroke-AB4{stroke:#45475A;} + .d2-4027692135 .stroke-AB5{stroke:#313244;} + .d2-4027692135 .background-color-N1{background-color:#CDD6F4;} + .d2-4027692135 .background-color-N2{background-color:#BAC2DE;} + .d2-4027692135 .background-color-N3{background-color:#A6ADC8;} + .d2-4027692135 .background-color-N4{background-color:#585B70;} + .d2-4027692135 .background-color-N5{background-color:#45475A;} + .d2-4027692135 .background-color-N6{background-color:#313244;} + .d2-4027692135 .background-color-N7{background-color:#1E1E2E;} + .d2-4027692135 .background-color-B1{background-color:#CBA6f7;} + .d2-4027692135 .background-color-B2{background-color:#CBA6f7;} + .d2-4027692135 .background-color-B3{background-color:#6C7086;} + .d2-4027692135 .background-color-B4{background-color:#585B70;} + .d2-4027692135 .background-color-B5{background-color:#45475A;} + .d2-4027692135 .background-color-B6{background-color:#313244;} + .d2-4027692135 .background-color-AA2{background-color:#f38BA8;} + .d2-4027692135 .background-color-AA4{background-color:#45475A;} + .d2-4027692135 .background-color-AA5{background-color:#313244;} + .d2-4027692135 .background-color-AB4{background-color:#45475A;} + .d2-4027692135 .background-color-AB5{background-color:#313244;} + .d2-4027692135 .color-N1{color:#CDD6F4;} + .d2-4027692135 .color-N2{color:#BAC2DE;} + .d2-4027692135 .color-N3{color:#A6ADC8;} + .d2-4027692135 .color-N4{color:#585B70;} + .d2-4027692135 .color-N5{color:#45475A;} + .d2-4027692135 .color-N6{color:#313244;} + .d2-4027692135 .color-N7{color:#1E1E2E;} + .d2-4027692135 .color-B1{color:#CBA6f7;} + .d2-4027692135 .color-B2{color:#CBA6f7;} + .d2-4027692135 .color-B3{color:#6C7086;} + .d2-4027692135 .color-B4{color:#585B70;} + .d2-4027692135 .color-B5{color:#45475A;} + .d2-4027692135 .color-B6{color:#313244;} + .d2-4027692135 .color-AA2{color:#f38BA8;} + .d2-4027692135 .color-AA4{color:#45475A;} + .d2-4027692135 .color-AA5{color:#313244;} + .d2-4027692135 .color-AB4{color:#45475A;} + .d2-4027692135 .color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker);mix-blend-mode:lighten}.light-code{display: none}.dark-code{display: block}]]>usersidintnamestringemailstringpasswordstringlast_logindatetimeproductsidintpricedecimalskustringnamestringordersidintuser_idintproduct_idintshipmentsidintorder_idinttracking_numberstringPKstatusstring + \ No newline at end of file diff --git a/d2renderers/d2svg/dark_theme/testdata/twitter/dark_theme.exp.svg b/d2renderers/d2svg/dark_theme/testdata/twitter/dark_theme.exp.svg index fef10b385..80466cf48 100644 --- a/d2renderers/d2svg/dark_theme/testdata/twitter/dark_theme.exp.svg +++ b/d2renderers/d2svg/dark_theme/testdata/twitter/dark_theme.exp.svg @@ -4,25 +4,25 @@ } @font-face { font-family: d2-4083080277-font-regular; - src: url("data:application/font-woff;base64,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"); + src: url("data:application/font-woff;base64,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"); } @font-face { font-family: d2-4083080277-font-semibold; - src: url("data:application/font-woff;base64,d09GRgABAAAAADRcAA4AAAAAWBwAAQKPAAAAAAAAAAAAAAAAAAAAAAAAAABPUy8yAAABRAAAAFwAAABgY8E/zmNtYXAAAAGgAAAA0QAAAS4G4geuY3Z0IAAAAnQAAAAyAAAASgVEEfRmcGdtAAACqAAABxAAAA4MYi79fGdhc3AAAAm4AAAACAAAAAgAAAAQZ2x5ZgAACcAAACZ5AABAzHQ7FnhoZWFkAAAwPAAAADYAAAA2HceN7GhoZWEAADB0AAAAJAAAACQIDQHSaG10eAAAMJgAAADEAAAA1Hi+CfRsb2NhAAAxXAAAAGwAAABsqyW5eG1heHAAADHIAAAAIAAAACACWxPRbmFtZQAAMegAAAG0AAAD5F+agdBwb3N0AAAznAAAABwAAAAg/34AFHByZXAAADO4AAAApAAAALJqvdaoeJxiYGEKZ9rDwMrAwNTFFMHAwOANoRnjGEQY7RiQwAIGhvoABgZvGN/d39+dYQED728m5pZ/ixgYWNYwZjEwME4GyTFxMK1gYGBQYGAGAAAA//8BAAD//1KODSd4nIzPuS6sARzG4WeWczDGvu/DWGbGjP0GRBQSohK1paBBULktWwjCpaiJRC/+kq9SeuuneH9IyUghL+sDFQVZOQVFZRVVNTNmrVizYcu2HXsOHDlx5iKCxJZ+2WWr1m0mdte+Q8dOnUfEqzTxFu/xGV/xHS/xHE/xGA9xGVdxHTdxG3dxnzz661ImlJR16TWsoiYtI+uf/+rUa5DTKK9Jsxat2rTr0Klbjz79BgwaMqJg1JiicZOmTKsmLXPmLVi0xA8AAAD//wEAAP//YCQ2cgAAAHicYsANsiCQaQMDF9M3xmf/f/97BmEzCYHYDBIQyHSd0RiEAQAAAP//AQAA//+dLRBCAAB4nKxWaXfbxhWdAUFqiSzJ1mI3SNOHjKG6xIBWWsdhbMZRMKIYR01Ly3ILOE0LiJS7L0k3d9835s/codpT91t+Ws8bkKzsWO7pOeUHvjvz7pu3YgAITRD3sm5OtP9ILN/ZR+Pu/QzXAlzJiwc0upfBi8p/zYt5MRiooyAMIXIIo3bHQgpTpAmkBhUPEnhahSpMUNM0PKmtb4jUYM1QUaTWWzepjWoGnjl8SFhS8Iwph/D7D8ee55kiRXj8Qsi74+UNmb5A8IxKx2tyzRSpguhnx/l4U3rOoa9Ri7FhMvaHTWMmhICGhI/68Lfuj6/Ic6Y76KLRzULUovzg3SxUYTDKCP1+FmInDwhtRu08J1uxyyGu9LNwsiJss36bmR/1M3pAo1FJWOxnRUAg1i0yus7oehEUeZ4H8CIsmQHEQQaxz+QQSybYx4uMXtwvH62KATMe1cVRng/LHDLO80kGOQ2xaVSaJ6hr6hL8qBwS5kw/w5xKMa/SIAxzyCJBw5UbtZiGdu4oJVZyukEVPv/DK7oD1JshYd7QiEaQsd2uR/C37mRFPygP8kzlYU7YuZtBxgHXZRJKgjmNBROPhVe1eV5jQaWKIFRawjt6ADmALDDXTLCgiaNdNoNHvjgiPgE7Rc6UYtdFu6jHC8vCdNNmOBuc5/Tjg7RUnSJjBWHgRwV1R6rkprpii4AbAgqwMysYapEqdysX584wx+V+xsY7TzNa1i6hk3NLotbtZ2GgwrwZJljR1vO6GJa7CVY1ZEGEFfM2H0BYUWmOVV4dZIRV16/zmrDqikKPfDEYqRLnTUGjgnBepSrBBb1/mFl/uJtfxrlj9TDBmt6/k+3frTaDML+MNbe/rq24YO5l9sIFA1mmOB/zIwcvSu0K/616UQq5qQi1qJ9ZLh/8KB2NiN2uNkMFWU5xUOnZxIvcTo4V08Oq6RXwHm/WGS20QqypXUgDcWsspXTd2tDCCq97mOGCSqmLZZXinIJXpFT889IlKc6LNZGmKVdgXaWQpV2fj/FhHLyUJ9jUVmzECS5qK1le0tZj+Qltayyf19ZnGWhbZ/mCtg2Wn9R2juWL2s6z/JS2Cyxjrab1R6PYP8wUtSDf46clgT6l3Jwp36+UySnl1kz5QaUkLbASn5knZPmPKlXO83R+obaC4gQvaStZKm09lpe1rbGMtPVZbmlbZ/lpbRssr2g7x/Iz2s6zbGq7wLKlqeMG9qqmApcKMgqyMK6lskCLZ3Zb42qMq80EL2uiHp3RTVW2FV/sz2QEnP1npy22y40uTxxebtq63Ohm27nL8nOnynMW55qmV1zkr2gx4XQ/7hMyfmosvC82/y74t3tLte01ucG5XtfUod4Z8UOYsp3gVd262EnQ/m9USDNoJ3hNW09sRtSiHl8J8KLbo1FP9VRJ2VHAt65Kx20pN9abCW5oiE1cVCn8CH7kaHZJpHjOxMejliLqjNoJbj5Oo1Z1HhoqnbIJBd8pO3eyE5/qFJz4W/Xn85Rv2kVDI+Us1F6BhnnycS34tqveSr4phgp1Uw77GXxTBqibgm+6J21KRQR/S+2V7UBh0ezxG2vROC8FPc2Jqu7Uhim4GfWoRP1jp8Lf4iAiDqIWFcPJTfofX3mCzrQWRIT61qQWqtNO8PpMhUWn31M9dspdvDUrISdTVRriMGtRR4XufTvZJI5r0go0ItSj26e/XaomPm3aJ91SPPJvnIrETNtV8AfOkylPW7yjFbW4inu4aLJ+cJBn1MlbdluuxwnefEx7EPQf06ZPtX2WhdG4ET/L4a7GzXhE1OEZG7XPpqJhWtiOE3RdyjyfW1XlSyyptEqdB1RRh1qqPTl/T9tFP0qnJv/jSPf+X1PMOfE91lHtIDw1L2E+ibOnrbgRT6vylrbiZhyqSV0m2cxKcFtDbFSP/VjwE77WwvVmgrfP2N/XVsj1NbzaTPB5jdeaCd7hKnYVtWhvpMpptb6geaDxTpzgi3osxF6coK/HQjK4o8fS7RzosXQ7d5nTixMcMofBPeYw+BJzGHxZnwghTJwg0yf86RQnyPWJrPbu6xNZ7b3LPMnoK8xz6D3mOfRV5jn0NfbZjRMU7JNByT4ZHLFPBgPmvBUnGDKHwTFzGDxgDoOvu7h24wTfcHEx+qaLi9G3XFyMvu3iYvQdFxej77q4GH3PxcXo+9qKzqyBP3Ar7MQJ3q/gm3GCD7jobpXGCX6orZxwflRB5vzYceSE8xNtxeuzU3/qVs7iYQXZ4mcVZPrPtZUTwi8qyIRfVpAJv9JW3Jqd92u3cvTfVJDpv60g03+nrZwQfl9BJvyhgkz4o7bijdl5f3IrR/9zBZn+lwoy/a/aygnhbxVkwqiCTPhQj59zX7ZoBGPfq3UzFQZhnqcx5o9Ru9x/OH1ZJ/8GAAD//wEAAP//Y0wBRwABAAH//wAPeJzEu2uUJOddH/xc66lLd1V33S/d1Zfqruqenu6e6Z7unp2Znem9r3Zndlfyand7JSSttJa0lizJutjI2PLKWH7hhRcfv7wHc94EArExIYccxIkFB0zgkMAJCfAJkvAFOIEcBxJCIMc4YMe7OXXpnpmVVvhb5sw501X1e2q6/s//8vtfChDQAgD+EfooYEACCvDAo9MZRQgDz3VsyzR0TS1KlHAQQYR3AcEUE3qbQYowRW8AADAB+BmAIERXAULwcQ5CBC/mcgDklJwi5yVR4AEDTOM5qzOMipOaVWTNWrGmFWvF5sSaRJOIRcxiKzwPf0oQ7tyE/9+d5wN48c7fXn9Eu35de+S6dv26gJ4ShW//A76AHv7276DCt//qxBe/WP/STwVf+lLwxS8DABAIgIh+FH0ZbIDL4E/Ov527dG2ae+gcoqiBEYBo19s/xBDtzlKIDyABBIL4iQCBlDwLECruYQ4BoIIL3vm33UvXpnUACSYQ34MCGKt7HJwjB5euTRtzJMCAYPDG4QVz7LQBEEVv3Q+bwWaz2dTa2YRg8/LO5WGvHfklgYENuMEzszOph9FobTyph+FobRtNJuPxZBtPttFwYJqWaVqGzgX1Ho6CehjUOSYTbTgYT0ZrYdRDURgEHMdkzAz9JxSfU6HRKVd6y3mF5wTO810qVtpmre1KK3uWp5V8meXka0q9aLRVSxdz7iec+uYqpcw2KaSYCTzRTI2KWqHirXnY8n2bI5KSr+bz4+2BUFwNo4n93J+9qmhtvzdoi5AwvjMa1OAIYkEyJPPoSISiJYpRt52jfLKfg7vfQp9BvwH64Dp4cSpf2A4qBJMOjxBGu+m2VAAmiGB0GxACbwAIYwkjBG5QCIARy7m8QEBAMCS3Dl2fTY3BCgS7545urFwfXPcc0Id9xswOrYdhFIaj0XgcC2ycHKxt41i2hiEjQ09kbBgyjoaD8XiS4IKgPlobx7jRWpgI3dBNw9A5ztA5BkvRsCKUHZaDBLokb/bPP3TWGFxbx0XFKdNWlHvw+Zdf2Vy5eDqQ5XH9xzxYH6zWy6FSPa1ThPOIilGbNX19bTZsHV2iPKSW6bSrhhSdnzi5qi/QvESb50at8W7feE2oNeSSXutWCI+9muUEZV3nC1a48sTKMt9s8HqkAwAABIO7/xm9ht4GQ/DiOwpEGGbCbQKEKUb0NqAEU/IGwDiTMSAE3ODmIq7fiyMcBAR8cIHHF2ZTDYJ2FNQcSytKAhjC4VzK+1LlEnUN6rF0fRTr6ng8HJix6Lj4F165/Jnd6uYHnt3szjaZrRhWQa2Uxg9vVc32Vth7tF5oWGYtxzNVGLzq7P5fV9ZeeX621jgz8ou8Wa2aoytP9YIHdqJ6RSmVPckUBYXv9DIZABFh9GWwC37j/Nu9S9emogoxopDR2G+IKiTZwez82+1L16YRYJSjjLtNIAaUYXordn2ZdDgO3OAXTqGXiDKDAwhi5/PM/rKD4GkHEIQxefkgnED0DEjRHzqIjn0DBKdOHJ9O1vrd5U6rWS2DXXheYGanWe+hSSzbRDPj39FaosGpTH0U+4agznFsPB4OTUOXEYuV1Ez0ejjYlzssHrsYSVBRNFfAHOQpJ2itujt97ZjWW/JM9ccrgYyCgdkaLx07W9ZESFSj2/+uvmtvRcFZsbP39GbONE1NkbHCGV2TQsJ0r+ISKY/znlXw+6dqkBRXbItBBKsqX+QKkc/ZeqXe5BmJ9yYECsLoHXAEbE7XI4iRDgkexOa8G/tNgMkz+8KnqXAgWF1ZagVVzwZH4BEucZc9FMsgEUMskUnsLoeJ6ukcYzIyDCt9bE5BiSg47ieccp5AWDAYpUQSeUKJt/3itcBaqZrqbzarPP9rmqmXcv8kxyNdCSZbI0WtakKBSTk+hzhEr752ssw7Ja0CBdifljUxLOadIhQp3zzXVFfD1P7+EN1AXwbr4KPvNCGhsf3FkSQACHMYcbcBByjh6DOAsHsNy5u2FygIMIL41j4aADJLTDVZ9uBsakCw2mtHVd8y1ILIg3W4zu+bIZorRr2HUis0zdQKJ2EcRGLtSSEygscf++6N3tXv2XVPHetUdLPktYLh5c1q/dzG5sUyJpDQL7jlmrdZPTttDS8/HVz5/JVTP/DaGSMaVTXX9u3x1aeWx49MpitcQUak7lllQs1hf/2JM61UJt9AX0W/DGbg586/Xbh0bap26wjBAaToodMbPCEU73rpSXzo5CyFuwABShC9lQQGDNPIkDqsVLr+ApF5NHwDYLyPOgBYXAMQLvzeLPFpl85Ntzvtqu85YAavxT7NioUZiyoYrYWrqdTG8YnEpoxYoHG0Tg7jEG0YZmp/sb4FyU4kISfehCRsx5YZfF6WiQIhdleXfYVYZav5d5JGKGOQeHXZYbrt5jWVCrZZLXEEYnVzeyjZpkcQEgtQlEWjLA5aD3YIT/VKrUR49+f1drlm/RUvyWtHVqTykC+6a08OfcE2TZ3n+B9SB81wbFWO+pgRBFGuGH3goaakJ76Swl30k2AHfPv82/Kla79gFBGAcDf1dfERiY+SDwjuzmYJaqpghGL5EbpgVna8U8lpcgMQou5lELpwnrVL1+IQjot7CC5Q8ceDoHYKgvit9wHFbthOQIAASGaHr0+d9BICBCByCxy4Not/pkUINjea9Zpf9sAO3E49SmI1o7V4v7dRTBVGPTRai3d2GPvQA8HL0E3Lx5mfDR43Lc3VKCaYR6KjWQXFlkRv4lHd1vOKI/mQYLdqlTsdWakrVC25hlgw1Ias5zdObRdc37MkxdB0nSqm5aqEcPIXv+TWa4xyumWaPMJYTOPaJnDg19EPgRA89Q6C8XakMi0BhAlG5PbCgx6SRm1xGWIAZ/eCYOxMihDUKo5ZjB1JCMNUIlGiveO5Vx1u48xlcFwQyJh9pCs4lbJtUBWVpaX+kuTLUdOu9fXnpe7asuT0ll/5rx8tdcxa8Znfew0xnkNQsCyvJCJe5FH6TGNA0d+gL4DL4IlpfvfEikIIbEBMYlIY77IV6xN8CxBM3gIY4LcWj+UBBBPS/R5Xkwfa2miFZU8SwGV4OdviRdA0zQq6h2JnnAXFYSWKH0/GCeNeizjOSDgL02VkyOhWyUBboRQ2S60yvxNzfmo4OhGdlu8vucwtCa5uOXmCmFykmJmWSqjhB5rdqpctgadY0DhMEaUUyR6tdtVP/o9X6+3GyPk1gjkiHzk2EZ1eOTpSeuJfP9Wyc07YLjzww+cF4+h0ICq9fqV//solj/JMpK2LbbUmCmGnwfSun/JsANBn0C+DMlgBe6lztPa5Hk34Mpl7RWMeZg6dn021ih8zPH+lspITQRmWY/HV6ok9ZM4uZhY+slJ3Fw1iy9kPNPDMztMPRN/zSvl8zV/XGEchyssodHuXXz26cqZvy/5KfXR1u9bcHV//yNanf6afs4qWZElY08jwuZ0Tn3zyyEvd81eXzLNnVzvnHh0MH9tKc4hvoEfROyACE/DaV2wI4fmU3AYAMo7BOLhSSABHPgQYQzcwjLM0fv600btRSdrHWBYR+PnzWxAMV5datWqlrKvFgiiACEZCEg96KIkHc01KDMKKZRDUwyixE04bJuIIwyBgMvrVcjWPZdhsD/xo1iLtx2bHc+uPPLem+BYkVNMe1Y4ciZorxbcEKlIxGK3rzxz/wYvIifwKESgnVTZX6+s395YxXD1dU5er8CWvs2ra1YIQ7kxjG8JgdPcuXs/2/MT/uV2fhOFkPLaS64zjojCE144/t9d+83X/UlDZ1BmjEMkybnkrs49PB+cHjlIdNNYfORZEF/+hg3JyWzk92xs5nCRtyCuf+Y5V47o2US2R72yM6uqoWPTE5sOZb7n7rYSLXQSfSssDwvmmhQnAcNfLPscJUlY7UPcFhgias4vupWtT80CyhJC6t5CkvqBpB07PZlMFggdO97t6EVyEF2nKI6KMCuwnSVbKS9N8KGYOiVy5oB57oB6Keni0tk0SCQcMy/gfOR6vQWrXW9untorHP/m4DhHWTrVYye4YVtN3c/m8IUlBUxHbHT/cPLEZ9k+dtleJA5FgUtcZX/nZK3qvxNmOVysyWN59oM2rPCuw5aGGBEbVZcM84rplKltKsd2URM+vq5pdVO1mqdkqYnLnmBw1nUS2XQBQHn0ZTMGtVN+agFBICbwNIKIQvQEonROtWMsWTCy4F4eTTPPWQVTCxgYr3U6jnmSYUzhliS5mjH88HCRqFifrsaElokpyITynvEGcAfkkobde7/RmTVHMsqFSd7ScU9xJWOmowdmt5vpstTjaGtdrpl2vtMplp945tXeqs3T6itULvI5vNxx1ZTmP9bBk1x2h2Fg9uTI5H3GyE3pmTTVVsVLwl4LG6pm11XMDN9W7FtDRp9CXwQT8bqJa72CYUKr4L13omwswhHjGUYQznlPcY/Agm6qBODxTcDtDLrjVQeAgKWgtgAhCimGcid6DnIZzUHzmMwBzEM8AARwk3K1EwRGEGD4Y8yMDglazXnVtXRF5xoEJnPBJIhqOxuNJHP2zXRhY+5wgdoCJz4ujpJ5xXdgou2YORmvu1PYij8tx2oXru2rL3Nlul8ycm3PX3YggBCWMcjLPdH3kvfgfXoeEuk7dgogxDnFaWNWaRcwjnN944KzbuWoWuq1cTkk50QC9in4MnAQ3prkixHCnb+D9mpKZsZ1bAFEIEHg6tmKYJAQQw7cAIgDN9jEIPJnAHkoIxMZ6O/JLSg6chCezrBOPEuvNyKCRKFlS3djGiwKHEfNDMykVpTKJmIz/XW+zKmMurzuFgSxAKLtIsg2pJo5OrPQqvJSrG4QSSqtW3aMoZpKjnUuDwYPfdbUyzQ+2JoEiEZ4o00+dVI4e6xp89Myrr404slzpXluekbbrtqloVVcr0vGW2Lhwop3KpoVPop8GD4E/SBMp5QhE8KyGMPIgxXHSFZ8hB87MMy4OAgo+G9smwPQWgZnvc1GscmqccR1GzPOuAyg90WBEYid7+z5okjoEGLPZ20kxBb/xbihMaqcaBCeOjYadpbBRkMFD8CGWbUlS2ksyXtMo6rEPNS1rmGzIZDgwK2g4Ho/Gc94Xb0vsTbOtCVjM9NC/rHc9hSECUa7syTWMJEKwWKl71GpGBW9VeJgIEIZDRyiXVJ0n8DHOri+7zaWc3itiwtyKQ3PBoNU4cmJqrzy4clHtdUqmfOdtZNqc1MjxxrETk9zSjl93/6cAGXz0Z29aHaeWFziH3Pk1fTIKuv7aa8eJvHFsLHlbS2DOd0K0BEKwDn5zKsmQwjpBhMbKLSbV6dhnJsVtYw9QmsQod49BQuanExeRS1IqhNz3A6npdh0CJRXxFLnw3xUAASUwcdiJg78HkZS5WxEEq/1ovbVeKasFSYhzCj7Lp6Nsr0xrYTD63FjCKJrzijCc84q/7F0a861zTx91mhWFL9llg4rFsmcxTOqj6dFgZ1CSa35tZ+ArdXHpTHe4/vKNTVVDba9ZmnxoffmxZcNs1voaqa/XPtg5tVtzho3emb2KM6hl/hq24O+i3wMXwL9K1T93ZqNbq6iYQTTPhPfP0fjcgUOSZsWFJBHDCOAZiSMbBAjGfhXc4BgCGDyY3aeWYgCFiMZI8G7gtJ5hCKCQxJJ+Nyj10rvnTx4frMRpjsDABXghlrFWH40S9Y5p2zaaJAEy9tcxgRvECe7aXO7WwZps7Mnmu8CSD9x/8ouO6apmSVFYrSVXAlZwGtW1EiFl1y8iYu+4lmUX81XV9E3PMnxbxoGEedjyPogMV6toui5SwxEIzkmYWXrg5gWlUrRq3ZLiSyTneVbB5KlAiaQULM2s2bUceV4pwET/N4GIrqJvgi44Br44lcomIrgGKRfrv5qEvSzKuXsAwkQZtT0eUgpuIIYO1gqqcaCjcaC7H27aeDckYXUpji3KtE6/h8Bk1DvWPxY2PFsSeA50UTct1Ma8LahzmfBjcrIWhUntwEoy6MwFLchzouNpsdaEBc1QmG1SVlZdnXBKEUG3IJg+IRC3bx7tzzYG1z96Krp0vN2tNzZXW0VmlCIREiKJTtM2A/OFP3+lvF7SC2ZpvPHq8f7xzt7gxCdvbj4XTi+0qpP6aNsrtFTVzad5t4KKqAZaMX9T36dB4O43CNSUv92Dm1PgA6jEWderfsnQiorAYgNjqXzCjKfNNe1gaXI4MHQZw8LZG6snPrZrHRkHVcsOQ7s2Do32meX2mYbebU/PbitnXjl+/o09wQp903ac1vYpfzgxqsWuFzoyByDQ734O/DF4HejATpId+BaCAHwUAjkHdKjj1BFlCVwaN3QZjWVd5rRmnjdKatFsTo58RCtImqC3bCVwHd2cbrcBAv7dv0Z7WAPLYAf8ZSo52YEA5SEHjkLKxUE1OwGzE5lzaCYOkxGEsZG2FSAEwE0UbH4ezz1x/QBg7miNBEpuxO7WIHPuFwEIOBBntQBwFHC37gefNu5F8pAySCj54GIJTty30esCsD7u7vR2wDLodFrFlsDcjhVngom4rH26Y2SdhtRvJI3I4FBiaJjmVwYnauuPv37M6pgEEiZwvO84iqyIkuOWcgQhsvbhM1x09kiNz+XpypUTER8q+Z0r/WOvP76eh3l1vDkuWLWq7bzyxy8Ob4y0ZnlZV44cf3rp5MWG0Gh50fHLvVa5lsbMv4ZfRypogXXw2++MIOVg5i2qPKSx7qKYHGeqTWDsUtmiltxLe8iAozART4q/F5V2hrPmzkEwiW+OMXhyjp227w8DsYfPwBg8FAveWWrHcbO9vrRer1bKalHkQSutPOyX9VP/kdCXmG8n9DNTYZzmQ3O5w6NnXz8XnXv22PJePzz+gS5bkUUOiYh1Nz0tMs2q125P/c0oKLsbw6q7pnSfurj18ndNghMrvcvHm4wgDtJypFLbM20eQtPq1cv10vLQJkQCEAR3/wD+HfobcBL8t0R077Asz2FxuFr05HkIIPgshVnlXdtjcSLDPQ44Todzhe8AQmP3extByACD4DafpClZFqntAcbSJWy+Ue37LOEAgxy7tVhKL3jT/hwLIEMMxmQTMATeuN+KWdqQWxt2O62wGZQ9JZ8T4zxAyJxHls3Pnf02nsRJ/dyvJd24rP/E4s9y2oRKTvy6UaMYcqIlOb4VNF0sOUtnN/Ldfq2iOctO0JThk0XPrCpCoylxDENKjVZoXd78yCY287Ts2jpHVXPlyvGQFTzDqun9M42gqOsMUwJJf1p1l3l/w1WjUspvune+hlSkggvgt6e50yMDc6wA0SKMrgJGOMJiv4BiPnJ7sVVu7KfQDYCQEUdY/oYAed7k5/lp/96FAFNIWJxJvfey6QgQyihhtwHjKOPe2F+YFQHec91sNi0CAC6AvXZYa0b9eigyv6PNy/PmcLCNJttoNFoLgsQyDlhKshtBYg8JbJEHWIYuk+Bvy6NaTTPLNbu87Bdh7A2Jv3NhGJ1cGj/xqXP6cqVmFSoFfTJb4x2rtxwWlLAg6bJjiYgq1dGlI3e+JtY6jmV6Xrh10mf9tZzIB+dWWyeXTn3/SyflimuVxMKDz03q5fpwWHT7rix6LfV8+9kXn708mNf1KTqL/gZMwC+lJiOJEMGKhgBBu97iCJPFnIsFINTiwJxIS9/D+22YeEe9ey4nLP1wH8YBCBCcdke0w4CYxhJAMLh9CLPfQYlz45VeM/AcOQcmcLLon4yT9kkW4IvWJKtzWWk3rIeiHgnqWcHr5ZKnKMyRrXKBcdBbHR3rhJMq9YlmueUcQRBzoiIV69La433eppG79YmNm7960y3kq72ecucrHPRO7iy1psHv+4XAbm9tFFk46FdKyskvnM2biVwfBn8EfxjuABVUpiUAAYBXAYTgcRQ7pIsQSBxQoYIX3z5my4nNBiH3pmnquSPnji+blp1beuGPfEUzIcEIerIcIi7hpw8CBXwdfQNIoA+u/aJfUHA6bxFvgUXi/3djLl09KcKq6IJ37xV0I7sym2r5HASunevn+4wCCUpcQuf3CTuup9lT1rQw0jLL3LMwjvspf3nNq3SGJzWdUsYQFmzTNghCjMW5NSmhZ8Nm0w/Dhv/tn27pb9LO5qSgrzSsuhqgPB/ULD3XKOcdWSk67fgZ737f3TycoP+YPOM/fqcCMZ0/YQ1gSigmtwFhEBH0Qe7Ac1Gq07mbCOJMHlB8OxkuI2+8G59GyntQkIOAQnALxARhlihzsi5OfaxYUkHNsXR1X1r8u6WVHsznT0bFeRVbj43/T/3hRrPcXvtmfbNR8jRNMXTTyS3XJUWxTR4jTq0fuYwuO8FSVAmixv/6pdaxwJPNslkqbP/ELswrVC01j0zq7Q+98vy1tdiO734DbaO74BT4YpZHUojwNCQYoGRibX5IEDrQ28Zxtnd7X1OSnup+Uu7vt+/miKQnupiKqgIMEcRxTCMQxZJLjX8BSS12fVxy1aIkgFPwFDePYlrWy04bfIO5aiWKhZlhmablY2s/MezhKGCM414wywFxKiWLCjCHqsudvLrc0y2vpYvD6ZZBmcKUrVOb+bxveZrd72ji5MRmgRCdlMWqrsEP/4kxboVr+sbrZySlyAmWWrM8g6emY/GYMpEJrV7Ei4an2tVSmGeN5ZYk/LzuJnb96N1vgT/Fy8AD1WlZSzhH0sxE6eNCUFSABz08b+CnU1yp359PxnCft6xYnTiJsaZWtLGmii6t9OycJdo33/zBT692x+PtV/79yytPrFSCuZ8WMUEquAmXks37xY3IxhyFu176iS04Ty0m2JRLdtXdY5DStBul7xF+4akLSQjlKKEc2QcmgVfP1qTeO97K/RGkWCe6gGOEzZeBxaqk7fVei9yEL80XLaacAOMQu5VgEwkemF2aYwlgBLzxriUH0LOMLF19ePfciWOTUbdTqxQVcBPeFPYDw7z1kZijlRbpsvBgxvlEOq+SjU3E6DDtoMmYcQvVC7MZiuTkZ80apRKhumu4MsOIJyhfaw8r1ZouEkQkfThtVbtlWTB1q4QwyeUE3y/IeVbxXC9PkCiJiOMEnXKmhpFm61g0xLJZ264ebz/Yynmy3q50u0rel6FIrclqtdI1RUMqlE6sNje23d9XAqeq/gLWTcrXfbffG/put7ykCUuDriS4OaG7xLje5gqvVVPd0dGryALb4Kspe5UkSFDdmMf47CiL8WoW4933jvHxeuPQeMOBi4O0EPWuCH5oImB+OWZfs3tBEDyYRfnRMGrG3BdsL6YkDoX5dPeGKffFVlbxTkqyUZiy4IT8vunYHNUFvVgpCQjGGam2NNyOBqdXfJXZrucQxPEcwoYglDw7KktOyxIKJb3c0XuPLnUfakeGEo1MaVoipel6cOSRD91sOGanZArt1Y6oT3SjV++prUt9bbUBktjcAgP0F1gBb4Iv4GrWcDk+RZStQEJ/+DNXMCLPXkUQfQwCSHczayzfg7gKc+hZCHMxiItB5gEQfz9Q7X1B+RTUuz+okIH2r3PvdT0ZZUmfbEnRUJxjiTyHqSohgih5Vi/mMEEFOY+T4qEAGdPYwu+81woMUQ6imV5EuXRZ7uCy+NnXgcCEt7K1HKQ8oTMR8skN+PhfYpzcAuzfAMzXly9dmx5ZrM/fd30BwjyCz4CcDPMgl9+/Qe07vYGMsjuAwzeIZb79/jcABYgKV5PbyMn3uPWuu8T2dSq5C6CM4+jL2c3iu0CJ8NKzgAMEceRDf+/NpufT+zDK3gKU4+hL979XrpDPzd7rjrn8DZDP5R+cpT/T1e/9NAT/9/d9+gvf+yMff/3ll24+9eQTs2sXds+c2N4aDTrtZlCvek6xoMgCB96Ebxr79DebC0x48DaajKL6/gRU4qtjWmCZ5nA4XuRRhsGMwZxBBAFLa8ls0c3OsmGWzkakvjzxIOnEqoy04SQdtk664HG+HLOO/1KxeUie1qxSWBDCkLK8REhhdVDvWFZklmSOs/1yMQ+J23SaPOIFxtmuVXdZQdCarqk8HTu0HMX20CqaBYN3+y4W4JIsUkRKqlVW+NuUwxCJ1j+r1Un+ZYEhTqAMC9XeYNnTlxxS1W2dQggpUyfrGiFQdOyKQfWtjahWKh2pEgJZoTqtWiXf5T7iQU438rU84kl5s1wsUcioaWhFwiMsiA1dqzGtWLK9kccHLVZslSD+UUVCDi+1MSrVRCoQuJjfeQmVgA5CsDcPBItS7Hc6yWEaEPglIzTDnAh0qHNZ9zybIZ4PfkZZ/zxz1IZuwuNnP7HbOVFXB+6x7358fe3qc7uTJ3c2r/dt3y6Uli9vv7y7NrtQV4ulnWfOHb15NnoxurgxPFmT7UL51PLp7bRuf+draA9tgw1wCXx1mlN4xLFVnES69ImitM+UDd64ewLkOHKDwkM8xFz0wTsAA8ZhdgsgNIfdd8m0fQBNbwBK52BwL3Y2m3pbmxCcPL55aetSt7PUqvlxSgE24IaYJhPJ1EY6CDg5kEtso+GBQlxSX9BZGuq0eWE/k6hh6Kb5sYIuOEyTJbuZL6oiz0RL5F0bLW8/f3Ll8oePapEuQEogRBTivPO59tn16vk1ra5MfOQ273xNVU/d+JWbz0m5QkEznacLuuZqOYwZ7Vw7ufWxpzZFZ2dNIpiTy7ISOPD72ycuhuMVzOzNqNDULxY1lvS57v4h/Dn8AGi8R128ARs4LTNGB9Rk3htKksw0DWBwt9p3rt3cfOGc03Gsql2UK/L65d7Zo0q3LohBVT321Q9f/dL3LSuaaumuIOTF5gtvHp99fJS3q65Z5LOa1N1/C/8pvvzu7+JY8+9iLbzR/DWXLLfLPAvjuOuaW11Sju0FlWauu1LM521HC4tPvjB+6rR1dKxZVlnnm9/9Q6e2X1kpRGFeMriSVsw/8NU3Ln/pB1YLIYDg/717F9wBrwEJuAnjOpBFpFnl/jdJs4dfV8tNU/MhakLXqdVLpUoFpLkf/BcIgx74wVRpJT2HMCSxgcb8Ts8hgtKjjN9pBGZTF4lhz1O+eK1OIAYQHxhrNe5Xl9l/+yUhbEGt6jtWQQY92OP2G64HCzPWodJYPX1xSEbPqiqHRZH3FNMUeKE82myobb+t5sxccLQnExJ/Gakk2rX8ufVXJu6K4ymyU/eQ1rAKZcO1xWDFEJZGA7V2NEr3uHH3r+G/QRhMwP8/7zG994yQe3hGaD4x//cPCnnT1n1RAKDZHIuShqkGwVIrbFTKSl5gYAInbD7Sl1g2TseJemR/fD4IUueYjhJx3N+Vzp7sumVVV4xm1Zq0wq3jW2F49ExNG6xUe3l/yct16snJo48rgr0SuZHqeqrku5anG9XRUrTeLAp64PaKKlX1oqnbzfWlo+dqibyad38f/RZ+G1TutYmiAiqwstDEyTY3n8czdCYTxnE3rKakHnv4iace3fOKJUkssEKu/+onXr8VSt5yw9YU58btz//I//PRtmvJkuUY+t5XfuWdH9ssJjM0wd2/gL+FfhJMwI+n7FD0IMENCJPUJDugZFGzMAGhCEFAkpb0wVn8hPoiCCmgENzO+tfPHB7Fr+9fx2S/y/1M2t2GWXM7ecWoXrXNnCjw+3uVjePHNCL+O9kmmS5zhpHV2xMqMS+LcdwfV3yBQidQezntWlGC1PENg0f446bNFeTbkIupL6ScqYcTK9y5fQ6SbrFCdBL0e75VVZBl4mrbIKaGKfZqnjZ54ai+VM7qAegq/O9gB1yZChvdFhfbyLz+t3hXQd+bzxWlyZeBIUym1m8dPH8g3SrIYAfuzF9zGaU+EC+ccdou3SaJCqQvHRyYv4oSv/g7nSPVPMcQFhRH9coSYXmimsX+aNyvM16V+wLFerFk+Q2RU5jS1KtXxObWmWAVt1dycqdTrlpaQwt3I3m5vnz6AxeP5iR5ubF8tb1ZcJ2iVW2X1CMld2i3jsdyWAV+0nMbgNd+oeOg/SKoOZ8iSWWQEJT9eoSZjmBhhN86dHXqHbywMGMyN2MlNuN6VcmDARzQ7AWpJDhkXjqNVKahJ5WG5I2+hbBY8hpUcxyVJC2AcsnyFIoEQcgV8ohXmFjM48eksmNLsvKksua3p6dL/efXWIE3m/5SUWk1c6Iu4kpUpQXHKrE/08tWtXbc/81yN6sR3f0WJvDr4Dz45DtmNqOvpjP6kECUFFQgAW+kmkEPdR4tDCFKhtLQW4AA8tbC8x+SyD1XU8d/dHOlVykXZHAenucytxYl42pZHI/z9Kzd7WNrmIzfHCj20fnoe8Bk8ufN9ciKjQJzjl8sc3aJ16tF5rUdt121VQYRxVpkcF6g6S4kzCjV2323vBqVBIgQIlT1Git08tAHSlK7U8e+seyr6vaHn91YeWpVb5fq4621ApHo5IVRodvwNKEgaKc+8PCZTv/UKQNRTAvbD5zozN9n/AbCSAUX5+/ySf0SgngPpiXV5IikR1lcdQFM3gm+HcdXNx3iOCznQ4ikunIQMUjnRTDEaVTBSVS5Fzf13wUBCGB0i+6PQSUW3QoNLSeCi/Ail/GreGNQEnhZTB+zN0yjA1M6PrKsyT4BS8pdhm75OHtNAf6M6UrIMClVVUaLCirnG5HR9pe7PiLKsiHbLTsosGqNycLneFNUTcYLzU6DFwmlXtXFOT5fEA2N1ps8811NR818WOo6g+5SQ+YJ84+4xZbVLheEzpIo08/xyNUVTRJaKxETBSpQ1h0tUa2kenku3qM730QllAcb4NV3fPj+5m++r/mb35n5dzthwzZjmk4XNf/JNh6N5rF7PoZpWqmvHA4Wg9ZMRr+jqiWJKoo4ObdsMiQYWtOiHEPU96qrUaPR8bpGQannWycqvN28882gWD1SzreXfITJYPeRx9r5zrI/rpqhJbLeSq62Org0uzQY1LfL5fXyw//8urXeSnS3ffdb8Dfg18Ax8Nl3SBwuM7nYMZXCj2dtIULA49wh/SzFAZHQl/eneQkBTywCaA0gSCF6GVBC6EsAJwp4CJPGz+HqSq/q6WpRAcfg1jx+RnFyjyejpHUdZFw/GSFI3+zJpGTstwU4jtVlFHxe6wUEVjqa0F0fFoRlf+xXRWzWChfEUkEf9iv9HdvqWMTlBxdCtVutKkqlIPQ3hnlKLS8cLHtSbzJQCKFyXjYNEUFSqJbrm6uG0TeJL2CUp4bjOJRihAn+3wAAAP//AQAA//8bADB8AAAAAAEAAAABAo9LYIB4Xw889QAPA+gAAAAA3HXwvgAAAADdp1Z5/4j+lwT+BKwAAQAGAAIAAAAAAAAAAQAAA4T+ogAABSn/iP3RBP4AAQAAAAAAAAAAAAAAAAAAADV4nBzOoUoEURTH4d/5X9xm22CyzLhcxQke8JYDIkyxGmxTbIJvoE0ENVgEmW6YbLEIPoDF6AMI08WgmJSd/oVPM7Jdgd6o9IRrwLWHa8FCPa5P3C5wrRJpm6JnXJe4vthVT9EBjQayHol0TugYt1+yzgi1FKuZ64Z1beH2QjX5U8JeObIZh3byd62OsBW6tE/ogUhr5OmxdCPZ3mms5s7uCfuh1gcbNlLpltCcnVSI6dzi9s3mPwAAAP//AQAA//9tOiYQAAAAZABkAUwCAAKCA1ADwARKBRgF7gZYBwAHbgf6CIYJNAnCCngLBgvmDJoNZg4UDoIOsA+AEDYRChHaEoYSthMoE74UchSuFcwWhBjgGUIaDhpUGpgavBtGG94cGhy2HTodwB5oHzofxiBmAAEAAAA1BKsACQC6AAUAAgAuAF0AjQAAAVkODAADAAF4nJyS32oTQRTGf7utpUXrA3g1hF5YsZtUsZT2qhVThEDUini7m8z+qWtm2ZltSK59Di98EPHRZI+TsikGRELYHztnzved7yywzw+2CLb3gJ/hN88BT8IbzyG7YeJ5i9PwmedtDsIdzw8YBr8879ALvnve5SBYet7r8EN6wWfPjzq8H/Q48fyYEyDH4aiwnNGnj2VCTUGFwxJhKSiJMNRk9BkzZMRHcgosiiGGGQ7FNYYUx5yYGo3yFSUFEzQzLJopioYZUzQ1Ckcutde8ZYRiTCW13c6jtQ7PUXyS2603I7XHRPJXHWfruis3MbfEMlNMQikncwrx0Z62uhe8F3acof4zobn8IhwLmaj14EQnYoLhKx8wJDJHO+MbcT9C04hCzhc0QxqWLFlwSUPiHVuOuMRQMv1rEgOOGXAu6TpSYhocRpL5k+hTbqXylIiXHHZ01D0ldafU7XzFmDFXnP+Dw9Vzs8ZrDBULSTWTvBUvGDDgld+olr1s9viOGsMNmoncvpCJc9mJlXnvbzHzO2/7rDbSvjUYMumb+u/P0ie90z4iWdM+/A0AAP//AQAA///3gZyweJxiYGYAg//VDCIMWAAAAAD//wEAAP//JRYBknicNIkxqsJAFEXvvD8/Pg0oVoIWIgpKVjGE11kpFkmdLMAl2AhpdC15hEBiNuCulEnwVueci2OD9zlRY55paVoGI7sqRnGFJSHyVK/tjGky8JYWQc/juGNYgBBGijDu4OB6a/EHiO5McUpKVyTec9GD94YxBEi60r1PL77BWFdkl9/hV29oHtA0asznXtqHEqT6zwOIfAEAAP//AQAA//+b8iuH"); + src: url("data:application/font-woff;base64,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"); } .d2-4083080277 .text-bold { font-family: "d2-4083080277-font-bold"; } @font-face { font-family: d2-4083080277-font-bold; - src: url("data:application/font-woff;base64,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"); + src: url("data:application/font-woff;base64,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"); } .d2-4083080277 .text-italic { font-family: "d2-4083080277-font-italic"; } @font-face { font-family: d2-4083080277-font-italic; - src: url("data:application/font-woff;base64,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"); + src: url("data:application/font-woff;base64,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"); }]]>ab + + +abdc + + +abdce + + + \ No newline at end of file diff --git a/e2etests-cli/testdata/TestCLI_E2E/import.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/import.exp.svg index 5a7b0b15f..6269c6e6f 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/import.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/import.exp.svg @@ -4,7 +4,7 @@ } @font-face { font-family: d2-1393279198-font-bold; - src: url("data:application/font-woff;base64,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"); + src: url("data:application/font-woff;base64,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"); }]]>RefreshAuthorizationPolicyProtocolServerSideTranslatorProtocolBufferRefreshAuthorizationPolicyCacheRefreshAuthorizationPolicyCacheok + .d2-3940939446 .fill-N1{fill:#0A0F25;} + .d2-3940939446 .fill-N2{fill:#676C7E;} + .d2-3940939446 .fill-N3{fill:#9499AB;} + .d2-3940939446 .fill-N4{fill:#CFD2DD;} + .d2-3940939446 .fill-N5{fill:#DEE1EB;} + .d2-3940939446 .fill-N6{fill:#EEF1F8;} + .d2-3940939446 .fill-N7{fill:#FFFFFF;} + .d2-3940939446 .fill-B1{fill:#0D32B2;} + .d2-3940939446 .fill-B2{fill:#0D32B2;} + .d2-3940939446 .fill-B3{fill:#E3E9FD;} + .d2-3940939446 .fill-B4{fill:#E3E9FD;} + .d2-3940939446 .fill-B5{fill:#EDF0FD;} + .d2-3940939446 .fill-B6{fill:#F7F8FE;} + .d2-3940939446 .fill-AA2{fill:#4A6FF3;} + .d2-3940939446 .fill-AA4{fill:#EDF0FD;} + .d2-3940939446 .fill-AA5{fill:#F7F8FE;} + .d2-3940939446 .fill-AB4{fill:#EDF0FD;} + .d2-3940939446 .fill-AB5{fill:#F7F8FE;} + .d2-3940939446 .stroke-N1{stroke:#0A0F25;} + .d2-3940939446 .stroke-N2{stroke:#676C7E;} + .d2-3940939446 .stroke-N3{stroke:#9499AB;} + .d2-3940939446 .stroke-N4{stroke:#CFD2DD;} + .d2-3940939446 .stroke-N5{stroke:#DEE1EB;} + .d2-3940939446 .stroke-N6{stroke:#EEF1F8;} + .d2-3940939446 .stroke-N7{stroke:#FFFFFF;} + .d2-3940939446 .stroke-B1{stroke:#0D32B2;} + .d2-3940939446 .stroke-B2{stroke:#0D32B2;} + .d2-3940939446 .stroke-B3{stroke:#E3E9FD;} + .d2-3940939446 .stroke-B4{stroke:#E3E9FD;} + .d2-3940939446 .stroke-B5{stroke:#EDF0FD;} + .d2-3940939446 .stroke-B6{stroke:#F7F8FE;} + .d2-3940939446 .stroke-AA2{stroke:#4A6FF3;} + .d2-3940939446 .stroke-AA4{stroke:#EDF0FD;} + .d2-3940939446 .stroke-AA5{stroke:#F7F8FE;} + .d2-3940939446 .stroke-AB4{stroke:#EDF0FD;} + .d2-3940939446 .stroke-AB5{stroke:#F7F8FE;} + .d2-3940939446 .background-color-N1{background-color:#0A0F25;} + .d2-3940939446 .background-color-N2{background-color:#676C7E;} + .d2-3940939446 .background-color-N3{background-color:#9499AB;} + .d2-3940939446 .background-color-N4{background-color:#CFD2DD;} + .d2-3940939446 .background-color-N5{background-color:#DEE1EB;} + .d2-3940939446 .background-color-N6{background-color:#EEF1F8;} + .d2-3940939446 .background-color-N7{background-color:#FFFFFF;} + .d2-3940939446 .background-color-B1{background-color:#0D32B2;} + .d2-3940939446 .background-color-B2{background-color:#0D32B2;} + .d2-3940939446 .background-color-B3{background-color:#E3E9FD;} + .d2-3940939446 .background-color-B4{background-color:#E3E9FD;} + .d2-3940939446 .background-color-B5{background-color:#EDF0FD;} + .d2-3940939446 .background-color-B6{background-color:#F7F8FE;} + .d2-3940939446 .background-color-AA2{background-color:#4A6FF3;} + .d2-3940939446 .background-color-AA4{background-color:#EDF0FD;} + .d2-3940939446 .background-color-AA5{background-color:#F7F8FE;} + .d2-3940939446 .background-color-AB4{background-color:#EDF0FD;} + .d2-3940939446 .background-color-AB5{background-color:#F7F8FE;} + .d2-3940939446 .color-N1{color:#0A0F25;} + .d2-3940939446 .color-N2{color:#676C7E;} + .d2-3940939446 .color-N3{color:#9499AB;} + .d2-3940939446 .color-N4{color:#CFD2DD;} + .d2-3940939446 .color-N5{color:#DEE1EB;} + .d2-3940939446 .color-N6{color:#EEF1F8;} + .d2-3940939446 .color-N7{color:#FFFFFF;} + .d2-3940939446 .color-B1{color:#0D32B2;} + .d2-3940939446 .color-B2{color:#0D32B2;} + .d2-3940939446 .color-B3{color:#E3E9FD;} + .d2-3940939446 .color-B4{color:#E3E9FD;} + .d2-3940939446 .color-B5{color:#EDF0FD;} + .d2-3940939446 .color-B6{color:#F7F8FE;} + .d2-3940939446 .color-AA2{color:#4A6FF3;} + .d2-3940939446 .color-AA4{color:#EDF0FD;} + .d2-3940939446 .color-AA5{color:#F7F8FE;} + .d2-3940939446 .color-AB4{color:#EDF0FD;} + .d2-3940939446 .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);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>RefreshAuthorizationPolicyProtocolServerSideTranslatorProtocolBufferRefreshAuthorizationPolicyCacheRefreshAuthorizationPolicyCacheok \ No newline at end of file diff --git a/e2etests/testdata/regression/only_header_class_table/elk/board.exp.json b/e2etests/testdata/regression/only_header_class_table/elk/board.exp.json index d30ca4428..978739f12 100644 --- a/e2etests/testdata/regression/only_header_class_table/elk/board.exp.json +++ b/e2etests/testdata/regression/only_header_class_table/elk/board.exp.json @@ -141,7 +141,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "", + "constraint": null, "reference": "" } ], diff --git a/e2etests/testdata/regression/only_header_class_table/elk/sketch.exp.svg b/e2etests/testdata/regression/only_header_class_table/elk/sketch.exp.svg index 13a8af458..47de3bbf9 100644 --- a/e2etests/testdata/regression/only_header_class_table/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/only_header_class_table/elk/sketch.exp.svg @@ -1,17 +1,17 @@ -RefreshAuthorizationPolicyProtocolServerSideTranslatorProtocolBufferRefreshAuthorizationPolicyCacheRefreshAuthorizationPolicyCacheok + .d2-3935436195 .fill-N1{fill:#0A0F25;} + .d2-3935436195 .fill-N2{fill:#676C7E;} + .d2-3935436195 .fill-N3{fill:#9499AB;} + .d2-3935436195 .fill-N4{fill:#CFD2DD;} + .d2-3935436195 .fill-N5{fill:#DEE1EB;} + .d2-3935436195 .fill-N6{fill:#EEF1F8;} + .d2-3935436195 .fill-N7{fill:#FFFFFF;} + .d2-3935436195 .fill-B1{fill:#0D32B2;} + .d2-3935436195 .fill-B2{fill:#0D32B2;} + .d2-3935436195 .fill-B3{fill:#E3E9FD;} + .d2-3935436195 .fill-B4{fill:#E3E9FD;} + .d2-3935436195 .fill-B5{fill:#EDF0FD;} + .d2-3935436195 .fill-B6{fill:#F7F8FE;} + .d2-3935436195 .fill-AA2{fill:#4A6FF3;} + .d2-3935436195 .fill-AA4{fill:#EDF0FD;} + .d2-3935436195 .fill-AA5{fill:#F7F8FE;} + .d2-3935436195 .fill-AB4{fill:#EDF0FD;} + .d2-3935436195 .fill-AB5{fill:#F7F8FE;} + .d2-3935436195 .stroke-N1{stroke:#0A0F25;} + .d2-3935436195 .stroke-N2{stroke:#676C7E;} + .d2-3935436195 .stroke-N3{stroke:#9499AB;} + .d2-3935436195 .stroke-N4{stroke:#CFD2DD;} + .d2-3935436195 .stroke-N5{stroke:#DEE1EB;} + .d2-3935436195 .stroke-N6{stroke:#EEF1F8;} + .d2-3935436195 .stroke-N7{stroke:#FFFFFF;} + .d2-3935436195 .stroke-B1{stroke:#0D32B2;} + .d2-3935436195 .stroke-B2{stroke:#0D32B2;} + .d2-3935436195 .stroke-B3{stroke:#E3E9FD;} + .d2-3935436195 .stroke-B4{stroke:#E3E9FD;} + .d2-3935436195 .stroke-B5{stroke:#EDF0FD;} + .d2-3935436195 .stroke-B6{stroke:#F7F8FE;} + .d2-3935436195 .stroke-AA2{stroke:#4A6FF3;} + .d2-3935436195 .stroke-AA4{stroke:#EDF0FD;} + .d2-3935436195 .stroke-AA5{stroke:#F7F8FE;} + .d2-3935436195 .stroke-AB4{stroke:#EDF0FD;} + .d2-3935436195 .stroke-AB5{stroke:#F7F8FE;} + .d2-3935436195 .background-color-N1{background-color:#0A0F25;} + .d2-3935436195 .background-color-N2{background-color:#676C7E;} + .d2-3935436195 .background-color-N3{background-color:#9499AB;} + .d2-3935436195 .background-color-N4{background-color:#CFD2DD;} + .d2-3935436195 .background-color-N5{background-color:#DEE1EB;} + .d2-3935436195 .background-color-N6{background-color:#EEF1F8;} + .d2-3935436195 .background-color-N7{background-color:#FFFFFF;} + .d2-3935436195 .background-color-B1{background-color:#0D32B2;} + .d2-3935436195 .background-color-B2{background-color:#0D32B2;} + .d2-3935436195 .background-color-B3{background-color:#E3E9FD;} + .d2-3935436195 .background-color-B4{background-color:#E3E9FD;} + .d2-3935436195 .background-color-B5{background-color:#EDF0FD;} + .d2-3935436195 .background-color-B6{background-color:#F7F8FE;} + .d2-3935436195 .background-color-AA2{background-color:#4A6FF3;} + .d2-3935436195 .background-color-AA4{background-color:#EDF0FD;} + .d2-3935436195 .background-color-AA5{background-color:#F7F8FE;} + .d2-3935436195 .background-color-AB4{background-color:#EDF0FD;} + .d2-3935436195 .background-color-AB5{background-color:#F7F8FE;} + .d2-3935436195 .color-N1{color:#0A0F25;} + .d2-3935436195 .color-N2{color:#676C7E;} + .d2-3935436195 .color-N3{color:#9499AB;} + .d2-3935436195 .color-N4{color:#CFD2DD;} + .d2-3935436195 .color-N5{color:#DEE1EB;} + .d2-3935436195 .color-N6{color:#EEF1F8;} + .d2-3935436195 .color-N7{color:#FFFFFF;} + .d2-3935436195 .color-B1{color:#0D32B2;} + .d2-3935436195 .color-B2{color:#0D32B2;} + .d2-3935436195 .color-B3{color:#E3E9FD;} + .d2-3935436195 .color-B4{color:#E3E9FD;} + .d2-3935436195 .color-B5{color:#EDF0FD;} + .d2-3935436195 .color-B6{color:#F7F8FE;} + .d2-3935436195 .color-AA2{color:#4A6FF3;} + .d2-3935436195 .color-AA4{color:#EDF0FD;} + .d2-3935436195 .color-AA5{color:#F7F8FE;} + .d2-3935436195 .color-AB4{color:#EDF0FD;} + .d2-3935436195 .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);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>RefreshAuthorizationPolicyProtocolServerSideTranslatorProtocolBufferRefreshAuthorizationPolicyCacheRefreshAuthorizationPolicyCacheok \ No newline at end of file diff --git a/e2etests/testdata/regression/opacity-on-label/dagre/sketch.exp.svg b/e2etests/testdata/regression/opacity-on-label/dagre/sketch.exp.svg index 4e1b20160..296359aff 100644 --- a/e2etests/testdata/regression/opacity-on-label/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/opacity-on-label/dagre/sketch.exp.svg @@ -4,25 +4,25 @@ } @font-face { font-family: d2-2927700363-font-regular; - src: url("data:application/font-woff;base64,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"); + src: url("data:application/font-woff;base64,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"); } @font-face { font-family: d2-2927700363-font-semibold; - src: url("data:application/font-woff;base64,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"); + src: url("data:application/font-woff;base64,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"); } .d2-2927700363 .text-bold { font-family: "d2-2927700363-font-bold"; } @font-face { font-family: d2-2927700363-font-bold; - src: url("data:application/font-woff;base64,d09GRgABAAAAAA2wAAoAAAAAFQAAAguFAAAAAAAAAAAAAAAAAAAAAAAAAABPUy8yAAAA9AAAAGAAAABgXxHXrmNtYXAAAAFUAAAAkQAAALoCvQOnZ2x5ZgAAAegAAAcxAAAJoEzftnpoZWFkAAAJHAAAADYAAAA2G38e1GhoZWEAAAlUAAAAJAAAACQKfwXhaG10eAAACXgAAACIAAAAiD0wBPFsb2NhAAAKAAAAAEYAAABGLlQsHG1heHAAAApIAAAAIAAAACAAOgD3bmFtZQAACmgAAAMoAAAIKgjwVkFwb3N0AAANkAAAAB0AAAAg/9EAMgADAioCvAAFAAACigJYAAAASwKKAlgAAAFeADIBKQAAAgsHAwMEAwICBGAAAvcAAAADAAAAAAAAAABBREJPACAAIP//Au7/BgAAA9gBESAAAZ8AAAAAAfAClAAAACAAA3icbMwtbsIAGIDhp2u3dVu3df/dH8FhCAfAcgEsEkGwBMU9uAHgkByAsxA0CQ75kWDhtW/yIJFKUMhMUSmlcnUNTS1tHV09AyOTCM5O39A4IjZxiH3sYhvrWMUyFjGP2cm+XKLmz69/V1KZazdu5e7ce1B49ORZ6cWrN+8+fPpS+fbDEQAA//8BAAD//4ljIFIAAAB4nFxWW2zb1hn+zxFNxgp9kSiSkmxaF1o8kmXLtiiS8S2yYvkSV44vQZy0dezWKLZsTpwucRY3KNCXdNi6BNmmLEgLLB2GDtuApEBRDNg6eMCGpVnR7ind+rKiGTAERR82pRCGPijicCg5tvsgHYEg/+//vv/7fgoaYA4Ar+Lr4IJGaAEviAC6J+KJ6YSonKVbliq7LII83Bz2Vn/5FkkwiQTTFb4ZurSygmaW8fXHp5+dWV3938rQUPXW79+rXkXn3wNAkLLLuA/fhDaAhqimGRnT1NOSzGmaGmVZ0SfpadOSWXRy4bWjx64uZF+IHAlYavfh5OJUPOs/ssAXfnrm9OvzenRZVtLLh154sTOw9BxgmAHAffgK8OCjneppSRJ9LKuqokdPGxlNVWceTF2YmNgYn5/aHB3O4ytkabaw2vspWjildwEAIPsrACziK9ACoBsuXZYkWTdNy9Jd4tbdW4PNwSamub1p6I27n6O3bsTGNW08dqO69DkAYOiyy+hjVIEAqABylBKzHE4ccRiKHpWoLGulTctweP4xP3e5iNVEaLTT6F0bXPnGppsJTe4LxIQjwyH+ePbIiZYI8YvPK53r56r/1tvVc7Jw3J1U/LKDl7PLWMJb4IOQoyRROdWji5wD5lAnadPIqFFOlCQ0HhlTGP58kVHy0eETvcMrJzRzsTvhi/ORsIG3bheCysHvFI69lN2cKHyv50NvM9UDOu0y2kIVCH59Vmp0Z1IsCoyfzU19N5+abB9Xw0Y22+dPCYOxRX7kwsLRjZEOeUUp5EZnxJbnwm3g9E7sMqrgLRAgvK2VU5gY+i6VtDrMl0tnh1YyiQMBtrjpZoIT2E+8QtKnmr38D1+av3Cw3V/4zeOx/qC66Qt86G0emzw8Dtjp/V+oAv66PtsgVBouIkl6mvbu0jMUBYUmzx0aOz00ebKXwdVP3BP9htmvLb/xLumOmvzBjYX5jWx2LS/EGk098nSwAw0mjF7KxQVRuwdzqAK9MATTDhvNyNDmqQGMbVhZF9W6IaPE0Y5awseyLjqkOlGh9luNas4tXw4uH5gU2sL+YGJw2eiO/HaWa8ycsJSQN5qYW3o+//K0QoiiEJJIj5KYHojwbSP3gwe6h+NMUzzUlm5lvPnk8GycX9sf9Q1Md7pbJME7NKbPp9AHXQmSiMcTXdViZ0Budbn8gXbFyQDk6IAcX9EU1f0kelSP0yXnyRW59qfS84eLSrg97sdbt58OJNdOVj9CETMekKvvgG2DBQCf4vtYo9oDB2F4DcC27b/Zw/CZcz1Sv37lCWYH3gLewfTols4JKuHE3DXmZz9/+w9vvpjFW9X1ux9V//mnyUv0fruMvHiL5pS6x6N7npjxr4WhoqexgWO9fIx/9imsPv5E9iJ0poGr4bgUVKHouken2aau28OQe3LmaB4n+o2cEJnun3uqqIRjffSrF5VGQz3JeLR/m3Zf9Z36sa0fqtT1q2Ps1m/TzYRnngiIStmOnj361bzreKrla1tyJ9Z1xyApezafP5vNrufz69meVKon1dNTz93IxtGFCyMXZ0ZzBRq/2s6YwhKqgAAdAPJOd44tNSKLws7KoH0qh8kzp4ZXzPBwsGFWMxeTXb747/Cv+4PqD84f28y2BWZ/jDqfLAyHO7qGKuDdo29ttdeYtxU0sd3tbwq0to/4UOl4ur+h4RWGSaSrDwCBaJfRm6gCxJkrsWhKKVmNpLCR2Skm+iS5A4s+9n7/N7VD0Wwo0qGkgh1D8W8dGzgeOhTMBAcGtPBI4hSvhZYCbbLgkQQ33zmQGF8k/hM+ifgDzfvVgdTYyZrnPXYZreMNkB21DUM1LEsXdVHdteRgaTZf8Fy6eFFV+IBbFiz+24sfnGEvXz5/ryvGMmssX6s1bJfRV6hE57/Hm576avvH/OFiR7hdk4qb+12haX7tJMpUPzMSQQVNVVvHY92AaA6QjUrQBKDveQ29+6vro27BzTQK7tzVX6DSF7EZQmZiX1RbHWw/AC6hkuPv3c/tqqASTaNtcNz1l3/Sx7pZhmtqtF450NjCMVwj1/v9i7d7uCaO4fZz3aj0MDaladPqQ+ecij2str6vTsTjE+r7Dh4dehmVIACgC2QXDCfv4DTfvHar2y25mX3efdGbP3r9Vh8v80yjr5Eg/J85MSmKSXHOfrQgdotiUlqgdUfsMvwX7sD+7bdDzaQ3NF3XNF3nDRI3jDgxav8nDiKAO9RzMjFNEo2qux4pdBwYRJjBqmlq6czSn4/4crFkXEtN5xY2ge6kGhZ6hAnNGsoDS09AUECr8AC/DQ0AAiE6x60rDdcbFLR679VX79W8Dh+jErhqOytXRKVqKyD7Dh6Ao/g+7d2zq5FYKhWLpVJ4oEtVu+iHjpjuw7+jErTu8Tu1DMt2hhItQbfgVuRieOYv+9jTLoYk0KOqYD5jwf8BAAD//wEAAP//rVj77AAAAAABAAAAAguFEz+6KV8PPPUAAQPoAAAAANhdoIQAAAAA3WYvNv43/sQIbQPxAAEAAwACAAAAAAAAAAEAAAPY/u8AAAiY/jf+NwhtAAEAAAAAAAAAAAAAAAAAAAAiArIAUADIAAACRgAuAlQATQIN//gCDwAqAj0AQQHTACQCPQAnAgYAJAIWACICOwBBARQANwEW/80CJABBAR4AQQNZAEECPABBAisAJAI9AEEBjgBBAbsAFQF/ABECOAA8AgsADAMIABgCAgAOASwAPQEsAC4BLAA9ASwATAEUAEEAAP+tARb/zQAAACwALABYAHoAmADQAQIBLgFgAZQB/AIeAioCNgJOAmoCnAK+AuoDGgM6A3YDnAO+A9oEEgQ+BFQEdASABJAEnASyBNAAAAABAAAAIgCQAAwAYwAHAAEAAAAAAAAAAAAAAAAABAADeJyclM9uG1UUxn9ObNMKwQJFVbqJ7oJFkejYVEnVNiuH1IpFFAePC0JCSBPP+I8ynhl5Jg7hCVjzFrxFVzwEz4FYo/l87NgF0SaKknx37vnznXO+c4Ed/mabSvUh8Ec9MVxhr35ueIsH9RPD27TrW4arPKn9abhGWJsbrvN5rWf4I95WfzP8gP3qT4YfslttG/6YZ9Udw59sO/4y/Cn7vF3gCrzgV8MVdskMb7HDj4a3eYTFrFR5RNNwjc/YM1xnD+gzoSBmQsIIx5AJI66YEZHjEzFjwpCIEEeHFjGFviYEQo7Rf34N8CmYESjimAJHjE9MQM7YIv4ir5RzZRzqNLO7FgVjAi7kcUlAgiNlREpCxKXiFBRkvKJBg5yB+GYU5HjkTIjxSJkxokGXNqf0GTMhx9FWpJKZT8qQgmsC5XdmUXZmQERCbqyuSAjF04lfJO8Opzi6ZLJdj3y6EeFLHN/Ju+SWyvYrPP26NWabeZdsAubqZ6yuxLq51gTHui3ztvhWuOAV7l792WTy/h6F+l8o8gVXmn+oSSVikuDcLi18Kch3j3Ec6dzBV0e+p0OfE7q8oa9zix49WpzRp8Nr+Xbp4fiaLmccy6MjvLhrSzFn/IDjGzqyKWNH1p/FxCJ+JjN15+I4Ux1TMvW8ZO6p1kgV3n3C5Q6lG+rI5TPQHpWWTvNLtGcBI1NFJoZT9XKpjdz6F5oipqqlnO3tfbkNc9u95RbfkGqHS7UuOJWTWzB631S9dzRzrR+PgJCUC1kMSJnSoOBGvM8JuCLGcazunWhLClornzLPjVQSMRWDDonizMj0NzDd+MZ9sKF7Z29JKP+S6eWqqvtkcerV7YzeqHvLO9+6HK1NoGFTTdfUNBDXxLQfaafW+fvyzfW6pTzliJSY8F8vwDM8muxzwCFjZRjoZm6vQ1MvRJOXHKr6SyJZDaXnyCIc4PGcAw54yfN3+rhk4oyLW3FZz93imCO6HH5QFQv7Lke8Xn37/6y/i2lTtTierk4v7j3FJ3dQ6xfas9v3sqeJlZOYW7TbrTgjYFpycbvrNbnHeP8AAAD//wEAAP//9LdPUXicYmBmAIP/5xiMGLAAAAAAAP//AQAA//8vAQIDAAAA"); + src: url("data:application/font-woff;base64,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"); } .d2-2927700363 .text-italic { font-family: "d2-2927700363-font-italic"; } @font-face { font-family: d2-2927700363-font-italic; - src: url("data:application/font-woff;base64,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"); + src: url("data:application/font-woff;base64,d09GRgABAAAAAA20AAoAAAAAFZgAARhRAAAAAAAAAAAAAAAAAAAAAAAAAABPUy8yAAAA9AAAAGAAAABgW1SVeGNtYXAAAAFUAAAAkQAAALoCvQPCZ2x5ZgAAAegAAAc1AAAKMEmrf4JoZWFkAAAJIAAAADYAAAA2G7Ur2mhoZWEAAAlYAAAAJAAAACQLeAjGaG10eAAACXwAAACIAAAAiDdaA1Bsb2NhAAAKBAAAAEYAAABGMPguiG1heHAAAApMAAAAIAAAACAAOgD2bmFtZQAACmwAAAMmAAAIMgntVzNwb3N0AAANlAAAACAAAAAg/8YAMgADAeEBkAAFAAACigJY//EASwKKAlgARAFeADIBIwAAAgsFAwMEAwkCBCAAAHcAAAADAAAAAAAAAABBREJPAAEAIP//Au7/BgAAA9gBESAAAZMAAAAAAeYClAAAACAAA3icbMwtbsIAGIDhp2u3dVu3df/dH8FhCAfAcgEsEkGwBMV5AEeC4QCchaBJcMiPBAuvfZMHiVSCQmaJSimVq2toamnr6OoZGJlEcHb6hsYRsYlD7GMX21jHKhYxj1lMT/blEjV/fv27kspcu3Erd+feg8KjJ89KL169effh05fKtx+OAAAA//8BAAD//5tsIG0AAAB4nHyWXWwbWRXHz70zmWkSN4499kzs2J5k7ngmccZO7Ik9cRPb+Y6T2E36kRDafLSwLe1uYEPLR1G3areg1QqkEqS+FCEtEiDB9q37tBIsEkIiAhUhVKFdoA+LdrOoZWHXCsvuis6gGTuJ0wderKuR7j3n/M7//I+hAWQA/CV8GyhoBDd4wQ+gc50UpRsGEShdVQnLGirHsfJNtHXz+/TYqXe7fviJJtJTL/5s9h9n7uLbT9bRjZXr183TL58795nHj80Y+tNjAAAEWWsHx/EPQARokBQl3Z/HeooXWEUhUgv2+3heT2UMgWGQNHsh03fqWmngWFuGyyhH1kZlaWawa6yDyCuusStHy7e/PmXEujvU3DNXhgZX0h3tKTEOABgIAI7jTWgGn525nuL9PoYhhOL0VCbdrxBCvvn68qWZF09e7B9ZO/dsqXgOb84szn8haX6Mpubnsno11xMAOII3wW2/QukCzwt6JmMYOqK+oz83H290N1KC1vbCCfOf/QjQ5i/kCSU6Jf/c3LCcPFRrB32MKuCzMxKkvWJ1Q6eIQRhGTWUMY6/y14ZL2syqruY8NJc/WzhEkyWvMidr/lRIHkuLSdfphclvLOtdnTkzWIz2Did631Kk2PRKqpADJ55o7aAP8Bb47Q4KkqISlnA6y+qZjMOgBaupPLYBSAzL8vwjNeehfIVbZZXH8sm4Ez4tj6Ujfd3SMZLw6a6uzhzeeuNMuOfUoh16ODa9oudzseh7igQIotYOuocqEDpQndNKhvH7djv55twzWvlsWhvi45wS7lvMZI90ZHgpWHadXxm/vNArBfoE//jG2Ohk0JPyRWGXHVbratln9//hHfFSrUp5s0bvaPRpemrH2htPBp7Gh51afokqEIRofTxbOWwns6dKSs/YCrIrfGfxYnx2uc8YibgazF83dozFwlkhEj52x8KUt5ukV13Pnp3YOK4l5lMhvaUwHw14dL+Ios1th0NJcQEwIEtGFVQBERLVfhnVOAbDkINqYRjqQLV3k4tEDk105WdaAsrJ3tx8z/RyUsl7KK5wnrucJcekHj4ZIiN6pPevSjgtSKXhC4q2uDD2lc+mbP1Qa+dRZ0/sD4rUPbnUNzhY1bsIgN7EWxBwpmZfNyxFOLtsWzaUeKvc10p3H9fy6UP50hBNF0PFxATeepwjvSMDomz+Fmm+tsOzsYT5U8uy34RP8T2sOCcGOooAYFnWtywV/uN876x+n9jP4X28BS4nB8rOgyMqy4q3ymfwJ0u/+urRlY0g3jLDCP3OfPf9S1cBgWbtwKd4C7w2xXS/wdnA/L5ay744wlwtX0PIQzEsauJdBU8AP/fke2wj5UV4kKb34uJHqAKxau3V0oUaAOYAgXoYZwssrZxQjiQbepeiuQxN58s5mp7yF7UJm80kX+yZQNvTctLo0vSRAU/EV89n/7TPH1WgrT6Hp/HbEbuPJw7QdyI8DX9vjtBfUAXcEK7XddUMHC3XhvXB3Ko2s5qaW9NmV2PxY3omZf+4LpyeuLyQqP4Oj26Mj06NbYyPTtpvWx9ZOvoAVaozytZl3IKJ4z4sd8Bvmr5dYKjoQsIZ1ZQyxGGv+JN6v7mPXxsW47VBFS+8glDNcJS/Rzv39fECqkBrHSOBVXbZNNPhUjzgb28NyiUxh7ZXtFzj+KHCoHkfkPVfawddQxVQ66ct3a+o9h6qNrxqXn4fLzijz/wouRLoE4aVWK57IJHVprXETCjB6Z1KMtOR7+877urvUsSuBAmqYjDf3TMSlSNdvmBcjCheaUiLj0ftnIesHbSE1/d8MmNwpIB1VmcJVeeTrw/30yg71VySR9qvuq5lqZDUEmz2tPa6CnF38DDyZhteeilvPvJ6I5GmBoN1228PWDvoX2jbntndt/fVz9Ws8u6eMovhKW2iZC+XrpOuUcMjcihjPuACtmTQkhmcIbXdNwiA3kbbcBjAnsLa6uN0dHOqJNMMTXtk7rtl8wnaNt8js0SellHADFbvTgLg36Bte7IP3N0/UYRSFJUwDEtdJKVWhBDtbm+9MevBGNEtwdbrxYdrLc7XsPtraNv8mzQuSeMSitSdgqiJFGW5SMyPAFkPANAfqxwIp9btalYgai0Wq/359NHYoRaWdne4F05sfX5OO+RpolslbhXhd9Z51e/r9q//+8NLfILnNeGyXYtg7cDLsA7Nu3yrhjDJB9QQ3xZ1hfigFuYDGgCy3raWYRPWbW2yaiZjkLoLvubeLIv5CAkHQ6d+nPAOyUE+oMqR6Q3HD504W+ghVqEdhtGXgYF2h+UN9Cp8iF+BBgDOroa9IbhnuRh69c7y8p3qPMB9tA1U1S/Fs+XPoW2nEQim8Czcw/fs3Lm6VK5wESL4wgTPCnygs40PdABy/Pj3aNv+r8PubyJHS0mBeAJNvtZQZ9Pz5edbxt5qaswybLIHy08eTi7+DwAA//8BAAD//6A1EoQAAAAAAQAAAAEYUSNEhHFfDzz1AAED6AAAAADYXaDMAAAAAN1mLzf+vf7dCB0DyQACAAMAAgAAAAAAAAABAAAD2P7vAAAIQP69/bwIHQPoAML/0QAAAAAAAAAAAAAAIgJ0ACQAyAAAAiYAOQImACMBzQBTAhkAJwIYAB8BswAlAhcAJwHhACUCEwABAgsAHwDtAB8A7v+EAdwAHwD4ACwDHwAfAg0AHwIDACcCF//2AVYAHwGS//wBRQA8AhAAOAHAADsCwwBGAa3/1ADyABcA8v/hAPIAFwDyAIAA7QAfAAAARwDu/4QAAAAuAC4AYACEAKQA3AEUAUIBegG0AfwCJgIyAj4CWAJ6ArwC5gMUA04DbAOoA9YEAgQgBFoEhgScBLoExgTWBOQE+gUYAAAAAQAAACIAjAAMAGYABwABAAAAAAAAAAAAAAAAAAQAA3icnJTbThtXFIY/B9tterqoUERu0L5MpWRMoxAl4cqUoIyKcOpxepCqSoM9PojxzMgzmJIn6HXfom+Rqz5Gn6LqdbV/L4MdRUEgBPx79jr8a61/bWCT/9igVr8L/N2cG66x3fzZ8B2+aB4Z3mC/+ZnhOg8b/xhuMGi8NdzkQaNr+BPe1f80/ClP6r8ZvstW/dDw5zyubxr+csPxr+GveMK7Ba7BM/4wXGOLwvAdNvnV8Ab3sJi1OvfYMdzga7YNN9kGekyoSJmQMcIxZMKIM2YklEQkzJgwJGGAI6RNSqWvGbGQY/TBrzERFTNiRRxT4UiJSIkpGVvEt/LKea2MQ51mdtemYkzMiTxOiclw5IzIyUg4VZyKioIXtGhR0hffgoqSgJIJKQE5M0a06HDIET3GTChxHCqSZxaRM6TinFj5nVn4zvRJyCiN1RkZA/F04pfIO+QIR4dCtquRj9YiPMTxo7w9t1y23xLo160wW8+7ZBMzVz9TdSXVzbkmONatz9vmB+GKF7hb9WedyfU9Guh/pcgnnGn+A00qE5MM57ZoE0lBkbuPY1/nkEgd+YmQHq/o8Iaezm26dGlzTI+Ql/Lt0MXxHR2OOZBHKLy4O5RijvkFx/eEsvGxE+vPYmIJv1OYuktxnKmOKYV67pkHqjVRhTefsN+hfE0dpXz62iNv6TS/THsWMzJVFGI4VS+X2iitfwNTxFS1+Nle3fttmNvuLbf4glw77NW64OQnt2B03VSD9zRzrp+AmAE5J7LokzOlRcWFeL8m5owUx4G690pbUtG+9PF5LqSShKkYhGSKM6PQ39h0Exn3/prunb0lA/l7pqeXVd0mi1Ovrmb0Rt1b3kXW5WRlAi2bar6ipr64Zqb9RDu1yj+Sb6nXLecRoeIudvtDr8AOz9llj7Gy9HUzv7zzr4S32FMHTklkNZSmfQ2PCdgl4Cm77PKcp+/1csnGGR+3xmc1f5sD9umwd201C9sO+7xci/bxzH+J7Y7qcTy6PD279TQf3EC132jfrt7NribnpzG3aFfbcUzM1HNxW6s1ufsE/wMAAP//AQAA//9yoVFAAAAAAwAA//UAAP/OADIAAAAAAAAAAAAAAAAAAAAAAAAAAA=="); }]]>sql_table_overflowshortloooooooooooooooooooongloooooooooooooooooooongshortsql_table_constrained_overflowshortloooooooooooooooooooongUNQloooooooooooooooooooongshortFK - + .d2-1684363094 .fill-N1{fill:#0A0F25;} + .d2-1684363094 .fill-N2{fill:#676C7E;} + .d2-1684363094 .fill-N3{fill:#9499AB;} + .d2-1684363094 .fill-N4{fill:#CFD2DD;} + .d2-1684363094 .fill-N5{fill:#DEE1EB;} + .d2-1684363094 .fill-N6{fill:#EEF1F8;} + .d2-1684363094 .fill-N7{fill:#FFFFFF;} + .d2-1684363094 .fill-B1{fill:#0D32B2;} + .d2-1684363094 .fill-B2{fill:#0D32B2;} + .d2-1684363094 .fill-B3{fill:#E3E9FD;} + .d2-1684363094 .fill-B4{fill:#E3E9FD;} + .d2-1684363094 .fill-B5{fill:#EDF0FD;} + .d2-1684363094 .fill-B6{fill:#F7F8FE;} + .d2-1684363094 .fill-AA2{fill:#4A6FF3;} + .d2-1684363094 .fill-AA4{fill:#EDF0FD;} + .d2-1684363094 .fill-AA5{fill:#F7F8FE;} + .d2-1684363094 .fill-AB4{fill:#EDF0FD;} + .d2-1684363094 .fill-AB5{fill:#F7F8FE;} + .d2-1684363094 .stroke-N1{stroke:#0A0F25;} + .d2-1684363094 .stroke-N2{stroke:#676C7E;} + .d2-1684363094 .stroke-N3{stroke:#9499AB;} + .d2-1684363094 .stroke-N4{stroke:#CFD2DD;} + .d2-1684363094 .stroke-N5{stroke:#DEE1EB;} + .d2-1684363094 .stroke-N6{stroke:#EEF1F8;} + .d2-1684363094 .stroke-N7{stroke:#FFFFFF;} + .d2-1684363094 .stroke-B1{stroke:#0D32B2;} + .d2-1684363094 .stroke-B2{stroke:#0D32B2;} + .d2-1684363094 .stroke-B3{stroke:#E3E9FD;} + .d2-1684363094 .stroke-B4{stroke:#E3E9FD;} + .d2-1684363094 .stroke-B5{stroke:#EDF0FD;} + .d2-1684363094 .stroke-B6{stroke:#F7F8FE;} + .d2-1684363094 .stroke-AA2{stroke:#4A6FF3;} + .d2-1684363094 .stroke-AA4{stroke:#EDF0FD;} + .d2-1684363094 .stroke-AA5{stroke:#F7F8FE;} + .d2-1684363094 .stroke-AB4{stroke:#EDF0FD;} + .d2-1684363094 .stroke-AB5{stroke:#F7F8FE;} + .d2-1684363094 .background-color-N1{background-color:#0A0F25;} + .d2-1684363094 .background-color-N2{background-color:#676C7E;} + .d2-1684363094 .background-color-N3{background-color:#9499AB;} + .d2-1684363094 .background-color-N4{background-color:#CFD2DD;} + .d2-1684363094 .background-color-N5{background-color:#DEE1EB;} + .d2-1684363094 .background-color-N6{background-color:#EEF1F8;} + .d2-1684363094 .background-color-N7{background-color:#FFFFFF;} + .d2-1684363094 .background-color-B1{background-color:#0D32B2;} + .d2-1684363094 .background-color-B2{background-color:#0D32B2;} + .d2-1684363094 .background-color-B3{background-color:#E3E9FD;} + .d2-1684363094 .background-color-B4{background-color:#E3E9FD;} + .d2-1684363094 .background-color-B5{background-color:#EDF0FD;} + .d2-1684363094 .background-color-B6{background-color:#F7F8FE;} + .d2-1684363094 .background-color-AA2{background-color:#4A6FF3;} + .d2-1684363094 .background-color-AA4{background-color:#EDF0FD;} + .d2-1684363094 .background-color-AA5{background-color:#F7F8FE;} + .d2-1684363094 .background-color-AB4{background-color:#EDF0FD;} + .d2-1684363094 .background-color-AB5{background-color:#F7F8FE;} + .d2-1684363094 .color-N1{color:#0A0F25;} + .d2-1684363094 .color-N2{color:#676C7E;} + .d2-1684363094 .color-N3{color:#9499AB;} + .d2-1684363094 .color-N4{color:#CFD2DD;} + .d2-1684363094 .color-N5{color:#DEE1EB;} + .d2-1684363094 .color-N6{color:#EEF1F8;} + .d2-1684363094 .color-N7{color:#FFFFFF;} + .d2-1684363094 .color-B1{color:#0D32B2;} + .d2-1684363094 .color-B2{color:#0D32B2;} + .d2-1684363094 .color-B3{color:#E3E9FD;} + .d2-1684363094 .color-B4{color:#E3E9FD;} + .d2-1684363094 .color-B5{color:#EDF0FD;} + .d2-1684363094 .color-B6{color:#F7F8FE;} + .d2-1684363094 .color-AA2{color:#4A6FF3;} + .d2-1684363094 .color-AA4{color:#EDF0FD;} + .d2-1684363094 .color-AA5{color:#F7F8FE;} + .d2-1684363094 .color-AB4{color:#EDF0FD;} + .d2-1684363094 .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);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>sql_table_overflowshortloooooooooooooooooooongloooooooooooooooooooongshortsql_table_constrained_overflowshortloooooooooooooooooooongUNQloooooooooooooooooooongshortFK + \ No newline at end of file diff --git a/e2etests/testdata/regression/sql_table_overflow/elk/board.exp.json b/e2etests/testdata/regression/sql_table_overflow/elk/board.exp.json index b68be23ec..3c6ee9d9e 100644 --- a/e2etests/testdata/regression/sql_table_overflow/elk/board.exp.json +++ b/e2etests/testdata/regression/sql_table_overflow/elk/board.exp.json @@ -55,7 +55,7 @@ "labelWidth": 242, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -83,7 +83,7 @@ "labelWidth": 45, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], @@ -110,7 +110,7 @@ "x": 566, "y": 12 }, - "width": 594, + "width": 592, "height": 108, "opacity": 1, "strokeDash": 0, @@ -155,7 +155,9 @@ "labelWidth": 242, "labelHeight": 26 }, - "constraint": "unique", + "constraint": [ + "unique" + ], "reference": "" }, { @@ -183,7 +185,9 @@ "labelWidth": 45, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" } ], diff --git a/e2etests/testdata/regression/sql_table_overflow/elk/sketch.exp.svg b/e2etests/testdata/regression/sql_table_overflow/elk/sketch.exp.svg index 74cfcbd82..6b83845ad 100644 --- a/e2etests/testdata/regression/sql_table_overflow/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/sql_table_overflow/elk/sketch.exp.svg @@ -1,10 +1,10 @@ -sql_table_overflowshortloooooooooooooooooooongloooooooooooooooooooongshortsql_table_constrained_overflowshortloooooooooooooooooooongUNQloooooooooooooooooooongshortFK - + .d2-1261803308 .fill-N1{fill:#0A0F25;} + .d2-1261803308 .fill-N2{fill:#676C7E;} + .d2-1261803308 .fill-N3{fill:#9499AB;} + .d2-1261803308 .fill-N4{fill:#CFD2DD;} + .d2-1261803308 .fill-N5{fill:#DEE1EB;} + .d2-1261803308 .fill-N6{fill:#EEF1F8;} + .d2-1261803308 .fill-N7{fill:#FFFFFF;} + .d2-1261803308 .fill-B1{fill:#0D32B2;} + .d2-1261803308 .fill-B2{fill:#0D32B2;} + .d2-1261803308 .fill-B3{fill:#E3E9FD;} + .d2-1261803308 .fill-B4{fill:#E3E9FD;} + .d2-1261803308 .fill-B5{fill:#EDF0FD;} + .d2-1261803308 .fill-B6{fill:#F7F8FE;} + .d2-1261803308 .fill-AA2{fill:#4A6FF3;} + .d2-1261803308 .fill-AA4{fill:#EDF0FD;} + .d2-1261803308 .fill-AA5{fill:#F7F8FE;} + .d2-1261803308 .fill-AB4{fill:#EDF0FD;} + .d2-1261803308 .fill-AB5{fill:#F7F8FE;} + .d2-1261803308 .stroke-N1{stroke:#0A0F25;} + .d2-1261803308 .stroke-N2{stroke:#676C7E;} + .d2-1261803308 .stroke-N3{stroke:#9499AB;} + .d2-1261803308 .stroke-N4{stroke:#CFD2DD;} + .d2-1261803308 .stroke-N5{stroke:#DEE1EB;} + .d2-1261803308 .stroke-N6{stroke:#EEF1F8;} + .d2-1261803308 .stroke-N7{stroke:#FFFFFF;} + .d2-1261803308 .stroke-B1{stroke:#0D32B2;} + .d2-1261803308 .stroke-B2{stroke:#0D32B2;} + .d2-1261803308 .stroke-B3{stroke:#E3E9FD;} + .d2-1261803308 .stroke-B4{stroke:#E3E9FD;} + .d2-1261803308 .stroke-B5{stroke:#EDF0FD;} + .d2-1261803308 .stroke-B6{stroke:#F7F8FE;} + .d2-1261803308 .stroke-AA2{stroke:#4A6FF3;} + .d2-1261803308 .stroke-AA4{stroke:#EDF0FD;} + .d2-1261803308 .stroke-AA5{stroke:#F7F8FE;} + .d2-1261803308 .stroke-AB4{stroke:#EDF0FD;} + .d2-1261803308 .stroke-AB5{stroke:#F7F8FE;} + .d2-1261803308 .background-color-N1{background-color:#0A0F25;} + .d2-1261803308 .background-color-N2{background-color:#676C7E;} + .d2-1261803308 .background-color-N3{background-color:#9499AB;} + .d2-1261803308 .background-color-N4{background-color:#CFD2DD;} + .d2-1261803308 .background-color-N5{background-color:#DEE1EB;} + .d2-1261803308 .background-color-N6{background-color:#EEF1F8;} + .d2-1261803308 .background-color-N7{background-color:#FFFFFF;} + .d2-1261803308 .background-color-B1{background-color:#0D32B2;} + .d2-1261803308 .background-color-B2{background-color:#0D32B2;} + .d2-1261803308 .background-color-B3{background-color:#E3E9FD;} + .d2-1261803308 .background-color-B4{background-color:#E3E9FD;} + .d2-1261803308 .background-color-B5{background-color:#EDF0FD;} + .d2-1261803308 .background-color-B6{background-color:#F7F8FE;} + .d2-1261803308 .background-color-AA2{background-color:#4A6FF3;} + .d2-1261803308 .background-color-AA4{background-color:#EDF0FD;} + .d2-1261803308 .background-color-AA5{background-color:#F7F8FE;} + .d2-1261803308 .background-color-AB4{background-color:#EDF0FD;} + .d2-1261803308 .background-color-AB5{background-color:#F7F8FE;} + .d2-1261803308 .color-N1{color:#0A0F25;} + .d2-1261803308 .color-N2{color:#676C7E;} + .d2-1261803308 .color-N3{color:#9499AB;} + .d2-1261803308 .color-N4{color:#CFD2DD;} + .d2-1261803308 .color-N5{color:#DEE1EB;} + .d2-1261803308 .color-N6{color:#EEF1F8;} + .d2-1261803308 .color-N7{color:#FFFFFF;} + .d2-1261803308 .color-B1{color:#0D32B2;} + .d2-1261803308 .color-B2{color:#0D32B2;} + .d2-1261803308 .color-B3{color:#E3E9FD;} + .d2-1261803308 .color-B4{color:#E3E9FD;} + .d2-1261803308 .color-B5{color:#EDF0FD;} + .d2-1261803308 .color-B6{color:#F7F8FE;} + .d2-1261803308 .color-AA2{color:#4A6FF3;} + .d2-1261803308 .color-AA4{color:#EDF0FD;} + .d2-1261803308 .color-AA5{color:#F7F8FE;} + .d2-1261803308 .color-AB4{color:#EDF0FD;} + .d2-1261803308 .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);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>sql_table_overflowshortloooooooooooooooooooongloooooooooooooooooooongshortsql_table_constrained_overflowshortloooooooooooooooooooongUNQloooooooooooooooooooongshortFK + \ No newline at end of file diff --git a/e2etests/testdata/regression/straight_hierarchy_container_direction_right/dagre/sketch.exp.svg b/e2etests/testdata/regression/straight_hierarchy_container_direction_right/dagre/sketch.exp.svg index ee6eede65..c9ae0eb6e 100644 --- a/e2etests/testdata/regression/straight_hierarchy_container_direction_right/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/straight_hierarchy_container_direction_right/dagre/sketch.exp.svg @@ -4,14 +4,14 @@ } @font-face { font-family: d2-2334083304-font-regular; - src: url("data:application/font-woff;base64,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"); + src: url("data:application/font-woff;base64,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"); } .d2-2334083304 .text-bold { font-family: "d2-2334083304-font-bold"; } @font-face { font-family: d2-2334083304-font-bold; - src: url("data:application/font-woff;base64,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"); + src: url("data:application/font-woff;base64,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"); }]]>-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetimea := 5 + .d2-4221205655 .fill-N1{fill:#0A0F25;} + .d2-4221205655 .fill-N2{fill:#676C7E;} + .d2-4221205655 .fill-N3{fill:#9499AB;} + .d2-4221205655 .fill-N4{fill:#CFD2DD;} + .d2-4221205655 .fill-N5{fill:#DEE1EB;} + .d2-4221205655 .fill-N6{fill:#EEF1F8;} + .d2-4221205655 .fill-N7{fill:#FFFFFF;} + .d2-4221205655 .fill-B1{fill:#0D32B2;} + .d2-4221205655 .fill-B2{fill:#0D32B2;} + .d2-4221205655 .fill-B3{fill:#E3E9FD;} + .d2-4221205655 .fill-B4{fill:#E3E9FD;} + .d2-4221205655 .fill-B5{fill:#EDF0FD;} + .d2-4221205655 .fill-B6{fill:#F7F8FE;} + .d2-4221205655 .fill-AA2{fill:#4A6FF3;} + .d2-4221205655 .fill-AA4{fill:#EDF0FD;} + .d2-4221205655 .fill-AA5{fill:#F7F8FE;} + .d2-4221205655 .fill-AB4{fill:#EDF0FD;} + .d2-4221205655 .fill-AB5{fill:#F7F8FE;} + .d2-4221205655 .stroke-N1{stroke:#0A0F25;} + .d2-4221205655 .stroke-N2{stroke:#676C7E;} + .d2-4221205655 .stroke-N3{stroke:#9499AB;} + .d2-4221205655 .stroke-N4{stroke:#CFD2DD;} + .d2-4221205655 .stroke-N5{stroke:#DEE1EB;} + .d2-4221205655 .stroke-N6{stroke:#EEF1F8;} + .d2-4221205655 .stroke-N7{stroke:#FFFFFF;} + .d2-4221205655 .stroke-B1{stroke:#0D32B2;} + .d2-4221205655 .stroke-B2{stroke:#0D32B2;} + .d2-4221205655 .stroke-B3{stroke:#E3E9FD;} + .d2-4221205655 .stroke-B4{stroke:#E3E9FD;} + .d2-4221205655 .stroke-B5{stroke:#EDF0FD;} + .d2-4221205655 .stroke-B6{stroke:#F7F8FE;} + .d2-4221205655 .stroke-AA2{stroke:#4A6FF3;} + .d2-4221205655 .stroke-AA4{stroke:#EDF0FD;} + .d2-4221205655 .stroke-AA5{stroke:#F7F8FE;} + .d2-4221205655 .stroke-AB4{stroke:#EDF0FD;} + .d2-4221205655 .stroke-AB5{stroke:#F7F8FE;} + .d2-4221205655 .background-color-N1{background-color:#0A0F25;} + .d2-4221205655 .background-color-N2{background-color:#676C7E;} + .d2-4221205655 .background-color-N3{background-color:#9499AB;} + .d2-4221205655 .background-color-N4{background-color:#CFD2DD;} + .d2-4221205655 .background-color-N5{background-color:#DEE1EB;} + .d2-4221205655 .background-color-N6{background-color:#EEF1F8;} + .d2-4221205655 .background-color-N7{background-color:#FFFFFF;} + .d2-4221205655 .background-color-B1{background-color:#0D32B2;} + .d2-4221205655 .background-color-B2{background-color:#0D32B2;} + .d2-4221205655 .background-color-B3{background-color:#E3E9FD;} + .d2-4221205655 .background-color-B4{background-color:#E3E9FD;} + .d2-4221205655 .background-color-B5{background-color:#EDF0FD;} + .d2-4221205655 .background-color-B6{background-color:#F7F8FE;} + .d2-4221205655 .background-color-AA2{background-color:#4A6FF3;} + .d2-4221205655 .background-color-AA4{background-color:#EDF0FD;} + .d2-4221205655 .background-color-AA5{background-color:#F7F8FE;} + .d2-4221205655 .background-color-AB4{background-color:#EDF0FD;} + .d2-4221205655 .background-color-AB5{background-color:#F7F8FE;} + .d2-4221205655 .color-N1{color:#0A0F25;} + .d2-4221205655 .color-N2{color:#676C7E;} + .d2-4221205655 .color-N3{color:#9499AB;} + .d2-4221205655 .color-N4{color:#CFD2DD;} + .d2-4221205655 .color-N5{color:#DEE1EB;} + .d2-4221205655 .color-N6{color:#EEF1F8;} + .d2-4221205655 .color-N7{color:#FFFFFF;} + .d2-4221205655 .color-B1{color:#0D32B2;} + .d2-4221205655 .color-B2{color:#0D32B2;} + .d2-4221205655 .color-B3{color:#E3E9FD;} + .d2-4221205655 .color-B4{color:#E3E9FD;} + .d2-4221205655 .color-B5{color:#EDF0FD;} + .d2-4221205655 .color-B6{color:#F7F8FE;} + .d2-4221205655 .color-AA2{color:#4A6FF3;} + .d2-4221205655 .color-AA4{color:#EDF0FD;} + .d2-4221205655 .color-AA5{color:#F7F8FE;} + .d2-4221205655 .color-AB4{color:#EDF0FD;} + .d2-4221205655 .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);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetimea := 5 b := a + 7 fmt.Printf("%d", b)a := 5 b := a + 7 -fmt.Printf("%d", b) +fmt.Printf("%d", b) \ No newline at end of file diff --git a/e2etests/testdata/regression/unnamed_class_table_code/elk/board.exp.json b/e2etests/testdata/regression/unnamed_class_table_code/elk/board.exp.json index 377e5f144..115ff55e5 100644 --- a/e2etests/testdata/regression/unnamed_class_table_code/elk/board.exp.json +++ b/e2etests/testdata/regression/unnamed_class_table_code/elk/board.exp.json @@ -130,7 +130,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -158,7 +158,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -186,7 +186,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -214,7 +214,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -242,7 +242,7 @@ "labelWidth": 77, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], diff --git a/e2etests/testdata/regression/unnamed_class_table_code/elk/sketch.exp.svg b/e2etests/testdata/regression/unnamed_class_table_code/elk/sketch.exp.svg index fbc2e09bf..546c5c559 100644 --- a/e2etests/testdata/regression/unnamed_class_table_code/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/unnamed_class_table_code/elk/sketch.exp.svg @@ -1,24 +1,24 @@ --numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetimea := 5 + .d2-2359991916 .fill-N1{fill:#0A0F25;} + .d2-2359991916 .fill-N2{fill:#676C7E;} + .d2-2359991916 .fill-N3{fill:#9499AB;} + .d2-2359991916 .fill-N4{fill:#CFD2DD;} + .d2-2359991916 .fill-N5{fill:#DEE1EB;} + .d2-2359991916 .fill-N6{fill:#EEF1F8;} + .d2-2359991916 .fill-N7{fill:#FFFFFF;} + .d2-2359991916 .fill-B1{fill:#0D32B2;} + .d2-2359991916 .fill-B2{fill:#0D32B2;} + .d2-2359991916 .fill-B3{fill:#E3E9FD;} + .d2-2359991916 .fill-B4{fill:#E3E9FD;} + .d2-2359991916 .fill-B5{fill:#EDF0FD;} + .d2-2359991916 .fill-B6{fill:#F7F8FE;} + .d2-2359991916 .fill-AA2{fill:#4A6FF3;} + .d2-2359991916 .fill-AA4{fill:#EDF0FD;} + .d2-2359991916 .fill-AA5{fill:#F7F8FE;} + .d2-2359991916 .fill-AB4{fill:#EDF0FD;} + .d2-2359991916 .fill-AB5{fill:#F7F8FE;} + .d2-2359991916 .stroke-N1{stroke:#0A0F25;} + .d2-2359991916 .stroke-N2{stroke:#676C7E;} + .d2-2359991916 .stroke-N3{stroke:#9499AB;} + .d2-2359991916 .stroke-N4{stroke:#CFD2DD;} + .d2-2359991916 .stroke-N5{stroke:#DEE1EB;} + .d2-2359991916 .stroke-N6{stroke:#EEF1F8;} + .d2-2359991916 .stroke-N7{stroke:#FFFFFF;} + .d2-2359991916 .stroke-B1{stroke:#0D32B2;} + .d2-2359991916 .stroke-B2{stroke:#0D32B2;} + .d2-2359991916 .stroke-B3{stroke:#E3E9FD;} + .d2-2359991916 .stroke-B4{stroke:#E3E9FD;} + .d2-2359991916 .stroke-B5{stroke:#EDF0FD;} + .d2-2359991916 .stroke-B6{stroke:#F7F8FE;} + .d2-2359991916 .stroke-AA2{stroke:#4A6FF3;} + .d2-2359991916 .stroke-AA4{stroke:#EDF0FD;} + .d2-2359991916 .stroke-AA5{stroke:#F7F8FE;} + .d2-2359991916 .stroke-AB4{stroke:#EDF0FD;} + .d2-2359991916 .stroke-AB5{stroke:#F7F8FE;} + .d2-2359991916 .background-color-N1{background-color:#0A0F25;} + .d2-2359991916 .background-color-N2{background-color:#676C7E;} + .d2-2359991916 .background-color-N3{background-color:#9499AB;} + .d2-2359991916 .background-color-N4{background-color:#CFD2DD;} + .d2-2359991916 .background-color-N5{background-color:#DEE1EB;} + .d2-2359991916 .background-color-N6{background-color:#EEF1F8;} + .d2-2359991916 .background-color-N7{background-color:#FFFFFF;} + .d2-2359991916 .background-color-B1{background-color:#0D32B2;} + .d2-2359991916 .background-color-B2{background-color:#0D32B2;} + .d2-2359991916 .background-color-B3{background-color:#E3E9FD;} + .d2-2359991916 .background-color-B4{background-color:#E3E9FD;} + .d2-2359991916 .background-color-B5{background-color:#EDF0FD;} + .d2-2359991916 .background-color-B6{background-color:#F7F8FE;} + .d2-2359991916 .background-color-AA2{background-color:#4A6FF3;} + .d2-2359991916 .background-color-AA4{background-color:#EDF0FD;} + .d2-2359991916 .background-color-AA5{background-color:#F7F8FE;} + .d2-2359991916 .background-color-AB4{background-color:#EDF0FD;} + .d2-2359991916 .background-color-AB5{background-color:#F7F8FE;} + .d2-2359991916 .color-N1{color:#0A0F25;} + .d2-2359991916 .color-N2{color:#676C7E;} + .d2-2359991916 .color-N3{color:#9499AB;} + .d2-2359991916 .color-N4{color:#CFD2DD;} + .d2-2359991916 .color-N5{color:#DEE1EB;} + .d2-2359991916 .color-N6{color:#EEF1F8;} + .d2-2359991916 .color-N7{color:#FFFFFF;} + .d2-2359991916 .color-B1{color:#0D32B2;} + .d2-2359991916 .color-B2{color:#0D32B2;} + .d2-2359991916 .color-B3{color:#E3E9FD;} + .d2-2359991916 .color-B4{color:#E3E9FD;} + .d2-2359991916 .color-B5{color:#EDF0FD;} + .d2-2359991916 .color-B6{color:#F7F8FE;} + .d2-2359991916 .color-AA2{color:#4A6FF3;} + .d2-2359991916 .color-AA4{color:#EDF0FD;} + .d2-2359991916 .color-AA5{color:#F7F8FE;} + .d2-2359991916 .color-AB4{color:#EDF0FD;} + .d2-2359991916 .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);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetimea := 5 b := a + 7 fmt.Printf("%d", b)a := 5 b := a + 7 -fmt.Printf("%d", b) +fmt.Printf("%d", b) \ No newline at end of file diff --git a/e2etests/testdata/root/border-radius/dagre/sketch.exp.svg b/e2etests/testdata/root/border-radius/dagre/sketch.exp.svg index b2dc03c32..d4d66512b 100644 --- a/e2etests/testdata/root/border-radius/dagre/sketch.exp.svg +++ b/e2etests/testdata/root/border-radius/dagre/sketch.exp.svg @@ -4,7 +4,7 @@ } @font-face { font-family: d2-1980001305-font-bold; - src: url("data:application/font-woff;base64,d09GRgABAAAAAAtgAAoAAAAAEcwAAguFAAAAAAAAAAAAAAAAAAAAAAAAAABPUy8yAAAA9AAAAGAAAABgXxHXrmNtYXAAAAFUAAAAeAAAAJQCCgK8Z2x5ZgAAAcwAAAVFAAAG3BuLU1ZoZWFkAAAHFAAAADYAAAA2G38e1GhoZWEAAAdMAAAAJAAAACQKfwXVaG10eAAAB3AAAABYAAAAWCmbA65sb2NhAAAHyAAAAC4AAAAuFWAT2G1heHAAAAf4AAAAIAAAACAALgD3bmFtZQAACBgAAAMoAAAIKgjwVkFwb3N0AAALQAAAAB0AAAAg/9EAMgADAioCvAAFAAACigJYAAAASwKKAlgAAAFeADIBKQAAAgsHAwMEAwICBGAAAvcAAAADAAAAAAAAAABBREJPACAAIP//Au7/BgAAA9gBESAAAZ8AAAAAAfAClAAAACAAA3icZMw7DgFhGEDR85vxHozHAqxFrbMCkolIRKGZzUiE2IBKaytW8kmm0LjlLQ6STEIhV2OhlMktraxt7FQOTuoIfnersnd0johPvOMVz3jEPW5xjUvj/Ze0Grmto6unb2CoMDI2UZqamfMFAAD//wEAAP//g9Uat3icVFRPbNP+FX/fb1x7SV1aJ3GcpHH+2LUdp03SxHHcNOmvDU1TaBto19IG0T8CaX9YAW0FiYKQuKBtmoomLT2gHTZp2rQLOyC0w5C6IxvabkXjNLFNEwdO0RRNOxRnsh36o4fkHWy/z/v8eQ/6YBkA38CH4AI3DIIXWACNSTCSpigiZWiGIXIuQ0EMtYy95m9+raiEqhKp+LPYw50d1NjGh59uXWvcuPHfnXLZ/MUfXplP0d1XAC5oAOAKPgAGwiBYPbV8IMD6SYq1Cym6tHxRL8iiyGh5uzbe127NpJP52dre/M5cMZcv1FcfVKZW8QFfnx5dHSQGFquzayr6UUqU42azOSoBIAsH/QsfQJ+NwSTYRgthfPCp/QjAei52O9iDn0EKoE+QFSMQcHAVJYP1QrGo5QMcJcuiQLL+AMc5wyH/zOP8mriezKS10SuJily+WZv4fmoxPqPI6VJqrVyfvEOPZ74VlQU+xntHzmXr2WKzMJbaCg3HItEoIwTX5oqbE4Ah1e2gt+gEQiACcIKsF4qGDUcpNjjLiIpIkka+aOikNcMfa8tPWlhUYzMjenZ3cufb+x4iNv+NkOS7VInRG9OXmoMJJche50fu7Jn/1iLiHufb8IzyQQ4AMFS7HRzAR+CHmMNYpERGYykbzCanWPxFwTICzSVmeYK+2yL4mlBpZis7Tbm4Pqb6k3QiruOj50th/qsfLF15ML1fX/ph+i/eczbGSLeD/olOINjDkHtC2v4mLIUNjiRdWsHiiWLze+dnb5Xnt7IENt956jm9mJO3f/5SGROK9Ff3vrlyb3p6t+aT3EUtcTUcRZOqnrW8c4HQTWMKnUAWyrBgqyfrBUO38XqlqOU5jRV7mRIUS0HNktVPki4nYLazvl7YBNl+5T+T2xPzvuF4MKxObutjid9fptyFpsHHvIK6vHm99miBVxSeVxQ1P6NIWihBD08dhyfGKkliIBkbzg8R3tpo5XKS3u0X/KWFEc9gwOctz2orGfQmpSpqMqmmzNZIiBtyuYKhCO9ksWqJZ3tjZbXnCcuIjD0lxVRbVGQxv3KxxccjySA+en41NLq7Zf4VJYrJEGe+gG4XDAD4Oz7GstUFKGDhJ07vbgd58REMOiljNMZvJd0y4s9L5Rbj7qNILy3R1xax+Okd50Xodh/lzOTi0Qkk7Jk4zdmIM5NRp7VqZbGe06u+xEJuebHFx6Vx6y+L2jOx9GhSyH0ed9x80SufeaOTHu8expe89z1EvHFKHLWno+kzvJ0e6KfoBLxn5nQ21+kwvCSzEU9wIDQUmfKj9kY+19f3mCDUvPkPQMB2O+iX6AQUW5+v74Ds3IHTZtYViGLWTx7nviOfF6ZjiSifCUfLyZtXShux8+FCuFSS41Pqd2k5thka5nxMwOehR0rq3LoSbPoDSjB0rl8sZWa3HM+ZbgfdwfeAszdF10XdMDRWY0X21B8Em5drS8zD+/dFng55OJ9Bf2/9zW3yyZO7f0pJJLFL0k6vSreD/ofalo5nPGY054j8beViKxqPyIHWfr8rtkDvbqGC+V5Xwzy6YA7NSWOAgAZAXdSGAQDNpXGBgCWlYWiul789nPH4PITb56k+/RVqf5QaitKQPppDNnYQALdR287Jl9990UFUZNkag6IOH/1snPSQBDXgNh5PuAcpgnJT2R/ff56mBiiC6qfGUPuDdEGWF8QPdr0gfTCHXov1ZLIuvv68K/AWtcHl3PVqC7XNIUDd3+ESrOJj6Adg7GvqLLuUyUhSJoNLKVFMWT/4PwAAAP//AQAA//8yz1lYAAAAAAEAAAACC4XQeM5DXw889QABA+gAAAAA2F2ghAAAAADdZi82/jf+xAhtA/EAAQADAAIAAAAAAAAAAQAAA9j+7wAACJj+N/43CG0AAQAAAAAAAAAAAAAAAAAAABYCsgBQAMgAAAJdAE0CBgBNAiwAIwIPACoCPQBBAgYAJAIWACICOwBBARQANwEeAEEDWQBBAjwAQQGOAEEBuwAVAX8AEQI4ADwCCwAMAwgAGAEUAEEAAP+tAAAALAAsAGAAcACwAOgBGgFOAbYB2AHkAgACMgJUAnQCsALWAvgDFANMA1gDbgAAAAEAAAAWAJAADABjAAcAAQAAAAAAAAAAAAAAAAAEAAN4nJyUz24bVRTGf05s0wrBAkVVuonugkWR6NhUSdU2K4fUikUUB48LQkJIE8/4jzKeGXkmDuEJWPMWvEVXPATPgVij+Xzs2AXRJoqSfHfu+fOdc75zgR3+ZptK9SHwRz0xXGGvfm54iwf1E8PbtOtbhqs8qf1puEZYmxuu83mtZ/gj3lZ/M/yA/epPhh+yW20b/phn1R3Dn2w7/jL8Kfu8XeAKvOBXwxV2yQxvscOPhrd5hMWsVHlE03CNz9gzXGcP6DOhIGZCwgjHkAkjrpgRkeMTMWPCkIgQR4cWMYW+JgRCjtF/fg3wKZgRKOKYAkeMT0xAztgi/iKvlHNlHOo0s7sWBWMCLuRxSUCCI2VESkLEpeIUFGS8okGDnIH4ZhTkeORMiPFImTGiQZc2p/QZMyHH0VakkplPypCCawLld2ZRdmZAREJurK5ICMXTiV8k7w6nOLpksl2PfLoR4Usc38m75JbK9is8/bo1Zpt5l2wC5upnrK7EurnWBMe6LfO2+Fa44BXuXv3ZZPL+HoX6XyjyBVeaf6hJJWKS4NwuLXwpyHePcRzp3MFXR76nQ58Turyhr3OLHj1anNGnw2v5dunh+JouZxzLoyO8uGtLMWf8gOMbOrIpY0fWn8XEIn4mM3Xn4jhTHVMy9bxk7qnWSBXefcLlDqUb6sjlM9AelZZO80u0ZwEjU0UmhlP1cqmN3PoXmiKmqqWc7e19uQ1z273lFt+QaodLtS44lZNbMHrfVL13NHOtH4+AkJQLWQxImdKg4Ea8zwm4IsZxrO6daEsKWiufMs+NVBIxFYMOieLMyPQ3MN34xn2woXtnb0ko/5Lp5aqq+2Rx6tXtjN6oe8s737ocrU2gYVNN19Q0ENfEtB9pp9b5+/LN9bqlPOWIlJjwXy/AMzya7HPAIWNlGOhmbq9DUy9Ek5ccqvpLIlkNpefIIhzg8ZwDDnjJ83f6uGTijItbcVnP3eKYI7ocflAVC/suR7xeffv/rL+LaVO1OJ6uTi/uPcUnd1DrF9qz2/eyp4mVk5hbtNutOCNgWnJxu+s1ucd4/wAAAP//AQAA///0t09ReJxiYGYAg//nGIwYsAAAAAAA//8BAAD//y8BAgMAAAA="); + src: url("data:application/font-woff;base64,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"); }]]>SuccessfulFailure + .d2-2236180231 .fill-N1{fill:#0A0F25;} + .d2-2236180231 .fill-N2{fill:#676C7E;} + .d2-2236180231 .fill-N3{fill:#9499AB;} + .d2-2236180231 .fill-N4{fill:#CFD2DD;} + .d2-2236180231 .fill-N5{fill:#DEE1EB;} + .d2-2236180231 .fill-N6{fill:#EEF1F8;} + .d2-2236180231 .fill-N7{fill:#FFFFFF;} + .d2-2236180231 .fill-B1{fill:#0D32B2;} + .d2-2236180231 .fill-B2{fill:#0D32B2;} + .d2-2236180231 .fill-B3{fill:#E3E9FD;} + .d2-2236180231 .fill-B4{fill:#E3E9FD;} + .d2-2236180231 .fill-B5{fill:#EDF0FD;} + .d2-2236180231 .fill-B6{fill:#F7F8FE;} + .d2-2236180231 .fill-AA2{fill:#4A6FF3;} + .d2-2236180231 .fill-AA4{fill:#EDF0FD;} + .d2-2236180231 .fill-AA5{fill:#F7F8FE;} + .d2-2236180231 .fill-AB4{fill:#EDF0FD;} + .d2-2236180231 .fill-AB5{fill:#F7F8FE;} + .d2-2236180231 .stroke-N1{stroke:#0A0F25;} + .d2-2236180231 .stroke-N2{stroke:#676C7E;} + .d2-2236180231 .stroke-N3{stroke:#9499AB;} + .d2-2236180231 .stroke-N4{stroke:#CFD2DD;} + .d2-2236180231 .stroke-N5{stroke:#DEE1EB;} + .d2-2236180231 .stroke-N6{stroke:#EEF1F8;} + .d2-2236180231 .stroke-N7{stroke:#FFFFFF;} + .d2-2236180231 .stroke-B1{stroke:#0D32B2;} + .d2-2236180231 .stroke-B2{stroke:#0D32B2;} + .d2-2236180231 .stroke-B3{stroke:#E3E9FD;} + .d2-2236180231 .stroke-B4{stroke:#E3E9FD;} + .d2-2236180231 .stroke-B5{stroke:#EDF0FD;} + .d2-2236180231 .stroke-B6{stroke:#F7F8FE;} + .d2-2236180231 .stroke-AA2{stroke:#4A6FF3;} + .d2-2236180231 .stroke-AA4{stroke:#EDF0FD;} + .d2-2236180231 .stroke-AA5{stroke:#F7F8FE;} + .d2-2236180231 .stroke-AB4{stroke:#EDF0FD;} + .d2-2236180231 .stroke-AB5{stroke:#F7F8FE;} + .d2-2236180231 .background-color-N1{background-color:#0A0F25;} + .d2-2236180231 .background-color-N2{background-color:#676C7E;} + .d2-2236180231 .background-color-N3{background-color:#9499AB;} + .d2-2236180231 .background-color-N4{background-color:#CFD2DD;} + .d2-2236180231 .background-color-N5{background-color:#DEE1EB;} + .d2-2236180231 .background-color-N6{background-color:#EEF1F8;} + .d2-2236180231 .background-color-N7{background-color:#FFFFFF;} + .d2-2236180231 .background-color-B1{background-color:#0D32B2;} + .d2-2236180231 .background-color-B2{background-color:#0D32B2;} + .d2-2236180231 .background-color-B3{background-color:#E3E9FD;} + .d2-2236180231 .background-color-B4{background-color:#E3E9FD;} + .d2-2236180231 .background-color-B5{background-color:#EDF0FD;} + .d2-2236180231 .background-color-B6{background-color:#F7F8FE;} + .d2-2236180231 .background-color-AA2{background-color:#4A6FF3;} + .d2-2236180231 .background-color-AA4{background-color:#EDF0FD;} + .d2-2236180231 .background-color-AA5{background-color:#F7F8FE;} + .d2-2236180231 .background-color-AB4{background-color:#EDF0FD;} + .d2-2236180231 .background-color-AB5{background-color:#F7F8FE;} + .d2-2236180231 .color-N1{color:#0A0F25;} + .d2-2236180231 .color-N2{color:#676C7E;} + .d2-2236180231 .color-N3{color:#9499AB;} + .d2-2236180231 .color-N4{color:#CFD2DD;} + .d2-2236180231 .color-N5{color:#DEE1EB;} + .d2-2236180231 .color-N6{color:#EEF1F8;} + .d2-2236180231 .color-N7{color:#FFFFFF;} + .d2-2236180231 .color-B1{color:#0D32B2;} + .d2-2236180231 .color-B2{color:#0D32B2;} + .d2-2236180231 .color-B3{color:#E3E9FD;} + .d2-2236180231 .color-B4{color:#E3E9FD;} + .d2-2236180231 .color-B5{color:#EDF0FD;} + .d2-2236180231 .color-B6{color:#F7F8FE;} + .d2-2236180231 .color-AA2{color:#4A6FF3;} + .d2-2236180231 .color-AA4{color:#EDF0FD;} + .d2-2236180231 .color-AA5{color:#F7F8FE;} + .d2-2236180231 .color-AB4{color:#EDF0FD;} + .d2-2236180231 .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);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>SuccessfulFailure \ No newline at end of file diff --git a/e2etests/testdata/stable/array-classes/elk/board.exp.json b/e2etests/testdata/stable/array-classes/elk/board.exp.json index c1e181894..9d1326c7a 100644 --- a/e2etests/testdata/stable/array-classes/elk/board.exp.json +++ b/e2etests/testdata/stable/array-classes/elk/board.exp.json @@ -6,6 +6,10 @@ { "id": "yay", "type": "rectangle", + "classes": [ + "button", + "success" + ], "pos": { "x": 12, "y": 12 @@ -47,6 +51,10 @@ { "id": "nay", "type": "rectangle", + "classes": [ + "button", + "error" + ], "pos": { "x": 152, "y": 12 diff --git a/e2etests/testdata/stable/array-classes/elk/sketch.exp.svg b/e2etests/testdata/stable/array-classes/elk/sketch.exp.svg index a843b3fc6..5d216f6b2 100644 --- a/e2etests/testdata/stable/array-classes/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/array-classes/elk/sketch.exp.svg @@ -1,10 +1,10 @@ -SuccessfulFailure + .d2-2397487381 .fill-N1{fill:#0A0F25;} + .d2-2397487381 .fill-N2{fill:#676C7E;} + .d2-2397487381 .fill-N3{fill:#9499AB;} + .d2-2397487381 .fill-N4{fill:#CFD2DD;} + .d2-2397487381 .fill-N5{fill:#DEE1EB;} + .d2-2397487381 .fill-N6{fill:#EEF1F8;} + .d2-2397487381 .fill-N7{fill:#FFFFFF;} + .d2-2397487381 .fill-B1{fill:#0D32B2;} + .d2-2397487381 .fill-B2{fill:#0D32B2;} + .d2-2397487381 .fill-B3{fill:#E3E9FD;} + .d2-2397487381 .fill-B4{fill:#E3E9FD;} + .d2-2397487381 .fill-B5{fill:#EDF0FD;} + .d2-2397487381 .fill-B6{fill:#F7F8FE;} + .d2-2397487381 .fill-AA2{fill:#4A6FF3;} + .d2-2397487381 .fill-AA4{fill:#EDF0FD;} + .d2-2397487381 .fill-AA5{fill:#F7F8FE;} + .d2-2397487381 .fill-AB4{fill:#EDF0FD;} + .d2-2397487381 .fill-AB5{fill:#F7F8FE;} + .d2-2397487381 .stroke-N1{stroke:#0A0F25;} + .d2-2397487381 .stroke-N2{stroke:#676C7E;} + .d2-2397487381 .stroke-N3{stroke:#9499AB;} + .d2-2397487381 .stroke-N4{stroke:#CFD2DD;} + .d2-2397487381 .stroke-N5{stroke:#DEE1EB;} + .d2-2397487381 .stroke-N6{stroke:#EEF1F8;} + .d2-2397487381 .stroke-N7{stroke:#FFFFFF;} + .d2-2397487381 .stroke-B1{stroke:#0D32B2;} + .d2-2397487381 .stroke-B2{stroke:#0D32B2;} + .d2-2397487381 .stroke-B3{stroke:#E3E9FD;} + .d2-2397487381 .stroke-B4{stroke:#E3E9FD;} + .d2-2397487381 .stroke-B5{stroke:#EDF0FD;} + .d2-2397487381 .stroke-B6{stroke:#F7F8FE;} + .d2-2397487381 .stroke-AA2{stroke:#4A6FF3;} + .d2-2397487381 .stroke-AA4{stroke:#EDF0FD;} + .d2-2397487381 .stroke-AA5{stroke:#F7F8FE;} + .d2-2397487381 .stroke-AB4{stroke:#EDF0FD;} + .d2-2397487381 .stroke-AB5{stroke:#F7F8FE;} + .d2-2397487381 .background-color-N1{background-color:#0A0F25;} + .d2-2397487381 .background-color-N2{background-color:#676C7E;} + .d2-2397487381 .background-color-N3{background-color:#9499AB;} + .d2-2397487381 .background-color-N4{background-color:#CFD2DD;} + .d2-2397487381 .background-color-N5{background-color:#DEE1EB;} + .d2-2397487381 .background-color-N6{background-color:#EEF1F8;} + .d2-2397487381 .background-color-N7{background-color:#FFFFFF;} + .d2-2397487381 .background-color-B1{background-color:#0D32B2;} + .d2-2397487381 .background-color-B2{background-color:#0D32B2;} + .d2-2397487381 .background-color-B3{background-color:#E3E9FD;} + .d2-2397487381 .background-color-B4{background-color:#E3E9FD;} + .d2-2397487381 .background-color-B5{background-color:#EDF0FD;} + .d2-2397487381 .background-color-B6{background-color:#F7F8FE;} + .d2-2397487381 .background-color-AA2{background-color:#4A6FF3;} + .d2-2397487381 .background-color-AA4{background-color:#EDF0FD;} + .d2-2397487381 .background-color-AA5{background-color:#F7F8FE;} + .d2-2397487381 .background-color-AB4{background-color:#EDF0FD;} + .d2-2397487381 .background-color-AB5{background-color:#F7F8FE;} + .d2-2397487381 .color-N1{color:#0A0F25;} + .d2-2397487381 .color-N2{color:#676C7E;} + .d2-2397487381 .color-N3{color:#9499AB;} + .d2-2397487381 .color-N4{color:#CFD2DD;} + .d2-2397487381 .color-N5{color:#DEE1EB;} + .d2-2397487381 .color-N6{color:#EEF1F8;} + .d2-2397487381 .color-N7{color:#FFFFFF;} + .d2-2397487381 .color-B1{color:#0D32B2;} + .d2-2397487381 .color-B2{color:#0D32B2;} + .d2-2397487381 .color-B3{color:#E3E9FD;} + .d2-2397487381 .color-B4{color:#E3E9FD;} + .d2-2397487381 .color-B5{color:#EDF0FD;} + .d2-2397487381 .color-B6{color:#F7F8FE;} + .d2-2397487381 .color-AA2{color:#4A6FF3;} + .d2-2397487381 .color-AA4{color:#EDF0FD;} + .d2-2397487381 .color-AA5{color:#F7F8FE;} + .d2-2397487381 .color-AB4{color:#EDF0FD;} + .d2-2397487381 .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);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>SuccessfulFailure \ No newline at end of file diff --git a/e2etests/testdata/stable/arrowhead_adjustment/dagre/sketch.exp.svg b/e2etests/testdata/stable/arrowhead_adjustment/dagre/sketch.exp.svg index 72deed76d..50dffb9f1 100644 --- a/e2etests/testdata/stable/arrowhead_adjustment/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/arrowhead_adjustment/dagre/sketch.exp.svg @@ -4,14 +4,14 @@ } @font-face { font-family: d2-1882127172-font-bold; - src: url("data:application/font-woff;base64,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"); + src: url("data:application/font-woff;base64,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"); } .d2-1882127172 .text-italic { font-family: "d2-1882127172-font-italic"; } @font-face { font-family: d2-1882127172-font-italic; - src: url("data:application/font-woff;base64,d09GRgABAAAAAAdEAAoAAAAADBAAARhRAAAAAAAAAAAAAAAAAAAAAAAAAABPUy8yAAAA9AAAAGAAAABgW1SVeGNtYXAAAAFUAAAAPgAAAD4AtQA5Z2x5ZgAAAZQAAAHJAAAB1C+tz3JoZWFkAAADYAAAADYAAAA2G7Ur2mhoZWEAAAOYAAAAJAAAACQLeAipaG10eAAAA7wAAAAUAAAAFAnrAQxsb2NhAAAD0AAAAAwAAAAMATIBtm1heHAAAAPcAAAAIAAAACAAHQD2bmFtZQAAA/wAAAMmAAAIMgntVzNwb3N0AAAHJAAAACAAAAAg/8YAMgADAeEBkAAFAAACigJY//EASwKKAlgARAFeADIBIwAAAgsFAwMEAwkCBCAAAHcAAAADAAAAAAAAAABBREJPAAEAIP//Au7/BgAAA9gBESAAAZMAAAAAAeYClAAAACAAAwAAAAEAAwABAAAADAAEAC4AAAAGAAQAAQACACoAY///AAAAKgBh////2v+gAAEAAAAAAAAABAABAAIAAwAAAAB4nFTPz2oTQRwA4N/MrjsVQiTZP0NDY5qdzcyabpt0J7uD4ibB1GrVUARbQ2ukQWtBRQRPHqTakydPPQmCJ0G8SL17ji8g+gAiGA9SctCDiURPPsHHB0fAA8D38D5ocBSOQRZsAGkWNU0qxagmhWCEKGGaxNtD/b3nemvji//yV1DQzz15ffH71hu8//suetzd3R1tPt3evjoYjMro4wAAAIMYD9FPdAgWMADq8qhWxzJ0qFRSY4oZhghjpThnbhrblvOueSm4cF2KJKOb9V5jSmedLF/1Ajuc8VpRYTG1ubb88Jr0i8kod75UaS5UPnO3vNING8k/rzAeoh+4D/ZkRV0uGGGmJETGsQwd20pjEdZxVOPMNQhxnG8iyWhW41lbONi7Mv+Xj7xWdLx6wr3MFiyZ8osJ7r/fys9trE/oZnmlK+tJufSVu4CgNB6iA3QIM//tyCRkGLblyDBW1DA+rd4M2r0oOO3MmzxfXY9PnpqNHTfXTt3qLj1Yq7jTVWov3W+dWc5lQqs0uSB4hF6hF/gDpAFMoYSiihJFCSXi7ezZTvbGdDC1Q3a4X0MH+c6iX7yt30nPFXq08wcAAP//AQAA//8sumTVAAAAAAEAAAABGFEV9JR3Xw889QABA+gAAAAA2F2gzAAAAADdZi83/r3+3QgdA8kAAgADAAIAAAAAAAAAAQAAA9j+7wAACED+vf28CB0D6ADC/9EAAAAAAAAAAAAAAAUCdAAkAhkAJwIYAB8BswAlAZMAfQAAAC4AZgCeAMwA6gABAAAABQCMAAwAZgAHAAEAAAAAAAAAAAAAAAAABAADeJyclNtOG1cUhj8H2216uqhQRG7QvkylZEyjECXhypSgjIpw6nF6kKpKgz0+iPHMyDOYkifodd+ib5GrPkafoup1tX8vgx1FQSAE/Hv2OvxrrX9tYJP/2KBWvwv83ZwbrrHd/NnwHb5oHhneYL/5meE6Dxv/GG4waLw13ORBo2v4E97V/zT8KU/qvxm+y1b90PDnPK5vGv5yw/Gv4a94wrsFrsEz/jBcY4vC8B02+dXwBvewmLU699gx3OBrtg032QZ6TKhImZAxwjFkwogzZiSURCTMmDAkYYAjpE1Kpa8ZsZBj9MGvMREVM2JFHFPhSIlIiSkZW8S38sp5rYxDnWZ216ZiTMyJPE6JyXDkjMjJSDhVnIqKghe0aFHSF9+CipKAkgkpATkzRrTocMgRPcZMKHEcKpJnFpEzpOKcWPmdWfjO9EnIKI3VGRkD8XTil8g75AhHh0K2q5GP1iI8xPGjvD23XLbfEujXrTBbz7tkEzNXP1N1JdXNuSY41q3P2+YH4YoXuFv1Z53J9T0a6H+lyCecaf4DTSoTkwzntmgTSUGRu49jX+eQSB35iZAer+jwhp7Obbp0aXNMj5CX8u3QxfEdHY45kEcovLg7lGKO+QXH94Sy8bET689iYgm/U5i6S3GcqY4phXrumQeqNVGFN5+w36F8TR2lfPraI2/pNL9MexYzMlUUYjhVL5faKK1/A1PEVLX42V7d+22Y2+4tt/iCXDvs1brg5Ce3YHTdVIP3NHOun4CYATknsuiTM6VFxYV4vybmjBTHgbr3SltS0b708XkupJKEqRiEZIozo9Df2HQTGff+mu6dvSUD+Xump5dV3SaLU6+uZvRG3VveRdblZGUCLZtqvqKmvrhmpv1EO7XKP5Jvqdct5xGh4i52+0OvwA7P2WWPsbL0dTO/vPOvhLfYUwdOSWQ1lKZ9DY8J2CXgKbvs8pyn7/VyycYZH7fGZzV/mwP26bB3bTUL2w77vFyL9vHMf4ntjupxPLo8Pbv1NB/cQLXfaN+u3s2uJuenMbdoV9txTMzUc3FbqzW5+wT/AwAA//8BAAD//3KhUUAAAAADAAD/9QAA/84AMgAAAAAAAAAAAAAAAAAAAAAAAAAA"); + src: url("data:application/font-woff;base64,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"); }]]> aidintPKdiskintFKjsonjsonbUNQlast_updatedtimestamp with time zone b+field[]string+method(a uint64)(x, y int) c d - + .d2-2645559164 .fill-N1{fill:#0A0F25;} + .d2-2645559164 .fill-N2{fill:#676C7E;} + .d2-2645559164 .fill-N3{fill:#9499AB;} + .d2-2645559164 .fill-N4{fill:#CFD2DD;} + .d2-2645559164 .fill-N5{fill:#DEE1EB;} + .d2-2645559164 .fill-N6{fill:#EEF1F8;} + .d2-2645559164 .fill-N7{fill:#FFFFFF;} + .d2-2645559164 .fill-B1{fill:#0D32B2;} + .d2-2645559164 .fill-B2{fill:#0D32B2;} + .d2-2645559164 .fill-B3{fill:#E3E9FD;} + .d2-2645559164 .fill-B4{fill:#E3E9FD;} + .d2-2645559164 .fill-B5{fill:#EDF0FD;} + .d2-2645559164 .fill-B6{fill:#F7F8FE;} + .d2-2645559164 .fill-AA2{fill:#4A6FF3;} + .d2-2645559164 .fill-AA4{fill:#EDF0FD;} + .d2-2645559164 .fill-AA5{fill:#F7F8FE;} + .d2-2645559164 .fill-AB4{fill:#EDF0FD;} + .d2-2645559164 .fill-AB5{fill:#F7F8FE;} + .d2-2645559164 .stroke-N1{stroke:#0A0F25;} + .d2-2645559164 .stroke-N2{stroke:#676C7E;} + .d2-2645559164 .stroke-N3{stroke:#9499AB;} + .d2-2645559164 .stroke-N4{stroke:#CFD2DD;} + .d2-2645559164 .stroke-N5{stroke:#DEE1EB;} + .d2-2645559164 .stroke-N6{stroke:#EEF1F8;} + .d2-2645559164 .stroke-N7{stroke:#FFFFFF;} + .d2-2645559164 .stroke-B1{stroke:#0D32B2;} + .d2-2645559164 .stroke-B2{stroke:#0D32B2;} + .d2-2645559164 .stroke-B3{stroke:#E3E9FD;} + .d2-2645559164 .stroke-B4{stroke:#E3E9FD;} + .d2-2645559164 .stroke-B5{stroke:#EDF0FD;} + .d2-2645559164 .stroke-B6{stroke:#F7F8FE;} + .d2-2645559164 .stroke-AA2{stroke:#4A6FF3;} + .d2-2645559164 .stroke-AA4{stroke:#EDF0FD;} + .d2-2645559164 .stroke-AA5{stroke:#F7F8FE;} + .d2-2645559164 .stroke-AB4{stroke:#EDF0FD;} + .d2-2645559164 .stroke-AB5{stroke:#F7F8FE;} + .d2-2645559164 .background-color-N1{background-color:#0A0F25;} + .d2-2645559164 .background-color-N2{background-color:#676C7E;} + .d2-2645559164 .background-color-N3{background-color:#9499AB;} + .d2-2645559164 .background-color-N4{background-color:#CFD2DD;} + .d2-2645559164 .background-color-N5{background-color:#DEE1EB;} + .d2-2645559164 .background-color-N6{background-color:#EEF1F8;} + .d2-2645559164 .background-color-N7{background-color:#FFFFFF;} + .d2-2645559164 .background-color-B1{background-color:#0D32B2;} + .d2-2645559164 .background-color-B2{background-color:#0D32B2;} + .d2-2645559164 .background-color-B3{background-color:#E3E9FD;} + .d2-2645559164 .background-color-B4{background-color:#E3E9FD;} + .d2-2645559164 .background-color-B5{background-color:#EDF0FD;} + .d2-2645559164 .background-color-B6{background-color:#F7F8FE;} + .d2-2645559164 .background-color-AA2{background-color:#4A6FF3;} + .d2-2645559164 .background-color-AA4{background-color:#EDF0FD;} + .d2-2645559164 .background-color-AA5{background-color:#F7F8FE;} + .d2-2645559164 .background-color-AB4{background-color:#EDF0FD;} + .d2-2645559164 .background-color-AB5{background-color:#F7F8FE;} + .d2-2645559164 .color-N1{color:#0A0F25;} + .d2-2645559164 .color-N2{color:#676C7E;} + .d2-2645559164 .color-N3{color:#9499AB;} + .d2-2645559164 .color-N4{color:#CFD2DD;} + .d2-2645559164 .color-N5{color:#DEE1EB;} + .d2-2645559164 .color-N6{color:#EEF1F8;} + .d2-2645559164 .color-N7{color:#FFFFFF;} + .d2-2645559164 .color-B1{color:#0D32B2;} + .d2-2645559164 .color-B2{color:#0D32B2;} + .d2-2645559164 .color-B3{color:#E3E9FD;} + .d2-2645559164 .color-B4{color:#E3E9FD;} + .d2-2645559164 .color-B5{color:#EDF0FD;} + .d2-2645559164 .color-B6{color:#F7F8FE;} + .d2-2645559164 .color-AA2{color:#4A6FF3;} + .d2-2645559164 .color-AA4{color:#EDF0FD;} + .d2-2645559164 .color-AA5{color:#F7F8FE;} + .d2-2645559164 .color-AB4{color:#EDF0FD;} + .d2-2645559164 .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);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);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/board.exp.json b/e2etests/testdata/stable/class_and_sqlTable_border_radius/elk/board.exp.json index 557561b09..9e58c1d09 100644 --- a/e2etests/testdata/stable/class_and_sqlTable_border_radius/elk/board.exp.json +++ b/e2etests/testdata/stable/class_and_sqlTable_border_radius/elk/board.exp.json @@ -10,7 +10,7 @@ "x": 12, "y": 14 }, - "width": 439, + "width": 437, "height": 180, "opacity": 1, "strokeDash": 0, @@ -55,7 +55,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -83,7 +85,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" }, { @@ -111,7 +115,9 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "unique", + "constraint": [ + "unique" + ], "reference": "" }, { @@ -139,7 +145,7 @@ "labelWidth": 219, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], @@ -163,7 +169,7 @@ "id": "b", "type": "class", "pos": { - "x": 471, + "x": 469, "y": 12 }, "width": 407, @@ -218,7 +224,7 @@ "id": "c", "type": "class", "pos": { - "x": 898, + "x": 896, "y": 58 }, "width": 117, @@ -261,7 +267,7 @@ "id": "d", "type": "sql_table", "pos": { - "x": 1035, + "x": 1033, "y": 86 }, "width": 50, 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 42e979652..3e01e587b 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 @@ -1,17 +1,17 @@ - aidintPKdiskintFKjsonjsonbUNQlast_updatedtimestamp with time zone b+field[]string+method(a uint64)(x, y int) c d - + .d2-466630064 .fill-N1{fill:#0A0F25;} + .d2-466630064 .fill-N2{fill:#676C7E;} + .d2-466630064 .fill-N3{fill:#9499AB;} + .d2-466630064 .fill-N4{fill:#CFD2DD;} + .d2-466630064 .fill-N5{fill:#DEE1EB;} + .d2-466630064 .fill-N6{fill:#EEF1F8;} + .d2-466630064 .fill-N7{fill:#FFFFFF;} + .d2-466630064 .fill-B1{fill:#0D32B2;} + .d2-466630064 .fill-B2{fill:#0D32B2;} + .d2-466630064 .fill-B3{fill:#E3E9FD;} + .d2-466630064 .fill-B4{fill:#E3E9FD;} + .d2-466630064 .fill-B5{fill:#EDF0FD;} + .d2-466630064 .fill-B6{fill:#F7F8FE;} + .d2-466630064 .fill-AA2{fill:#4A6FF3;} + .d2-466630064 .fill-AA4{fill:#EDF0FD;} + .d2-466630064 .fill-AA5{fill:#F7F8FE;} + .d2-466630064 .fill-AB4{fill:#EDF0FD;} + .d2-466630064 .fill-AB5{fill:#F7F8FE;} + .d2-466630064 .stroke-N1{stroke:#0A0F25;} + .d2-466630064 .stroke-N2{stroke:#676C7E;} + .d2-466630064 .stroke-N3{stroke:#9499AB;} + .d2-466630064 .stroke-N4{stroke:#CFD2DD;} + .d2-466630064 .stroke-N5{stroke:#DEE1EB;} + .d2-466630064 .stroke-N6{stroke:#EEF1F8;} + .d2-466630064 .stroke-N7{stroke:#FFFFFF;} + .d2-466630064 .stroke-B1{stroke:#0D32B2;} + .d2-466630064 .stroke-B2{stroke:#0D32B2;} + .d2-466630064 .stroke-B3{stroke:#E3E9FD;} + .d2-466630064 .stroke-B4{stroke:#E3E9FD;} + .d2-466630064 .stroke-B5{stroke:#EDF0FD;} + .d2-466630064 .stroke-B6{stroke:#F7F8FE;} + .d2-466630064 .stroke-AA2{stroke:#4A6FF3;} + .d2-466630064 .stroke-AA4{stroke:#EDF0FD;} + .d2-466630064 .stroke-AA5{stroke:#F7F8FE;} + .d2-466630064 .stroke-AB4{stroke:#EDF0FD;} + .d2-466630064 .stroke-AB5{stroke:#F7F8FE;} + .d2-466630064 .background-color-N1{background-color:#0A0F25;} + .d2-466630064 .background-color-N2{background-color:#676C7E;} + .d2-466630064 .background-color-N3{background-color:#9499AB;} + .d2-466630064 .background-color-N4{background-color:#CFD2DD;} + .d2-466630064 .background-color-N5{background-color:#DEE1EB;} + .d2-466630064 .background-color-N6{background-color:#EEF1F8;} + .d2-466630064 .background-color-N7{background-color:#FFFFFF;} + .d2-466630064 .background-color-B1{background-color:#0D32B2;} + .d2-466630064 .background-color-B2{background-color:#0D32B2;} + .d2-466630064 .background-color-B3{background-color:#E3E9FD;} + .d2-466630064 .background-color-B4{background-color:#E3E9FD;} + .d2-466630064 .background-color-B5{background-color:#EDF0FD;} + .d2-466630064 .background-color-B6{background-color:#F7F8FE;} + .d2-466630064 .background-color-AA2{background-color:#4A6FF3;} + .d2-466630064 .background-color-AA4{background-color:#EDF0FD;} + .d2-466630064 .background-color-AA5{background-color:#F7F8FE;} + .d2-466630064 .background-color-AB4{background-color:#EDF0FD;} + .d2-466630064 .background-color-AB5{background-color:#F7F8FE;} + .d2-466630064 .color-N1{color:#0A0F25;} + .d2-466630064 .color-N2{color:#676C7E;} + .d2-466630064 .color-N3{color:#9499AB;} + .d2-466630064 .color-N4{color:#CFD2DD;} + .d2-466630064 .color-N5{color:#DEE1EB;} + .d2-466630064 .color-N6{color:#EEF1F8;} + .d2-466630064 .color-N7{color:#FFFFFF;} + .d2-466630064 .color-B1{color:#0D32B2;} + .d2-466630064 .color-B2{color:#0D32B2;} + .d2-466630064 .color-B3{color:#E3E9FD;} + .d2-466630064 .color-B4{color:#E3E9FD;} + .d2-466630064 .color-B5{color:#EDF0FD;} + .d2-466630064 .color-B6{color:#F7F8FE;} + .d2-466630064 .color-AA2{color:#4A6FF3;} + .d2-466630064 .color-AA4{color:#EDF0FD;} + .d2-466630064 .color-AA5{color:#F7F8FE;} + .d2-466630064 .color-AB4{color:#EDF0FD;} + .d2-466630064 .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);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);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/classes/dagre/sketch.exp.svg b/e2etests/testdata/stable/classes/dagre/sketch.exp.svg index 20c71647d..c1d5e0e8e 100644 --- a/e2etests/testdata/stable/classes/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/classes/dagre/sketch.exp.svg @@ -4,14 +4,14 @@ } @font-face { font-family: d2-1957894710-font-bold; - src: url("data:application/font-woff;base64,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"); + src: url("data:application/font-woff;base64,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"); } .d2-1957894710 .text-italic { font-family: "d2-1957894710-font-italic"; } @font-face { font-family: d2-1957894710-font-italic; - src: url("data:application/font-woff;base64,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"); + src: url("data:application/font-woff;base64,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"); }]]>UseridintPKparent_idintFKspouse_idintFKPetidintPKowner_idintFKCardidintPKowner_idintFKPostidintPKtextstringauthor_idintFKMetadataidintPKageintInfoidintPKcontentjson.RawMessage spouse children/parent/ancestorpets/ownercard/ownerposts/authormetadata/userinfo/user - - - - - - - - + .d2-2324764429 .fill-N1{fill:#0A0F25;} + .d2-2324764429 .fill-N2{fill:#676C7E;} + .d2-2324764429 .fill-N3{fill:#9499AB;} + .d2-2324764429 .fill-N4{fill:#CFD2DD;} + .d2-2324764429 .fill-N5{fill:#DEE1EB;} + .d2-2324764429 .fill-N6{fill:#EEF1F8;} + .d2-2324764429 .fill-N7{fill:#FFFFFF;} + .d2-2324764429 .fill-B1{fill:#0D32B2;} + .d2-2324764429 .fill-B2{fill:#0D32B2;} + .d2-2324764429 .fill-B3{fill:#E3E9FD;} + .d2-2324764429 .fill-B4{fill:#E3E9FD;} + .d2-2324764429 .fill-B5{fill:#EDF0FD;} + .d2-2324764429 .fill-B6{fill:#F7F8FE;} + .d2-2324764429 .fill-AA2{fill:#4A6FF3;} + .d2-2324764429 .fill-AA4{fill:#EDF0FD;} + .d2-2324764429 .fill-AA5{fill:#F7F8FE;} + .d2-2324764429 .fill-AB4{fill:#EDF0FD;} + .d2-2324764429 .fill-AB5{fill:#F7F8FE;} + .d2-2324764429 .stroke-N1{stroke:#0A0F25;} + .d2-2324764429 .stroke-N2{stroke:#676C7E;} + .d2-2324764429 .stroke-N3{stroke:#9499AB;} + .d2-2324764429 .stroke-N4{stroke:#CFD2DD;} + .d2-2324764429 .stroke-N5{stroke:#DEE1EB;} + .d2-2324764429 .stroke-N6{stroke:#EEF1F8;} + .d2-2324764429 .stroke-N7{stroke:#FFFFFF;} + .d2-2324764429 .stroke-B1{stroke:#0D32B2;} + .d2-2324764429 .stroke-B2{stroke:#0D32B2;} + .d2-2324764429 .stroke-B3{stroke:#E3E9FD;} + .d2-2324764429 .stroke-B4{stroke:#E3E9FD;} + .d2-2324764429 .stroke-B5{stroke:#EDF0FD;} + .d2-2324764429 .stroke-B6{stroke:#F7F8FE;} + .d2-2324764429 .stroke-AA2{stroke:#4A6FF3;} + .d2-2324764429 .stroke-AA4{stroke:#EDF0FD;} + .d2-2324764429 .stroke-AA5{stroke:#F7F8FE;} + .d2-2324764429 .stroke-AB4{stroke:#EDF0FD;} + .d2-2324764429 .stroke-AB5{stroke:#F7F8FE;} + .d2-2324764429 .background-color-N1{background-color:#0A0F25;} + .d2-2324764429 .background-color-N2{background-color:#676C7E;} + .d2-2324764429 .background-color-N3{background-color:#9499AB;} + .d2-2324764429 .background-color-N4{background-color:#CFD2DD;} + .d2-2324764429 .background-color-N5{background-color:#DEE1EB;} + .d2-2324764429 .background-color-N6{background-color:#EEF1F8;} + .d2-2324764429 .background-color-N7{background-color:#FFFFFF;} + .d2-2324764429 .background-color-B1{background-color:#0D32B2;} + .d2-2324764429 .background-color-B2{background-color:#0D32B2;} + .d2-2324764429 .background-color-B3{background-color:#E3E9FD;} + .d2-2324764429 .background-color-B4{background-color:#E3E9FD;} + .d2-2324764429 .background-color-B5{background-color:#EDF0FD;} + .d2-2324764429 .background-color-B6{background-color:#F7F8FE;} + .d2-2324764429 .background-color-AA2{background-color:#4A6FF3;} + .d2-2324764429 .background-color-AA4{background-color:#EDF0FD;} + .d2-2324764429 .background-color-AA5{background-color:#F7F8FE;} + .d2-2324764429 .background-color-AB4{background-color:#EDF0FD;} + .d2-2324764429 .background-color-AB5{background-color:#F7F8FE;} + .d2-2324764429 .color-N1{color:#0A0F25;} + .d2-2324764429 .color-N2{color:#676C7E;} + .d2-2324764429 .color-N3{color:#9499AB;} + .d2-2324764429 .color-N4{color:#CFD2DD;} + .d2-2324764429 .color-N5{color:#DEE1EB;} + .d2-2324764429 .color-N6{color:#EEF1F8;} + .d2-2324764429 .color-N7{color:#FFFFFF;} + .d2-2324764429 .color-B1{color:#0D32B2;} + .d2-2324764429 .color-B2{color:#0D32B2;} + .d2-2324764429 .color-B3{color:#E3E9FD;} + .d2-2324764429 .color-B4{color:#E3E9FD;} + .d2-2324764429 .color-B5{color:#EDF0FD;} + .d2-2324764429 .color-B6{color:#F7F8FE;} + .d2-2324764429 .color-AA2{color:#4A6FF3;} + .d2-2324764429 .color-AA4{color:#EDF0FD;} + .d2-2324764429 .color-AA5{color:#F7F8FE;} + .d2-2324764429 .color-AB4{color:#EDF0FD;} + .d2-2324764429 .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);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>UseridintPKparent_idintFKspouse_idintFKPetidintPKowner_idintFKCardidintPKowner_idintFKPostidintPKtextstringauthor_idintFKMetadataidintPKageintInfoidintPKcontentjson.RawMessage spouse children/parent/ancestorpets/ownercard/ownerposts/authormetadata/userinfo/user + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/ent2d2_basic/elk/board.exp.json b/e2etests/testdata/stable/ent2d2_basic/elk/board.exp.json index 17bfd3cda..9fd0bdcae 100644 --- a/e2etests/testdata/stable/ent2d2_basic/elk/board.exp.json +++ b/e2etests/testdata/stable/ent2d2_basic/elk/board.exp.json @@ -7,7 +7,7 @@ "id": "User", "type": "sql_table", "pos": { - "x": 453, + "x": 411, "y": 12 }, "width": 280, @@ -55,7 +55,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -83,7 +85,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" }, { @@ -111,7 +115,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" } ], @@ -138,7 +144,7 @@ "x": 12, "y": 377 }, - "width": 211, + "width": 194, "height": 108, "opacity": 1, "strokeDash": 0, @@ -183,7 +189,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -211,7 +219,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" } ], @@ -235,10 +245,10 @@ "id": "Card", "type": "sql_table", "pos": { - "x": 243, + "x": 226, "y": 377 }, - "width": 211, + "width": 194, "height": 108, "opacity": 1, "strokeDash": 0, @@ -283,7 +293,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -311,7 +323,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" } ], @@ -335,10 +349,10 @@ "id": "Post", "type": "sql_table", "pos": { - "x": 474, + "x": 440, "y": 377 }, - "width": 239, + "width": 222, "height": 144, "opacity": 1, "strokeDash": 0, @@ -383,7 +397,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -411,7 +427,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -439,7 +455,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" } ], @@ -463,10 +481,10 @@ "id": "Metadata", "type": "sql_table", "pos": { - "x": 733, + "x": 682, "y": 377 }, - "width": 163, + "width": 146, "height": 108, "opacity": 1, "strokeDash": 0, @@ -511,7 +529,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -539,7 +559,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], @@ -563,10 +583,10 @@ "id": "Info", "type": "sql_table", "pos": { - "x": 916, + "x": 848, "y": 377 }, - "width": 325, + "width": 308, "height": 108, "opacity": 1, "strokeDash": 0, @@ -611,7 +631,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -639,7 +661,7 @@ "labelWidth": 149, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], @@ -686,19 +708,19 @@ "labelPercentage": 0, "route": [ { - "x": 453.5, + "x": 411, "y": 60 }, { - "x": 365.5, + "x": 323, "y": 60 }, { - "x": 365.5, + "x": 323, "y": 108 }, { - "x": 453.5, + "x": 411, "y": 108 } ], @@ -732,19 +754,19 @@ "labelPercentage": 0, "route": [ { - "x": 733.5, + "x": 691, "y": 108 }, { - "x": 821.5, + "x": 779, "y": 108 }, { - "x": 821.5, + "x": 779, "y": 60 }, { - "x": 733.5, + "x": 691, "y": 60 } ], @@ -778,19 +800,19 @@ "labelPercentage": 0, "route": [ { - "x": 500.1659851074219, + "x": 457.6659851074219, "y": 156 }, { - "x": 500.1659851074219, + "x": 457.6659851074219, "y": 196 }, { - "x": 117.5, + "x": 109, "y": 196 }, { - "x": 117.5, + "x": 109, "y": 377 } ], @@ -824,19 +846,19 @@ "labelPercentage": 0, "route": [ { - "x": 546.8330078125, + "x": 504.3330078125, "y": 156 }, { - "x": 546.8330078125, + "x": 504.3330078125, "y": 246 }, { - "x": 348.5, + "x": 323, "y": 246 }, { - "x": 348.5, + "x": 323, "y": 377 } ], @@ -870,11 +892,11 @@ "labelPercentage": 0, "route": [ { - "x": 593.5, + "x": 551, "y": 156 }, { - "x": 593.5, + "x": 551, "y": 377 } ], @@ -908,19 +930,19 @@ "labelPercentage": 0, "route": [ { - "x": 640.166015625, + "x": 597.666015625, "y": 156 }, { - "x": 640.166015625, + "x": 597.666015625, "y": 246 }, { - "x": 814.5, + "x": 755, "y": 246 }, { - "x": 814.5, + "x": 755, "y": 377 } ], @@ -954,19 +976,19 @@ "labelPercentage": 0, "route": [ { - "x": 686.8330078125, + "x": 644.3330078125, "y": 156 }, { - "x": 686.8330078125, + "x": 644.3330078125, "y": 196 }, { - "x": 1078.5, + "x": 1002, "y": 196 }, { - "x": 1078.5, + "x": 1002, "y": 377 } ], diff --git a/e2etests/testdata/stable/ent2d2_basic/elk/sketch.exp.svg b/e2etests/testdata/stable/ent2d2_basic/elk/sketch.exp.svg index 2c6aa3241..78521542a 100644 --- a/e2etests/testdata/stable/ent2d2_basic/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/ent2d2_basic/elk/sketch.exp.svg @@ -1,17 +1,17 @@ -UseridintPKparent_idintFKspouse_idintFKPetidintPKowner_idintFKCardidintPKowner_idintFKPostidintPKtextstringauthor_idintFKMetadataidintPKageintInfoidintPKcontentjson.RawMessage spouse children/parent/ancestorpets/ownercard/ownerposts/authormetadata/userinfo/user - - - - - - - - + .d2-251747913 .fill-N1{fill:#0A0F25;} + .d2-251747913 .fill-N2{fill:#676C7E;} + .d2-251747913 .fill-N3{fill:#9499AB;} + .d2-251747913 .fill-N4{fill:#CFD2DD;} + .d2-251747913 .fill-N5{fill:#DEE1EB;} + .d2-251747913 .fill-N6{fill:#EEF1F8;} + .d2-251747913 .fill-N7{fill:#FFFFFF;} + .d2-251747913 .fill-B1{fill:#0D32B2;} + .d2-251747913 .fill-B2{fill:#0D32B2;} + .d2-251747913 .fill-B3{fill:#E3E9FD;} + .d2-251747913 .fill-B4{fill:#E3E9FD;} + .d2-251747913 .fill-B5{fill:#EDF0FD;} + .d2-251747913 .fill-B6{fill:#F7F8FE;} + .d2-251747913 .fill-AA2{fill:#4A6FF3;} + .d2-251747913 .fill-AA4{fill:#EDF0FD;} + .d2-251747913 .fill-AA5{fill:#F7F8FE;} + .d2-251747913 .fill-AB4{fill:#EDF0FD;} + .d2-251747913 .fill-AB5{fill:#F7F8FE;} + .d2-251747913 .stroke-N1{stroke:#0A0F25;} + .d2-251747913 .stroke-N2{stroke:#676C7E;} + .d2-251747913 .stroke-N3{stroke:#9499AB;} + .d2-251747913 .stroke-N4{stroke:#CFD2DD;} + .d2-251747913 .stroke-N5{stroke:#DEE1EB;} + .d2-251747913 .stroke-N6{stroke:#EEF1F8;} + .d2-251747913 .stroke-N7{stroke:#FFFFFF;} + .d2-251747913 .stroke-B1{stroke:#0D32B2;} + .d2-251747913 .stroke-B2{stroke:#0D32B2;} + .d2-251747913 .stroke-B3{stroke:#E3E9FD;} + .d2-251747913 .stroke-B4{stroke:#E3E9FD;} + .d2-251747913 .stroke-B5{stroke:#EDF0FD;} + .d2-251747913 .stroke-B6{stroke:#F7F8FE;} + .d2-251747913 .stroke-AA2{stroke:#4A6FF3;} + .d2-251747913 .stroke-AA4{stroke:#EDF0FD;} + .d2-251747913 .stroke-AA5{stroke:#F7F8FE;} + .d2-251747913 .stroke-AB4{stroke:#EDF0FD;} + .d2-251747913 .stroke-AB5{stroke:#F7F8FE;} + .d2-251747913 .background-color-N1{background-color:#0A0F25;} + .d2-251747913 .background-color-N2{background-color:#676C7E;} + .d2-251747913 .background-color-N3{background-color:#9499AB;} + .d2-251747913 .background-color-N4{background-color:#CFD2DD;} + .d2-251747913 .background-color-N5{background-color:#DEE1EB;} + .d2-251747913 .background-color-N6{background-color:#EEF1F8;} + .d2-251747913 .background-color-N7{background-color:#FFFFFF;} + .d2-251747913 .background-color-B1{background-color:#0D32B2;} + .d2-251747913 .background-color-B2{background-color:#0D32B2;} + .d2-251747913 .background-color-B3{background-color:#E3E9FD;} + .d2-251747913 .background-color-B4{background-color:#E3E9FD;} + .d2-251747913 .background-color-B5{background-color:#EDF0FD;} + .d2-251747913 .background-color-B6{background-color:#F7F8FE;} + .d2-251747913 .background-color-AA2{background-color:#4A6FF3;} + .d2-251747913 .background-color-AA4{background-color:#EDF0FD;} + .d2-251747913 .background-color-AA5{background-color:#F7F8FE;} + .d2-251747913 .background-color-AB4{background-color:#EDF0FD;} + .d2-251747913 .background-color-AB5{background-color:#F7F8FE;} + .d2-251747913 .color-N1{color:#0A0F25;} + .d2-251747913 .color-N2{color:#676C7E;} + .d2-251747913 .color-N3{color:#9499AB;} + .d2-251747913 .color-N4{color:#CFD2DD;} + .d2-251747913 .color-N5{color:#DEE1EB;} + .d2-251747913 .color-N6{color:#EEF1F8;} + .d2-251747913 .color-N7{color:#FFFFFF;} + .d2-251747913 .color-B1{color:#0D32B2;} + .d2-251747913 .color-B2{color:#0D32B2;} + .d2-251747913 .color-B3{color:#E3E9FD;} + .d2-251747913 .color-B4{color:#E3E9FD;} + .d2-251747913 .color-B5{color:#EDF0FD;} + .d2-251747913 .color-B6{color:#F7F8FE;} + .d2-251747913 .color-AA2{color:#4A6FF3;} + .d2-251747913 .color-AA4{color:#EDF0FD;} + .d2-251747913 .color-AA5{color:#F7F8FE;} + .d2-251747913 .color-AB4{color:#EDF0FD;} + .d2-251747913 .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);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>UseridintPKparent_idintFKspouse_idintFKPetidintPKowner_idintFKCardidintPKowner_idintFKPostidintPKtextstringauthor_idintFKMetadataidintPKageintInfoidintPKcontentjson.RawMessage spouse children/parent/ancestorpets/ownercard/ownerposts/authormetadata/userinfo/user + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/ent2d2_right/dagre/board.exp.json b/e2etests/testdata/stable/ent2d2_right/dagre/board.exp.json index 0ce03b06d..298ceb0cf 100644 --- a/e2etests/testdata/stable/ent2d2_right/dagre/board.exp.json +++ b/e2etests/testdata/stable/ent2d2_right/dagre/board.exp.json @@ -10,7 +10,7 @@ "x": 0, "y": 231 }, - "width": 218, + "width": 201, "height": 144, "opacity": 1, "strokeDash": 0, @@ -55,7 +55,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -83,7 +85,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" }, { @@ -111,7 +115,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" } ], @@ -135,10 +141,10 @@ "id": "Pet", "type": "sql_table", "pos": { - "x": 517, + "x": 500, "y": 0 }, - "width": 211, + "width": 194, "height": 108, "opacity": 1, "strokeDash": 0, @@ -183,7 +189,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -211,7 +219,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" } ], @@ -235,10 +245,10 @@ "id": "Card", "type": "sql_table", "pos": { - "x": 517, + "x": 500, "y": 146 }, - "width": 211, + "width": 194, "height": 108, "opacity": 1, "strokeDash": 0, @@ -283,7 +293,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -311,7 +323,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" } ], @@ -335,10 +349,10 @@ "id": "Post", "type": "sql_table", "pos": { - "x": 503, + "x": 486, "y": 274 }, - "width": 239, + "width": 222, "height": 144, "opacity": 1, "strokeDash": 0, @@ -383,7 +397,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -411,7 +427,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -439,7 +455,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" } ], @@ -463,10 +481,10 @@ "id": "Metadata", "type": "sql_table", "pos": { - "x": 541, + "x": 524, "y": 438 }, - "width": 163, + "width": 146, "height": 108, "opacity": 1, "strokeDash": 0, @@ -511,7 +529,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -539,7 +559,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], @@ -563,10 +583,10 @@ "id": "Info", "type": "sql_table", "pos": { - "x": 460, + "x": 443, "y": 584 }, - "width": 325, + "width": 308, "height": 108, "opacity": 1, "strokeDash": 0, @@ -611,7 +631,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -639,7 +661,7 @@ "labelWidth": 149, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], @@ -686,11 +708,11 @@ "labelPercentage": 0, "route": [ { - "x": 52.67399978637695, + "x": 48.566001892089844, "y": 374.5 }, { - "x": 10.534000396728516, + "x": 9.713000297546387, "y": 428.3659973144531 }, { @@ -706,35 +728,35 @@ "y": 455.29998779296875 }, { - "x": 21.799999237060547, + "x": 20.100000381469727, "y": 462.0329895019531 }, { - "x": 54.5, + "x": 50.25, "y": 467.0830078125 }, { - "x": 87.19999694824219, + "x": 80.4000015258789, "y": 472.13299560546875 }, { - "x": 130.8000030517578, + "x": 120.5999984741211, "y": 472.13299560546875 }, { - "x": 163.5, + "x": 150.75, "y": 467.0830078125 }, { - "x": 196.1999969482422, + "x": 180.89999389648438, "y": 462.0329895019531 }, { - "x": 207.46499633789062, + "x": 191.28599548339844, "y": 428.3659973144531 }, { - "x": 165.3249969482422, + "x": 152.43299865722656, "y": 374.5 } ], @@ -769,11 +791,11 @@ "labelPercentage": 0, "route": [ { - "x": 80.63300323486328, + "x": 74.34500122070312, "y": 374.5 }, { - "x": 16.125999450683594, + "x": 14.869000434875488, "y": 538.2329711914062 }, { @@ -789,35 +811,35 @@ "y": 620.0999755859375 }, { - "x": 21.799999237060547, + "x": 20.100000381469727, "y": 640.5659790039062 }, { - "x": 54.5, + "x": 50.25, "y": 655.916015625 }, { - "x": 87.19999694824219, + "x": 80.4000015258789, "y": 671.2659912109375 }, { - "x": 130.8000030517578, + "x": 120.5999984741211, "y": 671.2659912109375 }, { - "x": 163.5, + "x": 150.75, "y": 655.916015625 }, { - "x": 196.1999969482422, + "x": 180.89999389648438, "y": 640.5659790039062 }, { - "x": 201.8730010986328, + "x": 186.1300048828125, "y": 538.2329711914062 }, { - "x": 137.36599731445312, + "x": 126.65399932861328, "y": 374.5 } ], @@ -852,19 +874,19 @@ "labelPercentage": 0, "route": [ { - "x": 175.63900756835938, + "x": 164.677001953125, "y": 230.5 }, { - "x": 306.3269958496094, + "x": 290.5350036621094, "y": 89.29900360107422 }, { - "x": 374.6000061035156, + "x": 357.6000061035156, "y": 54 }, { - "x": 517, + "x": 500, "y": 54 } ], @@ -899,19 +921,19 @@ "labelPercentage": 0, "route": [ { - "x": 218, - "y": 253.92300415039062 + "x": 201, + "y": 255.9929962158203 }, { - "x": 314.79998779296875, - "y": 210.78399658203125 + "x": 297.79998779296875, + "y": 211.197998046875 }, { - "x": 374.6000061035156, + "x": 357.6000061035156, "y": 200 }, { - "x": 517, + "x": 500, "y": 200 } ], @@ -946,19 +968,19 @@ "labelPercentage": 0, "route": [ { - "x": 218, - "y": 323.114990234375 + "x": 201, + "y": 322.23699951171875 }, { - "x": 314.79998779296875, - "y": 341.4230041503906 + "x": 297.79998779296875, + "y": 341.24700927734375 }, { - "x": 371.79998779296875, + "x": 354.79998779296875, "y": 346 }, { - "x": 503, + "x": 486, "y": 346 } ], @@ -993,19 +1015,19 @@ "labelPercentage": 0, "route": [ { - "x": 197.38699340820312, + "x": 185.6580047607422, "y": 375.5 }, { - "x": 310.677001953125, + "x": 294.7309875488281, "y": 468.70001220703125 }, { - "x": 379.3999938964844, + "x": 362.3999938964844, "y": 492 }, { - "x": 541, + "x": 524, "y": 492 } ], @@ -1040,19 +1062,19 @@ "labelPercentage": 0, "route": [ { - "x": 158.35899353027344, + "x": 148.03500366210938, "y": 375.5 }, { - "x": 302.8710021972656, + "x": 287.2070007324219, "y": 585.5 }, { - "x": 363.20001220703125, + "x": 346.20001220703125, "y": 638 }, { - "x": 460, + "x": 443, "y": 638 } ], diff --git a/e2etests/testdata/stable/ent2d2_right/dagre/sketch.exp.svg b/e2etests/testdata/stable/ent2d2_right/dagre/sketch.exp.svg index 33a68339b..d182ca98a 100644 --- a/e2etests/testdata/stable/ent2d2_right/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/ent2d2_right/dagre/sketch.exp.svg @@ -1,17 +1,17 @@ -UseridintPKparent_idintFKspouse_idintFKPetidintPKowner_idintFKCardidintPKowner_idintFKPostidintPKtextstringauthor_idintFKMetadataidintPKageintInfoidintPKcontentjson.RawMessage spousespouse childrenparentyowhoaheypets/ownercard/ownerposts/authormetadata/userinfo/user - - - - - - - - + .d2-1563072179 .fill-N1{fill:#0A0F25;} + .d2-1563072179 .fill-N2{fill:#676C7E;} + .d2-1563072179 .fill-N3{fill:#9499AB;} + .d2-1563072179 .fill-N4{fill:#CFD2DD;} + .d2-1563072179 .fill-N5{fill:#DEE1EB;} + .d2-1563072179 .fill-N6{fill:#EEF1F8;} + .d2-1563072179 .fill-N7{fill:#FFFFFF;} + .d2-1563072179 .fill-B1{fill:#0D32B2;} + .d2-1563072179 .fill-B2{fill:#0D32B2;} + .d2-1563072179 .fill-B3{fill:#E3E9FD;} + .d2-1563072179 .fill-B4{fill:#E3E9FD;} + .d2-1563072179 .fill-B5{fill:#EDF0FD;} + .d2-1563072179 .fill-B6{fill:#F7F8FE;} + .d2-1563072179 .fill-AA2{fill:#4A6FF3;} + .d2-1563072179 .fill-AA4{fill:#EDF0FD;} + .d2-1563072179 .fill-AA5{fill:#F7F8FE;} + .d2-1563072179 .fill-AB4{fill:#EDF0FD;} + .d2-1563072179 .fill-AB5{fill:#F7F8FE;} + .d2-1563072179 .stroke-N1{stroke:#0A0F25;} + .d2-1563072179 .stroke-N2{stroke:#676C7E;} + .d2-1563072179 .stroke-N3{stroke:#9499AB;} + .d2-1563072179 .stroke-N4{stroke:#CFD2DD;} + .d2-1563072179 .stroke-N5{stroke:#DEE1EB;} + .d2-1563072179 .stroke-N6{stroke:#EEF1F8;} + .d2-1563072179 .stroke-N7{stroke:#FFFFFF;} + .d2-1563072179 .stroke-B1{stroke:#0D32B2;} + .d2-1563072179 .stroke-B2{stroke:#0D32B2;} + .d2-1563072179 .stroke-B3{stroke:#E3E9FD;} + .d2-1563072179 .stroke-B4{stroke:#E3E9FD;} + .d2-1563072179 .stroke-B5{stroke:#EDF0FD;} + .d2-1563072179 .stroke-B6{stroke:#F7F8FE;} + .d2-1563072179 .stroke-AA2{stroke:#4A6FF3;} + .d2-1563072179 .stroke-AA4{stroke:#EDF0FD;} + .d2-1563072179 .stroke-AA5{stroke:#F7F8FE;} + .d2-1563072179 .stroke-AB4{stroke:#EDF0FD;} + .d2-1563072179 .stroke-AB5{stroke:#F7F8FE;} + .d2-1563072179 .background-color-N1{background-color:#0A0F25;} + .d2-1563072179 .background-color-N2{background-color:#676C7E;} + .d2-1563072179 .background-color-N3{background-color:#9499AB;} + .d2-1563072179 .background-color-N4{background-color:#CFD2DD;} + .d2-1563072179 .background-color-N5{background-color:#DEE1EB;} + .d2-1563072179 .background-color-N6{background-color:#EEF1F8;} + .d2-1563072179 .background-color-N7{background-color:#FFFFFF;} + .d2-1563072179 .background-color-B1{background-color:#0D32B2;} + .d2-1563072179 .background-color-B2{background-color:#0D32B2;} + .d2-1563072179 .background-color-B3{background-color:#E3E9FD;} + .d2-1563072179 .background-color-B4{background-color:#E3E9FD;} + .d2-1563072179 .background-color-B5{background-color:#EDF0FD;} + .d2-1563072179 .background-color-B6{background-color:#F7F8FE;} + .d2-1563072179 .background-color-AA2{background-color:#4A6FF3;} + .d2-1563072179 .background-color-AA4{background-color:#EDF0FD;} + .d2-1563072179 .background-color-AA5{background-color:#F7F8FE;} + .d2-1563072179 .background-color-AB4{background-color:#EDF0FD;} + .d2-1563072179 .background-color-AB5{background-color:#F7F8FE;} + .d2-1563072179 .color-N1{color:#0A0F25;} + .d2-1563072179 .color-N2{color:#676C7E;} + .d2-1563072179 .color-N3{color:#9499AB;} + .d2-1563072179 .color-N4{color:#CFD2DD;} + .d2-1563072179 .color-N5{color:#DEE1EB;} + .d2-1563072179 .color-N6{color:#EEF1F8;} + .d2-1563072179 .color-N7{color:#FFFFFF;} + .d2-1563072179 .color-B1{color:#0D32B2;} + .d2-1563072179 .color-B2{color:#0D32B2;} + .d2-1563072179 .color-B3{color:#E3E9FD;} + .d2-1563072179 .color-B4{color:#E3E9FD;} + .d2-1563072179 .color-B5{color:#EDF0FD;} + .d2-1563072179 .color-B6{color:#F7F8FE;} + .d2-1563072179 .color-AA2{color:#4A6FF3;} + .d2-1563072179 .color-AA4{color:#EDF0FD;} + .d2-1563072179 .color-AA5{color:#F7F8FE;} + .d2-1563072179 .color-AB4{color:#EDF0FD;} + .d2-1563072179 .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);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>UseridintPKparent_idintFKspouse_idintFKPetidintPKowner_idintFKCardidintPKowner_idintFKPostidintPKtextstringauthor_idintFKMetadataidintPKageintInfoidintPKcontentjson.RawMessage spousespouse childrenparentyowhoaheypets/ownercard/ownerposts/authormetadata/userinfo/user + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/ent2d2_right/elk/board.exp.json b/e2etests/testdata/stable/ent2d2_right/elk/board.exp.json index c3f32eced..31085175a 100644 --- a/e2etests/testdata/stable/ent2d2_right/elk/board.exp.json +++ b/e2etests/testdata/stable/ent2d2_right/elk/board.exp.json @@ -10,7 +10,7 @@ "x": 12, "y": 200 }, - "width": 218, + "width": 201, "height": 280, "opacity": 1, "strokeDash": 0, @@ -55,7 +55,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -83,7 +85,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" }, { @@ -111,7 +115,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" } ], @@ -135,10 +141,10 @@ "id": "Pet", "type": "sql_table", "pos": { - "x": 531, + "x": 514, "y": 12 }, - "width": 211, + "width": 194, "height": 108, "opacity": 1, "strokeDash": 0, @@ -183,7 +189,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -211,7 +219,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" } ], @@ -235,10 +245,10 @@ "id": "Card", "type": "sql_table", "pos": { - "x": 531, + "x": 514, "y": 140 }, - "width": 211, + "width": 194, "height": 108, "opacity": 1, "strokeDash": 0, @@ -283,7 +293,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -311,7 +323,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" } ], @@ -335,10 +349,10 @@ "id": "Post", "type": "sql_table", "pos": { - "x": 531, + "x": 514, "y": 268 }, - "width": 239, + "width": 222, "height": 144, "opacity": 1, "strokeDash": 0, @@ -383,7 +397,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -411,7 +427,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -439,7 +455,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" } ], @@ -463,10 +481,10 @@ "id": "Metadata", "type": "sql_table", "pos": { - "x": 531, + "x": 514, "y": 432 }, - "width": 163, + "width": 146, "height": 108, "opacity": 1, "strokeDash": 0, @@ -511,7 +529,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -539,7 +559,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], @@ -563,10 +583,10 @@ "id": "Info", "type": "sql_table", "pos": { - "x": 531, + "x": 514, "y": 560 }, - "width": 325, + "width": 308, "height": 108, "opacity": 1, "strokeDash": 0, @@ -611,7 +631,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -639,7 +661,7 @@ "labelWidth": 149, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], @@ -686,19 +708,19 @@ "labelPercentage": 0, "route": [ { - "x": 84.66600036621094, + "x": 79, "y": 200 }, { - "x": 84.66600036621094, + "x": 79, "y": 150 }, { - "x": 157.33299255371094, + "x": 146, "y": 150 }, { - "x": 157.33299255371094, + "x": 146, "y": 200 } ], @@ -732,19 +754,19 @@ "labelPercentage": 0, "route": [ { - "x": 157.33299255371094, + "x": 146, "y": 480 }, { - "x": 157.33299255371094, + "x": 146, "y": 530 }, { - "x": 84.66600036621094, + "x": 79, "y": 530 }, { - "x": 84.66600036621094, + "x": 79, "y": 480 } ], @@ -778,19 +800,19 @@ "labelPercentage": 0, "route": [ { - "x": 230, + "x": 213, "y": 246.66600036621094 }, { - "x": 270, + "x": 253, "y": 246.66600036621094 }, { - "x": 270, + "x": 253, "y": 66 }, { - "x": 531, + "x": 514, "y": 66 } ], @@ -824,19 +846,19 @@ "labelPercentage": 0, "route": [ { - "x": 230, + "x": 213, "y": 293.3330078125 }, { - "x": 320, + "x": 303, "y": 293.3330078125 }, { - "x": 320, + "x": 303, "y": 194 }, { - "x": 531, + "x": 514, "y": 194 } ], @@ -870,11 +892,11 @@ "labelPercentage": 0, "route": [ { - "x": 230, + "x": 213, "y": 340 }, { - "x": 531, + "x": 514, "y": 340 } ], @@ -908,19 +930,19 @@ "labelPercentage": 0, "route": [ { - "x": 230, + "x": 213, "y": 386.6659851074219 }, { - "x": 320, + "x": 303, "y": 386.6659851074219 }, { - "x": 320, + "x": 303, "y": 486 }, { - "x": 531, + "x": 514, "y": 486 } ], @@ -954,19 +976,19 @@ "labelPercentage": 0, "route": [ { - "x": 230, + "x": 213, "y": 433.3330078125 }, { - "x": 270, + "x": 253, "y": 433.3330078125 }, { - "x": 270, + "x": 253, "y": 614 }, { - "x": 531, + "x": 514, "y": 614 } ], diff --git a/e2etests/testdata/stable/ent2d2_right/elk/sketch.exp.svg b/e2etests/testdata/stable/ent2d2_right/elk/sketch.exp.svg index cc5d50b47..81af2dbf5 100644 --- a/e2etests/testdata/stable/ent2d2_right/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/ent2d2_right/elk/sketch.exp.svg @@ -1,17 +1,17 @@ -UseridintPKparent_idintFKspouse_idintFKPetidintPKowner_idintFKCardidintPKowner_idintFKPostidintPKtextstringauthor_idintFKMetadataidintPKageintInfoidintPKcontentjson.RawMessage spousespouse childrenparentyowhoaheypets/ownercard/ownerposts/authormetadata/userinfo/user - - - - - - - - + .d2-3400051897 .fill-N1{fill:#0A0F25;} + .d2-3400051897 .fill-N2{fill:#676C7E;} + .d2-3400051897 .fill-N3{fill:#9499AB;} + .d2-3400051897 .fill-N4{fill:#CFD2DD;} + .d2-3400051897 .fill-N5{fill:#DEE1EB;} + .d2-3400051897 .fill-N6{fill:#EEF1F8;} + .d2-3400051897 .fill-N7{fill:#FFFFFF;} + .d2-3400051897 .fill-B1{fill:#0D32B2;} + .d2-3400051897 .fill-B2{fill:#0D32B2;} + .d2-3400051897 .fill-B3{fill:#E3E9FD;} + .d2-3400051897 .fill-B4{fill:#E3E9FD;} + .d2-3400051897 .fill-B5{fill:#EDF0FD;} + .d2-3400051897 .fill-B6{fill:#F7F8FE;} + .d2-3400051897 .fill-AA2{fill:#4A6FF3;} + .d2-3400051897 .fill-AA4{fill:#EDF0FD;} + .d2-3400051897 .fill-AA5{fill:#F7F8FE;} + .d2-3400051897 .fill-AB4{fill:#EDF0FD;} + .d2-3400051897 .fill-AB5{fill:#F7F8FE;} + .d2-3400051897 .stroke-N1{stroke:#0A0F25;} + .d2-3400051897 .stroke-N2{stroke:#676C7E;} + .d2-3400051897 .stroke-N3{stroke:#9499AB;} + .d2-3400051897 .stroke-N4{stroke:#CFD2DD;} + .d2-3400051897 .stroke-N5{stroke:#DEE1EB;} + .d2-3400051897 .stroke-N6{stroke:#EEF1F8;} + .d2-3400051897 .stroke-N7{stroke:#FFFFFF;} + .d2-3400051897 .stroke-B1{stroke:#0D32B2;} + .d2-3400051897 .stroke-B2{stroke:#0D32B2;} + .d2-3400051897 .stroke-B3{stroke:#E3E9FD;} + .d2-3400051897 .stroke-B4{stroke:#E3E9FD;} + .d2-3400051897 .stroke-B5{stroke:#EDF0FD;} + .d2-3400051897 .stroke-B6{stroke:#F7F8FE;} + .d2-3400051897 .stroke-AA2{stroke:#4A6FF3;} + .d2-3400051897 .stroke-AA4{stroke:#EDF0FD;} + .d2-3400051897 .stroke-AA5{stroke:#F7F8FE;} + .d2-3400051897 .stroke-AB4{stroke:#EDF0FD;} + .d2-3400051897 .stroke-AB5{stroke:#F7F8FE;} + .d2-3400051897 .background-color-N1{background-color:#0A0F25;} + .d2-3400051897 .background-color-N2{background-color:#676C7E;} + .d2-3400051897 .background-color-N3{background-color:#9499AB;} + .d2-3400051897 .background-color-N4{background-color:#CFD2DD;} + .d2-3400051897 .background-color-N5{background-color:#DEE1EB;} + .d2-3400051897 .background-color-N6{background-color:#EEF1F8;} + .d2-3400051897 .background-color-N7{background-color:#FFFFFF;} + .d2-3400051897 .background-color-B1{background-color:#0D32B2;} + .d2-3400051897 .background-color-B2{background-color:#0D32B2;} + .d2-3400051897 .background-color-B3{background-color:#E3E9FD;} + .d2-3400051897 .background-color-B4{background-color:#E3E9FD;} + .d2-3400051897 .background-color-B5{background-color:#EDF0FD;} + .d2-3400051897 .background-color-B6{background-color:#F7F8FE;} + .d2-3400051897 .background-color-AA2{background-color:#4A6FF3;} + .d2-3400051897 .background-color-AA4{background-color:#EDF0FD;} + .d2-3400051897 .background-color-AA5{background-color:#F7F8FE;} + .d2-3400051897 .background-color-AB4{background-color:#EDF0FD;} + .d2-3400051897 .background-color-AB5{background-color:#F7F8FE;} + .d2-3400051897 .color-N1{color:#0A0F25;} + .d2-3400051897 .color-N2{color:#676C7E;} + .d2-3400051897 .color-N3{color:#9499AB;} + .d2-3400051897 .color-N4{color:#CFD2DD;} + .d2-3400051897 .color-N5{color:#DEE1EB;} + .d2-3400051897 .color-N6{color:#EEF1F8;} + .d2-3400051897 .color-N7{color:#FFFFFF;} + .d2-3400051897 .color-B1{color:#0D32B2;} + .d2-3400051897 .color-B2{color:#0D32B2;} + .d2-3400051897 .color-B3{color:#E3E9FD;} + .d2-3400051897 .color-B4{color:#E3E9FD;} + .d2-3400051897 .color-B5{color:#EDF0FD;} + .d2-3400051897 .color-B6{color:#F7F8FE;} + .d2-3400051897 .color-AA2{color:#4A6FF3;} + .d2-3400051897 .color-AA4{color:#EDF0FD;} + .d2-3400051897 .color-AA5{color:#F7F8FE;} + .d2-3400051897 .color-AB4{color:#EDF0FD;} + .d2-3400051897 .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);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>UseridintPKparent_idintFKspouse_idintFKPetidintPKowner_idintFKCardidintPKowner_idintFKPostidintPKtextstringauthor_idintFKMetadataidintPKageintInfoidintPKcontentjson.RawMessage spousespouse childrenparentyowhoaheypets/ownercard/ownerposts/authormetadata/userinfo/user + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/executive_grid/dagre/sketch.exp.svg b/e2etests/testdata/stable/executive_grid/dagre/sketch.exp.svg index 46067f7d8..fb494bef5 100644 --- a/e2etests/testdata/stable/executive_grid/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/executive_grid/dagre/sketch.exp.svg @@ -4,7 +4,7 @@ } @font-face { font-family: d2-2060964008-font-bold; - src: url("data:application/font-woff;base64,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"); + src: url("data:application/font-woff;base64,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"); }]]>grid w/ container + icongrid + icongrid + icon w/ containerabcdabcdabcdabcdabcdb childb childb child + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/grid_icon/elk/board.exp.json b/e2etests/testdata/stable/grid_icon/elk/board.exp.json new file mode 100644 index 000000000..be644853a --- /dev/null +++ b/e2etests/testdata/stable/grid_icon/elk/board.exp.json @@ -0,0 +1,1271 @@ +{ + "name": "", + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "grid w/ container + icon", + "type": "rectangle", + "classes": [ + "2x2" + ], + "pos": { + "x": 12, + "y": 27 + }, + "width": 404, + "height": 416, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B4", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "grid w/ container + icon", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 273, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "grid w/ container + icon.a", + "type": "rectangle", + "pos": { + "x": 72, + "y": 87 + }, + "width": 53, + "height": 190, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "a", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "grid w/ container + icon.b", + "type": "rectangle", + "pos": { + "x": 165, + "y": 87 + }, + "width": 191, + "height": 190, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/dev/github.svg", + "RawPath": "/dev%2Fgithub.svg", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "INSIDE_TOP_LEFT", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "b", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 12, + "labelHeight": 31, + "labelPosition": "INSIDE_TOP_RIGHT", + "zIndex": 0, + "level": 2 + }, + { + "id": "grid w/ container + icon.b.b child", + "type": "rectangle", + "pos": { + "x": 215, + "y": 161 + }, + "width": 91, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "b child", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 46, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "grid w/ container + icon.c", + "type": "rectangle", + "pos": { + "x": 72, + "y": 317 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "c", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "grid w/ container + icon.d", + "type": "rectangle", + "pos": { + "x": 165, + "y": 317 + }, + "width": 191, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "d", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 9, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "grid + icon", + "type": "rectangle", + "classes": [ + "2x2" + ], + "pos": { + "x": 436, + "y": 62 + }, + "width": 278, + "height": 347, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B4", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/dev/github.svg", + "RawPath": "/dev%2Fgithub.svg", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "INSIDE_TOP_LEFT", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "grid + icon", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 120, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "grid + icon.a", + "type": "rectangle", + "pos": { + "x": 501, + "y": 136 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "a", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "grid + icon.b", + "type": "rectangle", + "pos": { + "x": 594, + "y": 136 + }, + "width": 54, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "b", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "grid + icon.c", + "type": "rectangle", + "pos": { + "x": 501, + "y": 242 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "c", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "grid + icon.d", + "type": "rectangle", + "pos": { + "x": 594, + "y": 242 + }, + "width": 54, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "d", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 9, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "grid + icon w/ container", + "type": "rectangle", + "classes": [ + "2x2" + ], + "pos": { + "x": 734, + "y": 12 + }, + "width": 433, + "height": 447, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B4", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/dev/github.svg", + "RawPath": "/dev%2Fgithub.svg", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "INSIDE_TOP_LEFT", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "grid + icon w/ container", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 275, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "grid + icon w/ container.a", + "type": "rectangle", + "pos": { + "x": 808, + "y": 86 + }, + "width": 53, + "height": 166, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "a", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "grid + icon w/ container.b", + "type": "rectangle", + "pos": { + "x": 901, + "y": 86 + }, + "width": 191, + "height": 166, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "b", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 12, + "labelHeight": 31, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "grid + icon w/ container.b.b child", + "type": "rectangle", + "pos": { + "x": 951, + "y": 136 + }, + "width": 91, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "b child", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 46, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "grid + icon w/ container.c", + "type": "rectangle", + "pos": { + "x": 808, + "y": 292 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "c", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "grid + icon w/ container.d", + "type": "rectangle", + "pos": { + "x": 901, + "y": 292 + }, + "width": 191, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "d", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 9, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "no label grid w/ container + icon", + "type": "rectangle", + "classes": [ + "2x2" + ], + "pos": { + "x": 1187, + "y": 27 + }, + "width": 404, + "height": 416, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B4", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "no label grid w/ container + icon.a", + "type": "rectangle", + "pos": { + "x": 1247, + "y": 87 + }, + "width": 53, + "height": 190, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "a", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "no label grid w/ container + icon.b", + "type": "rectangle", + "pos": { + "x": 1340, + "y": 87 + }, + "width": 191, + "height": 190, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/dev/github.svg", + "RawPath": "/dev%2Fgithub.svg", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "INSIDE_TOP_LEFT", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "b", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 12, + "labelHeight": 31, + "labelPosition": "INSIDE_TOP_RIGHT", + "zIndex": 0, + "level": 2 + }, + { + "id": "no label grid w/ container + icon.b.b child", + "type": "rectangle", + "pos": { + "x": 1390, + "y": 161 + }, + "width": 91, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "b child", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 46, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "no label grid w/ container + icon.c", + "type": "rectangle", + "pos": { + "x": 1247, + "y": 317 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "c", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "no label grid w/ container + icon.d", + "type": "rectangle", + "pos": { + "x": 1340, + "y": 317 + }, + "width": 191, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "d", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 9, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "no label grid + icon", + "type": "rectangle", + "classes": [ + "2x2" + ], + "pos": { + "x": 1611, + "y": 82 + }, + "width": 267, + "height": 306, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B4", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/dev/github.svg", + "RawPath": "/dev%2Fgithub.svg", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "INSIDE_TOP_LEFT", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "no label grid + icon.a", + "type": "rectangle", + "pos": { + "x": 1671, + "y": 156 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "a", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "no label grid + icon.b", + "type": "rectangle", + "pos": { + "x": 1764, + "y": 156 + }, + "width": 54, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "b", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "no label grid + icon.c", + "type": "rectangle", + "pos": { + "x": 1671, + "y": 262 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "c", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "no label grid + icon.d", + "type": "rectangle", + "pos": { + "x": 1764, + "y": 262 + }, + "width": 54, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "d", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 9, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + } + ], + "connections": [], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "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/stable/grid_icon/elk/sketch.exp.svg b/e2etests/testdata/stable/grid_icon/elk/sketch.exp.svg new file mode 100644 index 000000000..96c6fa725 --- /dev/null +++ b/e2etests/testdata/stable/grid_icon/elk/sketch.exp.svg @@ -0,0 +1,102 @@ +grid w/ container + icongrid + icongrid + icon w/ containerabcdabcdabcdabcdabcdb childb childb child + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/grid_nested/dagre/board.exp.json b/e2etests/testdata/stable/grid_nested/dagre/board.exp.json index 7a47434c9..fd1b4b77b 100644 --- a/e2etests/testdata/stable/grid_nested/dagre/board.exp.json +++ b/e2etests/testdata/stable/grid_nested/dagre/board.exp.json @@ -14,7 +14,7 @@ "y": 150 }, "width": 384, - "height": 356, + "height": 388, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -52,7 +52,7 @@ "type": "rectangle", "pos": { "x": 60, - "y": 210 + "y": 242 }, "width": 53, "height": 130, @@ -93,7 +93,7 @@ "type": "rectangle", "pos": { "x": 153, - "y": 210 + "y": 242 }, "width": 171, "height": 130, @@ -125,7 +125,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 31, - "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPosition": "OUTSIDE_TOP_CENTER", "zIndex": 0, "level": 2 }, @@ -134,7 +134,7 @@ "type": "rectangle", "pos": { "x": 193, - "y": 242 + "y": 274 }, "width": 91, "height": 66, @@ -175,7 +175,7 @@ "type": "rectangle", "pos": { "x": 60, - "y": 380 + "y": 412 }, "width": 53, "height": 66, @@ -216,7 +216,7 @@ "type": "rectangle", "pos": { "x": 153, - "y": 380 + "y": 412 }, "width": 171, "height": 66, @@ -263,7 +263,7 @@ "y": 0 }, "width": 692, - "height": 656, + "height": 688, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -301,7 +301,7 @@ "type": "rectangle", "pos": { "x": 504, - "y": 60 + "y": 92 }, "width": 53, "height": 430, @@ -342,7 +342,7 @@ "type": "rectangle", "pos": { "x": 597, - "y": 60 + "y": 92 }, "width": 479, "height": 430, @@ -374,7 +374,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 31, - "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPosition": "OUTSIDE_TOP_CENTER", "zIndex": 0, "level": 2 }, @@ -383,7 +383,7 @@ "type": "rectangle", "pos": { "x": 617, - "y": 123 + "y": 155 }, "width": 439, "height": 335, @@ -424,7 +424,7 @@ "type": "rectangle", "pos": { "x": 637, - "y": 183 + "y": 215 }, "width": 186, "height": 240, @@ -465,7 +465,7 @@ "type": "rectangle", "pos": { "x": 657, - "y": 246 + "y": 278 }, "width": 146, "height": 140, @@ -506,7 +506,7 @@ "type": "rectangle", "pos": { "x": 697, - "y": 283 + "y": 315 }, "width": 66, "height": 66, @@ -547,7 +547,7 @@ "type": "rectangle", "pos": { "x": 843, - "y": 183 + "y": 215 }, "width": 193, "height": 240, @@ -588,7 +588,7 @@ "type": "rectangle", "pos": { "x": 863, - "y": 246 + "y": 278 }, "width": 153, "height": 140, @@ -629,7 +629,7 @@ "type": "rectangle", "pos": { "x": 903, - "y": 283 + "y": 315 }, "width": 73, "height": 66, @@ -670,7 +670,7 @@ "type": "rectangle", "pos": { "x": 504, - "y": 530 + "y": 562 }, "width": 53, "height": 66, @@ -711,7 +711,7 @@ "type": "rectangle", "pos": { "x": 597, - "y": 530 + "y": 562 }, "width": 479, "height": 66, @@ -755,7 +755,7 @@ ], "pos": { "x": 1196, - "y": 69 + "y": 85 }, "width": 480, "height": 518, @@ -796,7 +796,7 @@ "type": "rectangle", "pos": { "x": 1256, - "y": 129 + "y": 145 }, "width": 53, "height": 292, @@ -840,7 +840,7 @@ ], "pos": { "x": 1349, - "y": 129 + "y": 145 }, "width": 267, "height": 292, @@ -881,7 +881,7 @@ "type": "rectangle", "pos": { "x": 1409, - "y": 189 + "y": 205 }, "width": 53, "height": 66, @@ -922,7 +922,7 @@ "type": "rectangle", "pos": { "x": 1502, - "y": 189 + "y": 205 }, "width": 54, "height": 66, @@ -963,7 +963,7 @@ "type": "rectangle", "pos": { "x": 1409, - "y": 295 + "y": 311 }, "width": 53, "height": 66, @@ -1004,7 +1004,7 @@ "type": "rectangle", "pos": { "x": 1502, - "y": 295 + "y": 311 }, "width": 54, "height": 66, @@ -1045,7 +1045,7 @@ "type": "rectangle", "pos": { "x": 1256, - "y": 461 + "y": 477 }, "width": 53, "height": 66, @@ -1086,7 +1086,7 @@ "type": "rectangle", "pos": { "x": 1349, - "y": 461 + "y": 477 }, "width": 267, "height": 66, @@ -1125,9 +1125,13 @@ { "id": "grid w/ grid w/ grid", "type": "rectangle", + "classes": [ + "2x2", + "gap0" + ], "pos": { "x": 1736, - "y": 38 + "y": 54 }, "width": 321, "height": 581, @@ -1168,7 +1172,7 @@ "type": "rectangle", "pos": { "x": 1736, - "y": 84 + "y": 100 }, "width": 53, "height": 469, @@ -1207,9 +1211,13 @@ { "id": "grid w/ grid w/ grid.b", "type": "rectangle", + "classes": [ + "2x2", + "gap0" + ], "pos": { "x": 1789, - "y": 84 + "y": 100 }, "width": 268, "height": 469, @@ -1250,7 +1258,7 @@ "type": "rectangle", "pos": { "x": 1789, - "y": 125 + "y": 141 }, "width": 214, "height": 66, @@ -1291,7 +1299,7 @@ "type": "rectangle", "pos": { "x": 2003, - "y": 125 + "y": 141 }, "width": 54, "height": 66, @@ -1330,9 +1338,13 @@ { "id": "grid w/ grid w/ grid.b.c", "type": "rectangle", + "classes": [ + "2x2", + "gap0" + ], "pos": { "x": 1789, - "y": 191 + "y": 207 }, "width": 214, "height": 362, @@ -1373,7 +1385,7 @@ "type": "rectangle", "pos": { "x": 1789, - "y": 227 + "y": 243 }, "width": 53, "height": 66, @@ -1414,7 +1426,7 @@ "type": "rectangle", "pos": { "x": 1842, - "y": 227 + "y": 243 }, "width": 161, "height": 66, @@ -1455,7 +1467,7 @@ "type": "rectangle", "pos": { "x": 1789, - "y": 293 + "y": 309 }, "width": 53, "height": 260, @@ -1494,9 +1506,13 @@ { "id": "grid w/ grid w/ grid.b.c.d", "type": "rectangle", + "classes": [ + "2x2", + "gap0" + ], "pos": { "x": 1842, - "y": 293 + "y": 309 }, "width": 161, "height": 260, @@ -1535,9 +1551,13 @@ { "id": "grid w/ grid w/ grid.b.c.d.a", "type": "rectangle", + "classes": [ + "2x2", + "gap0" + ], "pos": { "x": 1842, - "y": 324 + "y": 340 }, "width": 107, "height": 163, @@ -1578,7 +1598,7 @@ "type": "rectangle", "pos": { "x": 1842, - "y": 355 + "y": 371 }, "width": 53, "height": 66, @@ -1619,7 +1639,7 @@ "type": "rectangle", "pos": { "x": 1895, - "y": 355 + "y": 371 }, "width": 54, "height": 66, @@ -1660,7 +1680,7 @@ "type": "rectangle", "pos": { "x": 1842, - "y": 421 + "y": 437 }, "width": 53, "height": 66, @@ -1701,7 +1721,7 @@ "type": "rectangle", "pos": { "x": 1895, - "y": 421 + "y": 437 }, "width": 54, "height": 66, @@ -1742,7 +1762,7 @@ "type": "rectangle", "pos": { "x": 1949, - "y": 324 + "y": 340 }, "width": 54, "height": 163, @@ -1783,7 +1803,7 @@ "type": "rectangle", "pos": { "x": 1842, - "y": 487 + "y": 503 }, "width": 107, "height": 66, @@ -1824,7 +1844,7 @@ "type": "rectangle", "pos": { "x": 1949, - "y": 487 + "y": 503 }, "width": 54, "height": 66, @@ -1865,7 +1885,7 @@ "type": "rectangle", "pos": { "x": 2003, - "y": 191 + "y": 207 }, "width": 54, "height": 362, @@ -1906,7 +1926,7 @@ "type": "rectangle", "pos": { "x": 1736, - "y": 553 + "y": 569 }, "width": 53, "height": 66, @@ -1947,7 +1967,7 @@ "type": "rectangle", "pos": { "x": 1789, - "y": 553 + "y": 569 }, "width": 268, "height": 66, diff --git a/e2etests/testdata/stable/grid_nested/dagre/sketch.exp.svg b/e2etests/testdata/stable/grid_nested/dagre/sketch.exp.svg index 136a16b78..9d6c62ad5 100644 --- a/e2etests/testdata/stable/grid_nested/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/grid_nested/dagre/sketch.exp.svg @@ -1,17 +1,17 @@ -grid w/ containergrid w/ nested containersgrid in gridgrid w/ grid w/ gridabcdabcdabcdabcdb childb 1abcdabcdb 2b 2aabcdb 3b 3aabcdb 4b 3aabcd - + .d2-3711635443 .fill-N1{fill:#0A0F25;} + .d2-3711635443 .fill-N2{fill:#676C7E;} + .d2-3711635443 .fill-N3{fill:#9499AB;} + .d2-3711635443 .fill-N4{fill:#CFD2DD;} + .d2-3711635443 .fill-N5{fill:#DEE1EB;} + .d2-3711635443 .fill-N6{fill:#EEF1F8;} + .d2-3711635443 .fill-N7{fill:#FFFFFF;} + .d2-3711635443 .fill-B1{fill:#0D32B2;} + .d2-3711635443 .fill-B2{fill:#0D32B2;} + .d2-3711635443 .fill-B3{fill:#E3E9FD;} + .d2-3711635443 .fill-B4{fill:#E3E9FD;} + .d2-3711635443 .fill-B5{fill:#EDF0FD;} + .d2-3711635443 .fill-B6{fill:#F7F8FE;} + .d2-3711635443 .fill-AA2{fill:#4A6FF3;} + .d2-3711635443 .fill-AA4{fill:#EDF0FD;} + .d2-3711635443 .fill-AA5{fill:#F7F8FE;} + .d2-3711635443 .fill-AB4{fill:#EDF0FD;} + .d2-3711635443 .fill-AB5{fill:#F7F8FE;} + .d2-3711635443 .stroke-N1{stroke:#0A0F25;} + .d2-3711635443 .stroke-N2{stroke:#676C7E;} + .d2-3711635443 .stroke-N3{stroke:#9499AB;} + .d2-3711635443 .stroke-N4{stroke:#CFD2DD;} + .d2-3711635443 .stroke-N5{stroke:#DEE1EB;} + .d2-3711635443 .stroke-N6{stroke:#EEF1F8;} + .d2-3711635443 .stroke-N7{stroke:#FFFFFF;} + .d2-3711635443 .stroke-B1{stroke:#0D32B2;} + .d2-3711635443 .stroke-B2{stroke:#0D32B2;} + .d2-3711635443 .stroke-B3{stroke:#E3E9FD;} + .d2-3711635443 .stroke-B4{stroke:#E3E9FD;} + .d2-3711635443 .stroke-B5{stroke:#EDF0FD;} + .d2-3711635443 .stroke-B6{stroke:#F7F8FE;} + .d2-3711635443 .stroke-AA2{stroke:#4A6FF3;} + .d2-3711635443 .stroke-AA4{stroke:#EDF0FD;} + .d2-3711635443 .stroke-AA5{stroke:#F7F8FE;} + .d2-3711635443 .stroke-AB4{stroke:#EDF0FD;} + .d2-3711635443 .stroke-AB5{stroke:#F7F8FE;} + .d2-3711635443 .background-color-N1{background-color:#0A0F25;} + .d2-3711635443 .background-color-N2{background-color:#676C7E;} + .d2-3711635443 .background-color-N3{background-color:#9499AB;} + .d2-3711635443 .background-color-N4{background-color:#CFD2DD;} + .d2-3711635443 .background-color-N5{background-color:#DEE1EB;} + .d2-3711635443 .background-color-N6{background-color:#EEF1F8;} + .d2-3711635443 .background-color-N7{background-color:#FFFFFF;} + .d2-3711635443 .background-color-B1{background-color:#0D32B2;} + .d2-3711635443 .background-color-B2{background-color:#0D32B2;} + .d2-3711635443 .background-color-B3{background-color:#E3E9FD;} + .d2-3711635443 .background-color-B4{background-color:#E3E9FD;} + .d2-3711635443 .background-color-B5{background-color:#EDF0FD;} + .d2-3711635443 .background-color-B6{background-color:#F7F8FE;} + .d2-3711635443 .background-color-AA2{background-color:#4A6FF3;} + .d2-3711635443 .background-color-AA4{background-color:#EDF0FD;} + .d2-3711635443 .background-color-AA5{background-color:#F7F8FE;} + .d2-3711635443 .background-color-AB4{background-color:#EDF0FD;} + .d2-3711635443 .background-color-AB5{background-color:#F7F8FE;} + .d2-3711635443 .color-N1{color:#0A0F25;} + .d2-3711635443 .color-N2{color:#676C7E;} + .d2-3711635443 .color-N3{color:#9499AB;} + .d2-3711635443 .color-N4{color:#CFD2DD;} + .d2-3711635443 .color-N5{color:#DEE1EB;} + .d2-3711635443 .color-N6{color:#EEF1F8;} + .d2-3711635443 .color-N7{color:#FFFFFF;} + .d2-3711635443 .color-B1{color:#0D32B2;} + .d2-3711635443 .color-B2{color:#0D32B2;} + .d2-3711635443 .color-B3{color:#E3E9FD;} + .d2-3711635443 .color-B4{color:#E3E9FD;} + .d2-3711635443 .color-B5{color:#EDF0FD;} + .d2-3711635443 .color-B6{color:#F7F8FE;} + .d2-3711635443 .color-AA2{color:#4A6FF3;} + .d2-3711635443 .color-AA4{color:#EDF0FD;} + .d2-3711635443 .color-AA5{color:#F7F8FE;} + .d2-3711635443 .color-AB4{color:#EDF0FD;} + .d2-3711635443 .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);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>grid w/ containergrid w/ nested containersgrid in gridgrid w/ grid w/ gridabcdabcdabcdabcdb childb 1abcdabcdb 2b 2aabcdb 3b 3aabcdb 4b 3aabcd + \ No newline at end of file diff --git a/e2etests/testdata/stable/grid_nested/elk/board.exp.json b/e2etests/testdata/stable/grid_nested/elk/board.exp.json index 09aabada3..d91b1c82a 100644 --- a/e2etests/testdata/stable/grid_nested/elk/board.exp.json +++ b/e2etests/testdata/stable/grid_nested/elk/board.exp.json @@ -125,7 +125,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 31, - "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPosition": "INSIDE_TOP_CENTER", "zIndex": 0, "level": 2 }, @@ -374,7 +374,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 31, - "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPosition": "INSIDE_TOP_CENTER", "zIndex": 0, "level": 2 }, @@ -1125,6 +1125,10 @@ { "id": "grid w/ grid w/ grid", "type": "rectangle", + "classes": [ + "2x2", + "gap0" + ], "pos": { "x": 1928, "y": 67 @@ -1207,6 +1211,10 @@ { "id": "grid w/ grid w/ grid.b", "type": "rectangle", + "classes": [ + "2x2", + "gap0" + ], "pos": { "x": 1981, "y": 113 @@ -1330,6 +1338,10 @@ { "id": "grid w/ grid w/ grid.b.c", "type": "rectangle", + "classes": [ + "2x2", + "gap0" + ], "pos": { "x": 1981, "y": 220 @@ -1494,6 +1506,10 @@ { "id": "grid w/ grid w/ grid.b.c.d", "type": "rectangle", + "classes": [ + "2x2", + "gap0" + ], "pos": { "x": 2034, "y": 322 @@ -1535,6 +1551,10 @@ { "id": "grid w/ grid w/ grid.b.c.d.a", "type": "rectangle", + "classes": [ + "2x2", + "gap0" + ], "pos": { "x": 2034, "y": 353 diff --git a/e2etests/testdata/stable/grid_nested/elk/sketch.exp.svg b/e2etests/testdata/stable/grid_nested/elk/sketch.exp.svg index cb2d63c26..4ba6609de 100644 --- a/e2etests/testdata/stable/grid_nested/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/grid_nested/elk/sketch.exp.svg @@ -1,17 +1,17 @@ -grid w/ containergrid w/ nested containersgrid in gridgrid w/ grid w/ gridabcdabcdabcdabcdb childb 1abcdabcdb 2b 2aabcdb 3b 3aabcdb 4b 3aabcd + .d2-2531972057 .fill-N1{fill:#0A0F25;} + .d2-2531972057 .fill-N2{fill:#676C7E;} + .d2-2531972057 .fill-N3{fill:#9499AB;} + .d2-2531972057 .fill-N4{fill:#CFD2DD;} + .d2-2531972057 .fill-N5{fill:#DEE1EB;} + .d2-2531972057 .fill-N6{fill:#EEF1F8;} + .d2-2531972057 .fill-N7{fill:#FFFFFF;} + .d2-2531972057 .fill-B1{fill:#0D32B2;} + .d2-2531972057 .fill-B2{fill:#0D32B2;} + .d2-2531972057 .fill-B3{fill:#E3E9FD;} + .d2-2531972057 .fill-B4{fill:#E3E9FD;} + .d2-2531972057 .fill-B5{fill:#EDF0FD;} + .d2-2531972057 .fill-B6{fill:#F7F8FE;} + .d2-2531972057 .fill-AA2{fill:#4A6FF3;} + .d2-2531972057 .fill-AA4{fill:#EDF0FD;} + .d2-2531972057 .fill-AA5{fill:#F7F8FE;} + .d2-2531972057 .fill-AB4{fill:#EDF0FD;} + .d2-2531972057 .fill-AB5{fill:#F7F8FE;} + .d2-2531972057 .stroke-N1{stroke:#0A0F25;} + .d2-2531972057 .stroke-N2{stroke:#676C7E;} + .d2-2531972057 .stroke-N3{stroke:#9499AB;} + .d2-2531972057 .stroke-N4{stroke:#CFD2DD;} + .d2-2531972057 .stroke-N5{stroke:#DEE1EB;} + .d2-2531972057 .stroke-N6{stroke:#EEF1F8;} + .d2-2531972057 .stroke-N7{stroke:#FFFFFF;} + .d2-2531972057 .stroke-B1{stroke:#0D32B2;} + .d2-2531972057 .stroke-B2{stroke:#0D32B2;} + .d2-2531972057 .stroke-B3{stroke:#E3E9FD;} + .d2-2531972057 .stroke-B4{stroke:#E3E9FD;} + .d2-2531972057 .stroke-B5{stroke:#EDF0FD;} + .d2-2531972057 .stroke-B6{stroke:#F7F8FE;} + .d2-2531972057 .stroke-AA2{stroke:#4A6FF3;} + .d2-2531972057 .stroke-AA4{stroke:#EDF0FD;} + .d2-2531972057 .stroke-AA5{stroke:#F7F8FE;} + .d2-2531972057 .stroke-AB4{stroke:#EDF0FD;} + .d2-2531972057 .stroke-AB5{stroke:#F7F8FE;} + .d2-2531972057 .background-color-N1{background-color:#0A0F25;} + .d2-2531972057 .background-color-N2{background-color:#676C7E;} + .d2-2531972057 .background-color-N3{background-color:#9499AB;} + .d2-2531972057 .background-color-N4{background-color:#CFD2DD;} + .d2-2531972057 .background-color-N5{background-color:#DEE1EB;} + .d2-2531972057 .background-color-N6{background-color:#EEF1F8;} + .d2-2531972057 .background-color-N7{background-color:#FFFFFF;} + .d2-2531972057 .background-color-B1{background-color:#0D32B2;} + .d2-2531972057 .background-color-B2{background-color:#0D32B2;} + .d2-2531972057 .background-color-B3{background-color:#E3E9FD;} + .d2-2531972057 .background-color-B4{background-color:#E3E9FD;} + .d2-2531972057 .background-color-B5{background-color:#EDF0FD;} + .d2-2531972057 .background-color-B6{background-color:#F7F8FE;} + .d2-2531972057 .background-color-AA2{background-color:#4A6FF3;} + .d2-2531972057 .background-color-AA4{background-color:#EDF0FD;} + .d2-2531972057 .background-color-AA5{background-color:#F7F8FE;} + .d2-2531972057 .background-color-AB4{background-color:#EDF0FD;} + .d2-2531972057 .background-color-AB5{background-color:#F7F8FE;} + .d2-2531972057 .color-N1{color:#0A0F25;} + .d2-2531972057 .color-N2{color:#676C7E;} + .d2-2531972057 .color-N3{color:#9499AB;} + .d2-2531972057 .color-N4{color:#CFD2DD;} + .d2-2531972057 .color-N5{color:#DEE1EB;} + .d2-2531972057 .color-N6{color:#EEF1F8;} + .d2-2531972057 .color-N7{color:#FFFFFF;} + .d2-2531972057 .color-B1{color:#0D32B2;} + .d2-2531972057 .color-B2{color:#0D32B2;} + .d2-2531972057 .color-B3{color:#E3E9FD;} + .d2-2531972057 .color-B4{color:#E3E9FD;} + .d2-2531972057 .color-B5{color:#EDF0FD;} + .d2-2531972057 .color-B6{color:#F7F8FE;} + .d2-2531972057 .color-AA2{color:#4A6FF3;} + .d2-2531972057 .color-AA4{color:#EDF0FD;} + .d2-2531972057 .color-AA5{color:#F7F8FE;} + .d2-2531972057 .color-AB4{color:#EDF0FD;} + .d2-2531972057 .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);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>grid w/ containergrid w/ nested containersgrid in gridgrid w/ grid w/ gridabcdabcdabcdabcdb childb 1abcdabcdb 2b 2aabcdb 3b 3aabcdb 4b 3aabcd \ No newline at end of file diff --git a/e2etests/testdata/stable/grid_nested_gap0/dagre/sketch.exp.svg b/e2etests/testdata/stable/grid_nested_gap0/dagre/sketch.exp.svg index 0bcc0b325..4d9c96d6a 100644 --- a/e2etests/testdata/stable/grid_nested_gap0/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/grid_nested_gap0/dagre/sketch.exp.svg @@ -4,14 +4,14 @@ } @font-face { font-family: d2-918244425-font-regular; - src: url("data:application/font-woff;base64,d09GRgABAAAAAAv0AAoAAAAAEmwAAguFAAAAAAAAAAAAAAAAAAAAAAAAAABPUy8yAAAA9AAAAGAAAABgXd/Vo2NtYXAAAAFUAAAAlwAAAL4C4wP7Z2x5ZgAAAewAAAWkAAAHTKtVOSVoZWFkAAAHkAAAADYAAAA2G4Ue32hoZWEAAAfIAAAAJAAAACQKhAXdaG10eAAAB+wAAABsAAAAbDCyBW1sb2NhAAAIWAAAADgAAAA4F+wZwG1heHAAAAiQAAAAIAAAACAAMwD2bmFtZQAACLAAAAMjAAAIFAbDVU1wb3N0AAAL1AAAAB0AAAAg/9EAMgADAgkBkAAFAAACigJYAAAASwKKAlgAAAFeADIBIwAAAgsFAwMEAwICBGAAAvcAAAADAAAAAAAAAABBREJPAEAAIP//Au7/BgAAA9gBESAAAZ8AAAAAAeYClAAAACAAA3icdM09SsMAAIbhJyb+R43/Dg6ewRuI4uSoBwgiKAQFFy/jIIro3q1L26N06TW+Qujad32GF4VSgVrlE+capdqFS1du3LrzoPXkRefNR8JCr3u913r0rPPqPck0s0wyzijDDPKfv/zmJ9/56j/LK5xZUaqsWrNuw6Yt22o7du1p7Dtw6MixE6fMAQAA//8BAAD//zc8JMkAeJxsVVtsI1cZ/s/xxBMnTp1Zezy249vMJDO2k9iJx/bk4oyb+BI3Nzv2Rttc1dAQp7tsQYlKFQisSlq2AiGMtEgr0QIPfamEqBBSAPWtoiXQqhISonSFVisezEqLBLL8gFabMZqxE22AtyP5+P+/2/kGOmAVAMfxHTCACSxwBWgAiWKpAVYUeVKWZJlnDLKIKHIV/VWtIvRcjEgkiNGZRzOHt26h57+J75x9aeL1SuXDrVdfVb9Xe6hG0acPAYMBAHtwFUxAAVhJSRQEkTcaDVbJyos8+bHvQ98Vfy9h8d+7v3V/VflnCn15Z0e+OT5+U13D1bOvnJ4CACCINRu4D78FHoAOThDisURCitoZUhB4zmikbXa7FE3IjNGISqXX5hdeLyc33MOumZCyKUXXlcicLyx+wbx898b1u6VRf8LNTX+1VDqcCXCx4SgAYFgDwDFchU4Np0RJUTttM/KiFE3EYwLPr71z98dv/3Bl/uDg4GAeV9996+2fZ757dPSGjm0NAP1J56hpRrO0RPPUGvqa+vnjx7iau59T713c+wRXoUPfQLH0Whn5cPXsV7Mtjm4A9ARXgdR+5+MszVN/+wg9+AjP5XJnJ60715oNHMZVzR9dB0qiWtwT+tFoROn0DaUczA4O5YJF5bo5cfQSek39RmFdENYL6Fi99dJRArCmJ/oFqoML+gEYThNUjulikqIuLU3xmlFiNCHHdYE/mFr+/o+owUBozuPnXpxYLWZIA7ds5xX+cDtqfm66uEL5xni/bdwevLmu/nnCHZrhfLctyUhwABCEmw30HqprHP+/f+f2XXl2Lzl9QxnJOkN0xDOUFctpbsLezxbNyf1iaT/JMQmrI7IyVq54bLKH1byLNBvoc3wKVvCfc9GHi3HpnIQcv1j07/WXJ7flkOInyhnS4F5wPpv0jXvFlJAzv3FYOFC8rvL7Z2Pj7mA2rbqZSHns2ouAdfx/QHVwgO8SA9pmJNmL8BnYmLYGMdPXldSOvPlFhNVfd1zL8ZN9Hl/hY0SkxqVl89R+obivHO31OE2LGzSVsHmRMLdY0P0tAaDP8CnY9IzQ5LkXlD6YpEolA78YXZwtDY0MTA7g0w922Mj2pvoJCmYUYUD9KTSbkAWAX+ITLIATAIzgOmplp9RswF/wKVhaKunRaQN/NxwsPWMiSLK7024ej+PdsztWCiGFIM4xoXobEyP9D6YMaeCXLkChWo6/jKmt379QHSzQd0k/TUAtZHF9Fm2zI8tkJZWqTCZ3U6ndZGpxMaUsLbW9T+6XivvJTKV8dW/varlyrtcWqrdfbQtbO1UtYM580MP0mm0WX9qJas+HE115gogqartX3M0GOkZ1COmaiLJuZTwmCGIYx2NPZVSrGMaLNbh/jG3xQX9mcGSElfq4mdBqYXjJHXAm/OFB70gfnxkOFsyiW3aywz4nx3T1sPHgZMHPxKyOkJvx0N09rBwWZwL6fkezgbL4ZWDanvBxWZb0Arnw5tHSVH6hK3t8zIZ6vOZeW8S8lkc9Ssebb6bV+vCoiVDIbn3WfLOBPkU1zadL/lLtZ/BgMV8eHBEmOU0XbsG8vYli6mcZRRxEq6prITACCMwA6HeoBj0AkkGy2u2apLJVMrz/3spGN9NNdDNdG8s/QzX1H/15ns/3I5vq0ngA4BNUA/a//vfUBN7Q6n7S8JPbV/Odz5BEZ69pvrhgojqJTgs5u/StnZzJYiI6e7syqKb+nUtzXJpDzqdOLtTBZwYGsrz6BJDWXOi3+DtaoqS4glsROq8vm9GoPR6JDrzw7VxyKpBxRwLryupu+pUF15jzN6Mv/OAVSc4N+yND8cpK8uu3C5iYbeUJ3kE17buldXSphGoav+bv8RzI+AS6ASi9YVo7HD6fw+Hz4TmP0+H1Opwe+A8AAAD//wEAAP//jtuNPQABAAAAAguFoorxUV8PPPUAAwPoAAAAANhdoKEAAAAA3WYvNv46/tsIbwPIAAAAAwACAAAAAAAAAAEAAAPY/u8AAAiY/jr+OghvAAEAAAAAAAAAAAAAAAAAAAAbAo0AWQDIAAACIAADAjsANAJnAFoB7gBaAeYAWgIYABwChQBXAfgANAHIAC4CKwAvAfAALgIgAFIA9gBFAP8AUgIjAFICHgAuAVsAUgGjABwBUgAYAiAASwHTAAwCzgAYAfEAJAD2AFIAAP/JAAAALAAsAFAAgACeALIAwgDUAPgBMAFeAZABxAHmAfICDgIwAlwCfAK8AuIDBAMgA1oDhAOQA6YAAQAAABsAjAAMAGYABwABAAAAAAAAAAAAAAAAAAQAA3icnJTdThtXFIU/B9ttVDUXFYrIDTqXbZWM3QiiBK5MCYpVhFOP0x+pqjR4xj9iPDPyDFCqPkCv+xZ9i1z1OfoQVa+rs7wNNqoUgRCwzpy991lnr7UPsMm/bFCrPwT+av5guMZ2c8/wAx41nxre4Ljxt+H6SkyDuPGb4SZfNvqGP+J9/Q/DH7NT/9nwQ7bqR4Y/4Xl90/CnG45/DD9ih/cLXIOX/G64xhaF4Qds8pPhDR5jNWt1HtM23OAztg032QYGTKlImZIxxjFiyphz5iSUhCTMmTIiIcbRpUNKpa8ZkZBj/L9fI0Iq5kSqOKHCkRKSElEysYq/KivnrU4caTW3vQ4VEyJOlXFGRIYjZ0xORsKZ6lRUFOzRokXJUHwLKkoCSqakBOTMGdOixxHHDJgwpcRxpEqeWUjOiIpLIp3vLMJ3ZkhCRmmszsmIxdOJX6LsLsc4ehSKXa18vFbhKY7vlO255Yr9ikC/boXZ+rlLNhEX6meqrqTauZSCE+36czt8K1yxh7tXf9aZfLhHsf5XqnzKufSPpVQmJhnObdEhlINC9wTHgdZdQnXke7oMeEOPdwy07tCnT4cTBnR5rdwefRxf0+OEQ2V0hRd7R3LMCT/i+IauYnztxPqzUCzhFwpzdymOc91jRqGee+aB7prohndX2M9QvuaOUjlDzZGPdNIv05xFjM0VhRjO1MulN0rrX2yOmOkuXtubfT8NFzZ7yym+ItcMe7cuOHnlFow+pGpwyzOX+gmIiMk5VcSQnBktKq7E+y0R56Q4DtW9N5qSis51jj/nSi5JmIlBl0x15hT6G5lvQuM+XPO9s7ckVr5nenZ9q/uc4tSrG43eqXvLvdC6nKwo0DJV8xU3DcU1M+8nmqlV/qFyS71uOc/ok0j1VDe4/Q48J6DNDrvsM9E5Q+1c2BvR1jvR5hX76sEZiaJGcnViFXYJeMEuu7zixVrNDocc0GP/DhwXWT0OeH1rZ12nZRVndf4Um7b4Op5dr17eW6/P7+DLLzRRNy9jX9r4bl9YtRv/nxAx81zc1uqd3BOC/wAAAP//AQAA//8HW0wwAHicYmBmAIP/5xiMGLAAAAAAAP//AQAA//8vAQIDAAAA"); + src: url("data:application/font-woff;base64,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"); } .d2-918244425 .text-bold { font-family: "d2-918244425-font-bold"; } @font-face { font-family: d2-918244425-font-bold; - src: url("data:application/font-woff;base64,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"); + src: url("data:application/font-woff;base64,d09GRgABAAAAAAvoAAoAAAAAEnAAAguFAAAAAAAAAAAAAAAAAAAAAAAAAABPUy8yAAAA9AAAAGAAAABgXxHXrmNtYXAAAAFUAAAAlgAAAL4C4wQRZ2x5ZgAAAewAAAWSAAAHOFlx0/FoZWFkAAAHgAAAADYAAAA2G38e1GhoZWEAAAe4AAAAJAAAACQKfwXaaG10eAAAB9wAAABsAAAAbDOBBEtsb2NhAAAISAAAADgAAAA4F6YZem1heHAAAAiAAAAAIAAAACAAMwD3bmFtZQAACKAAAAMoAAAIKgjwVkFwb3N0AAALyAAAAB0AAAAg/9EAMgADAioCvAAFAAACigJYAAAASwKKAlgAAAFeADIBKQAAAgsHAwMEAwICBGAAAvcAAAADAAAAAAAAAABBREJPACAAIP//Au7/BgAAA9gBESAAAZ8AAAAAAfAClAAAACAAA3icdM09SsMAAIbhJyb+R43/Dg6ewRuI4uSoBwgiKAQFF68jiuhsty5tj9Kl1/gKoWvf9RleFEoFapV/nGuUahcuXblx686D1pMXnTcfCQu97vVe69Gzzqv3JNPMMsk4owwzyF9+85PvfOWz/yyvcGZFqbJqzboNm7Zsq+3Ytaex78ChI8dOnDIHAAD//wEAAP//RkYk3wAAeJxkVFts0+wZfr8vib2k7t86ieMkzdm1nbRNSuI47pH0kJ74k9LD/vZH9LQKbWOlLYKydqiISWMHQRgS6Rgb0yYhpmkSu0C92ZC6S9i03oHG1bQNoWriKpqiCaHUmeyknP4Ly5a+z+/7vM/hBRNMAOBlvAMGMEMDWIEBkOggzUuiyJGKpCgca1BERJMT2Kr+9oEYMUYixpbAXf/lxUWUW8A7h+dO55aX/7fY3a3++k+P1Zvo4mMAXHkLgAdxHsxAA9hISRQEkSMIg02ycSJHHjTeaKhvqjdSrrf7j/Z/FX4aRid6euJrUnJV/SHOH27cuwcAgCBWKeFj+C40AZhCgiAnUykp4WBJQeBCBMHYHVIipbAEmp+6Pv3Fzan0meC4S+HaxlpnRsNp5/gUlf3Z6rlfTEqhBdabWBg4c77ZNbcEGHIAOIvzYKlOLCUcDsZOEJwoJVIpOSkIHJf745nbkxO3lqKejulYbLrDg/OZW+fP3x7ZDM+Nj5/idXw5APQffU6NNybISAzH5NA99c3Llzi//fPtQ3h37yXOg0nvRgeZXAFhnD8sblfPXQDYhvNAauecHGQ4en8Xvd3Fjdvbh8XqnbFKCZ/EeY1RU0iQaYnWx9c/CDR+9Uc7XYrS89MfUHceoAW1sJTNLqFV9f6DO4ChpVJCz1EZXMABsCGNSEXnkBR1Rhma0/RREilF1nn9c2biWgFzEX9fs9y+0rX4zS2L0T/yNRdvG+/xU7Pp8S8bgqKT+Ya3ee2C+krycBdY26yl1etkdazNlRLaQ2Vwf6obF3qvGoFcQ+v9o9/NxEY8Q1xATqePOWO2Ln6G6r00Nb3R62MXvdn+vhzTsBRo0jjAIFZKqIz3wAaBozn0wqIsfTCBUGvz37n17sVkpMNFFLYsRvcwdopWW6udS7VTN743eem4x5n9/eFg3M1t2V1/s342ODI2BFjH/m9UBif4P0KvOYQMOhxSQsNukJJaF+QfuTAweK57ZL7diNUXluG4nIoLC7/cFdtCKer4xtTkRjq9krHx5pQUPOX2oa6I3F7Vs18bCO+BXfcEQx4JQeuFSbq/QHo+T0yOFbwBT9iJ9x6ecrWuzKv7KJgKu1j1EVQqoADAP/AzLGgOAhLccL1au1JCVrwHDVWWjryiAf9LtrtAm00kYaV46vTnmDt8wVoRWjWRR5hQuYaJlb6CactiDOTegULFtC/6EaYqf5hEZWj4JLV6wsSEFq+qPMiRXs9k1tPptUxmLR2NxaKxaLSmfe/G9NSl3s1cX39Ws0CNL3QLlcH6IbbaKqgia8oKjMfirHc1enrtqDibiJtMV43GSEL9FyBgKiX0G1QGUedEVBx6epKCIMawnHxfjLE7WB9m7MSz+LeEgVDaH/R5Y25fd/jsF52z/gF30t3ZKQR6I9+mBP+cq4m10Q6bhWrujAzNiM4v7Q7R6fqsjuuMDc5XdaYrJbSGN4Ct5lbmZEWR9EXxPggwdzKTpS9vbnJeymVhbQr1nZm/rhLXrl182sITxhWCqtbqqZTQG1TU9PlIV7pm/79PjhV8AY/gKGzVGfwnqJV5lFT/KUfcXjSqNg7xbYCAAkAVVIR6AMkgsQ6HRqWiSIbd3+30WWwWo9lm6b95HxVf8zlRzPGv1Ua9txMAF1ERgp/890EFrrbnSXJn+/YxwkIYyXqzcrXD3EAaSTPZ/pPNh1GynjSSdWQbKh7wo4JwgjvQ36P8gdr4hBsOh4e5J3o/HwB6hX8MHgBJPo6rtqntK91LWmIkhp+8MhyPhBTnRPtyJr0gd88lnT2O7389d+VstD0uuk8mpMTpXnl9PWUwbdd8BM9REQzVXdxfQEW1EVDlD7gTpvEzqAOg9c2iWd9O8LEYz8diuLOF41q0B/4PAAD//wEAAP//a46HeAAAAAEAAAACC4U6l7jrXw889QABA+gAAAAA2F2ghAAAAADdZi82/jf+xAhtA/EAAQADAAIAAAAAAAAAAQAAA9j+7wAACJj+N/43CG0AAQAAAAAAAAAAAAAAAAAAABsCsgBQAMgAAAI9//oCRgAuAnsATQIMAE0CBgBNAiwAGQKZAEkCDwAqAdMAJAI9ACcCBgAkAjsAQQEUADcBHgBBAjwAQQIrACQBjgBBAbsAFQF/ABECOAA8AgsADAMIABgCEAAeARQAQQAA/60AAAAsACwAUAB8AKAAtADEANYA9AEsAVgBigG+AeAB7AIIAioCVgJ2ArIC2AL6AxYDTgN6A4YDnAABAAAAGwCQAAwAYwAHAAEAAAAAAAAAAAAAAAAABAADeJyclM9uG1UUxn9ObNMKwQJFVbqJ7oJFkejYVEnVNiuH1IpFFAePC0JCSBPP+I8ynhl5Jg7hCVjzFrxFVzwEz4FYo/l87NgF0SaKknx37vnznXO+c4Ed/mabSvUh8Ec9MVxhr35ueIsH9RPD27TrW4arPKn9abhGWJsbrvN5rWf4I95WfzP8gP3qT4YfslttG/6YZ9Udw59sO/4y/Cn7vF3gCrzgV8MVdskMb7HDj4a3eYTFrFR5RNNwjc/YM1xnD+gzoSBmQsIIx5AJI66YEZHjEzFjwpCIEEeHFjGFviYEQo7Rf34N8CmYESjimAJHjE9MQM7YIv4ir5RzZRzqNLO7FgVjAi7kcUlAgiNlREpCxKXiFBRkvKJBg5yB+GYU5HjkTIjxSJkxokGXNqf0GTMhx9FWpJKZT8qQgmsC5XdmUXZmQERCbqyuSAjF04lfJO8Opzi6ZLJdj3y6EeFLHN/Ju+SWyvYrPP26NWabeZdsAubqZ6yuxLq51gTHui3ztvhWuOAV7l792WTy/h6F+l8o8gVXmn+oSSVikuDcLi18Kch3j3Ec6dzBV0e+p0OfE7q8oa9zix49WpzRp8Nr+Xbp4fiaLmccy6MjvLhrSzFn/IDjGzqyKWNH1p/FxCJ+JjN15+I4Ux1TMvW8ZO6p1kgV3n3C5Q6lG+rI5TPQHpWWTvNLtGcBI1NFJoZT9XKpjdz6F5oipqqlnO3tfbkNc9u95RbfkGqHS7UuOJWTWzB631S9dzRzrR+PgJCUC1kMSJnSoOBGvM8JuCLGcazunWhLClornzLPjVQSMRWDDonizMj0NzDd+MZ9sKF7Z29JKP+S6eWqqvtkcerV7YzeqHvLO9+6HK1NoGFTTdfUNBDXxLQfaafW+fvyzfW6pTzliJSY8F8vwDM8muxzwCFjZRjoZm6vQ1MvRJOXHKr6SyJZDaXnyCIc4PGcAw54yfN3+rhk4oyLW3FZz93imCO6HH5QFQv7Lke8Xn37/6y/i2lTtTierk4v7j3FJ3dQ6xfas9v3sqeJlZOYW7TbrTgjYFpycbvrNbnHeP8AAAD//wEAAP//9LdPUXicYmBmAIP/5xiMGLAAAAAAAP//AQAA//8vAQIDAAAA"); }]]>outerstartendvolume groupvolume definitionvolume + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/multiple_box_selection/elk/board.exp.json b/e2etests/testdata/stable/multiple_box_selection/elk/board.exp.json new file mode 100644 index 000000000..f9f1eb196 --- /dev/null +++ b/e2etests/testdata/stable/multiple_box_selection/elk/board.exp.json @@ -0,0 +1,371 @@ +{ + "name": "", + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "outer", + "type": "rectangle", + "pos": { + "x": 12, + "y": 153 + }, + "width": 408, + "height": 396, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B4", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "outer", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 63, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "outer.vg", + "type": "rectangle", + "pos": { + "x": 62, + "y": 208 + }, + "width": 308, + "height": 286, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "volume group", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 140, + "labelHeight": 31, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "outer.vg.vd", + "type": "rectangle", + "pos": { + "x": 112, + "y": 273 + }, + "width": 208, + "height": 176, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": true, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "volume definition", + "fontSize": 20, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 147, + "labelHeight": 26, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "outer.vg.vd.volume", + "type": "rectangle", + "pos": { + "x": 162, + "y": 333 + }, + "width": 98, + "height": 66, + "opacity": 1, + "strokeDash": 3, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N7", + "stroke": "B2", + "shadow": false, + "3d": false, + "multiple": true, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "volume", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 53, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 4 + }, + { + "id": "start", + "type": "rectangle", + "pos": { + "x": 176, + "y": 12 + }, + "width": 80, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "start", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 35, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "end", + "type": "rectangle", + "pos": { + "x": 180, + "y": 624 + }, + "width": 72, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "end", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 27, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + } + ], + "connections": [ + { + "id": "(start -> outer.vg.vd.volume)[0]", + "src": "start", + "srcArrow": "none", + "dst": "outer.vg.vd.volume", + "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, + "route": [ + { + "x": 216, + "y": 78 + }, + { + "x": 216, + "y": 323 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(outer.vg.vd.volume -> end)[0]", + "src": "outer.vg.vd.volume", + "srcArrow": "none", + "dst": "end", + "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, + "route": [ + { + "x": 216, + "y": 399 + }, + { + "x": 216, + "y": 624 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + } + ], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "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/stable/multiple_box_selection/elk/sketch.exp.svg b/e2etests/testdata/stable/multiple_box_selection/elk/sketch.exp.svg new file mode 100644 index 000000000..6ac271a10 --- /dev/null +++ b/e2etests/testdata/stable/multiple_box_selection/elk/sketch.exp.svg @@ -0,0 +1,102 @@ +outerstartendvolume groupvolume definitionvolume + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/multiple_offset/dagre/sketch.exp.svg b/e2etests/testdata/stable/multiple_offset/dagre/sketch.exp.svg index 2494e1911..12e0480ff 100644 --- a/e2etests/testdata/stable/multiple_offset/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/multiple_offset/dagre/sketch.exp.svg @@ -4,14 +4,14 @@ } @font-face { font-family: d2-3373084213-font-regular; - src: url("data:application/font-woff;base64,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"); + src: url("data:application/font-woff;base64,d09GRgABAAAAAAokAAoAAAAAD7wAAguFAAAAAAAAAAAAAAAAAAAAAAAAAABPUy8yAAAA9AAAAGAAAABgXd/Vo2NtYXAAAAFUAAAAUQAAAFgApQE7Z2x5ZgAAAagAAARkAAAFUAaBfFxoZWFkAAAGDAAAADYAAAA2G4Ue32hoZWEAAAZEAAAAJAAAACQKhAXQaG10eAAABmgAAAA4AAAAOBw7AsFsb2NhAAAGoAAAAB4AAAAeCegIqm1heHAAAAbAAAAAIAAAACAAJgD2bmFtZQAABuAAAAMjAAAIFAbDVU1wb3N0AAAKBAAAAB0AAAAg/9EAMgADAgkBkAAFAAACigJYAAAASwKKAlgAAAFeADIBIwAAAgsFAwMEAwICBGAAAvcAAAADAAAAAAAAAABBREJPAEAAIP//Au7/BgAAA9gBESAAAZ8AAAAAAeYClAAAACAAA3icJMq7GYJAGADBuYd66tmLKT3QBBRAN+QURT8/H7DRBoOkSOiqEU2TMZgtEfibzos9tlgve1c9PL00bx9f3U+SFQ4AAAD//wEAAP//LoIL2gAAAHicXJNLbBNXF8fPvXZs0Gcegz22Ymxnxhd7xsk4k/jOK3ZsJ8aOHX8JNo4iEiDkRRMWpFUlKCCkhAWFNkrVh1hUhQXsqFQkWFUs6AMVmkpVd6WbbrpBqO0KWepLjKsZN0Htajaj+/+d3/kf6IBpAKzia+CAnbAH9gELQBmeifGCQNw61XUScOgCYtzT6EfzPYRGFaemOfsLvxQurK2hqVV87cXp9OXl5Ucnzp0z33n6zEyh754BBqXVRPfQcwjCAYBANK4qmq7E4yTqcguaRlN+liECcbmElKarLhfr8z/MHn73OtMjdlfDXHQxPV0vuh3Rw36SIxfmU57R4fok02UQzjfgT6wcM5+kQ92FaNfVPYNyIgYYGq0m+gtvghc4gI5oXCBuwlDW3c7y2UGqYuezfj9KREc5h7vQwHxNnF3IzI4M1jKlriHC5T18OIU3H06FhSuvT7yRKy0frS9GuVYoAACAoAGAfkDPwWd5ogG6NQvTfptpFN0Ocig1Xm5IfbFMDD0dIfL8jPktShRz8Zh5EwCD1GqiR3gd/geBLTdtyG1G1uf/Y25lZW52ZWXWKBYNo1Ty3Ll56/btWzfvFNY2Ni5e3NhYs3lqAOhTvAoeAKpShqiaplOGsrUPzkjDwfzlInqi7gjsffG42OY/AIC+wuuw3/o/h/9RImxrsoRRVpy7MjKYFYshWTyWm146eHYsaHTe7597/yzVR5KcLKnLk4MXr9awswwIgq0m+gyvQ7c9jaD7/dQeJE7UlKb9N8LybyX9OrbEdYcPGemqMD1WrEUzVDwYlmJHjYnTQ0q6bsx6dKJFeofU+ACX5zRe1g6EFZKcHE9Xfc5dEwWjIQEGBgB9j1dhp7URnVo1Iy6X26vyKrI8EPbUphM5PcHd1PwJMcePHHl+P1jpDEgBU7mroQ/NM4W7lpfOVhN9iVet9vxrBhvdy7Ok3SSb/Oexk7wYHjMyh6s5Xg5LLMr/xgR6w/q0ll3waLwWStYOFqo+bwjR8gPP7p6pUmk+ZfnH0Ndqom/s3YsAKOpybwU5onGrCFZIwG0fiutleVFHVyWyo5yVhzJK7mS69Fpe+f/+Xq8RSVZlHKkLE4vKJKqI0szCeD43an5SfHvp0o2yEKaB/fTcK7GexYXsccXevwSAvsarsAuA5rDOqzy72+G+5xLG8+ZDdH2gIvqc5z//+EiZVt68+tEMADgg0WqiTbwOXSDBgO3HJtXVbWK7OWwEW1+H9rLEfke7CIJ94X8OntCJHiFaX4NOzIdEXzjF0RmGI2lVyiSKHUapr9YbpzVPsp7qHu7f6+yspPqribkqn5H3OPdK2R75UBKdCg8RuWDI8RQxH+f7E0p8X+eIpJbafsVWE32x5dfrs+Tqtk3v9lY13eUi0S10m/1sJsOVu3ZUsr3DU3Q82OvTI8kxGUXqYmNRmaT5kwOlV9GD3KiYnJkff/G7EFICIeX8UlyyxRbfWr50owwAfwMAAP//AQAA//+mLCSNAAEAAAACC4U1vqztXw889QADA+gAAAAA2F2goQAAAADdZi82/jr+2whvA8gAAAADAAIAAAAAAAAAAQAAA9j+7wAACJj+Ov46CG8AAQAAAAAAAAAAAAAAAAAAAA4CjQBZAfgANAIpAFICIwBSAfEALAHxAE8B8QAkAfEAGgHxABEB8QAZAfEAMAHxACwB8QApAfEAKAAAACwAZACYALoA4AD4ASIBYAGEAbgB+AISAmgCqAAAAAEAAAAOAIwADABmAAcAAQAAAAAAAAAAAAAAAAAEAAN4nJyU3U4bVxSFPwfbbVQ1FxWKyA06l22VjN0IogSuTAmKVYRTj9Mfqao0eMY/Yjwz8gxQqj5Ar/sWfYtc9Tn6EFWvq7O8DTaqFIEQsM6cvfdZZ6+1D7DJv2xQqz8E/mr+YLjGdnPP8AMeNZ8a3uC48bfh+kpMg7jxm+EmXzb6hj/iff0Pwx+zU//Z8EO26keGP+F5fdPwpxuOfww/Yof3C1yDl/xuuMYWheEHbPKT4Q0eYzVrdR7TNtzgM7YNN9kGBkypSJmSMcYxYsqYc+YklIQkzJkyIiHG0aVDSqWvGZGQY/y/XyNCKuZEqjihwpESkhJRMrGKvyor561OHGk1t70OFRMiTpVxRkSGI2dMTkbCmepUVBTs0aJFyVB8CypKAkqmpATkzBnToscRxwyYMKXEcaRKnllIzoiKSyKd7yzCd2ZIQkZprM7JiMXTiV+i7C7HOHoUil2tfLxW4SmO75TtueWK/YpAv26F2fq5SzYRF+pnqq6k2rmUghPt+nM7fCtcsYe7V3/WmXy4R7H+V6p8yrn0j6VUJiYZzm3RIZSDQvcEx4HWXUJ15Hu6DHhDj3cMtO7Qp0+HEwZ0ea3cHn0cX9PjhENldIUXe0dyzAk/4viGrmJ87cT6s1As4RcKc3cpjnPdY0ahnnvmge6a6IZ3V9jPUL7mjlI5Q82Rj3TSL9OcRYzNFYUYztTLpTdK619sjpjpLl7bm30/DRc2e8spviLXDHu3Ljh55RaMPqRqcMszl/oJiIjJOVXEkJwZLSquxPstEeekOA7VvTeakorOdY4/50ouSZiJQZdMdeYU+huZb0LjPlzzvbO3JFa+Z3p2fav7nOLUqxuN3ql7y73QupysKNAyVfMVNw3FNTPvJ5qpVf6hcku9bjnP6JNI9VQ3uP0OPCegzQ677DPROUPtXNgb0dY70eYV++rBGYmiRnJ1YhV2CXjBLru84sVazQ6HHNBj/w4cF1k9Dnh9a2ddp2UVZ3X+FJu2+DqeXa9e3luvz+/gyy80UTcvY1/a+G5fWLUb/58QMfNc3NbqndwTgv8AAAD//wEAAP//B1tMMAB4nGJgZgCD/+cYjBiwAAAAAAD//wEAAP//LwECAwAAAA=="); } .d2-3373084213 .text-bold { font-family: "d2-3373084213-font-bold"; } @font-face { font-family: d2-3373084213-font-bold; - src: url("data:application/font-woff;base64,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"); + src: url("data:application/font-woff;base64,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"); }]]>a labelblabelsa class+public() boolvoid-private() intvoidcloudyyyya := 5 + .d2-1927191183 .fill-N1{fill:#0A0F25;} + .d2-1927191183 .fill-N2{fill:#676C7E;} + .d2-1927191183 .fill-N3{fill:#9499AB;} + .d2-1927191183 .fill-N4{fill:#CFD2DD;} + .d2-1927191183 .fill-N5{fill:#DEE1EB;} + .d2-1927191183 .fill-N6{fill:#EEF1F8;} + .d2-1927191183 .fill-N7{fill:#FFFFFF;} + .d2-1927191183 .fill-B1{fill:#0D32B2;} + .d2-1927191183 .fill-B2{fill:#0D32B2;} + .d2-1927191183 .fill-B3{fill:#E3E9FD;} + .d2-1927191183 .fill-B4{fill:#E3E9FD;} + .d2-1927191183 .fill-B5{fill:#EDF0FD;} + .d2-1927191183 .fill-B6{fill:#F7F8FE;} + .d2-1927191183 .fill-AA2{fill:#4A6FF3;} + .d2-1927191183 .fill-AA4{fill:#EDF0FD;} + .d2-1927191183 .fill-AA5{fill:#F7F8FE;} + .d2-1927191183 .fill-AB4{fill:#EDF0FD;} + .d2-1927191183 .fill-AB5{fill:#F7F8FE;} + .d2-1927191183 .stroke-N1{stroke:#0A0F25;} + .d2-1927191183 .stroke-N2{stroke:#676C7E;} + .d2-1927191183 .stroke-N3{stroke:#9499AB;} + .d2-1927191183 .stroke-N4{stroke:#CFD2DD;} + .d2-1927191183 .stroke-N5{stroke:#DEE1EB;} + .d2-1927191183 .stroke-N6{stroke:#EEF1F8;} + .d2-1927191183 .stroke-N7{stroke:#FFFFFF;} + .d2-1927191183 .stroke-B1{stroke:#0D32B2;} + .d2-1927191183 .stroke-B2{stroke:#0D32B2;} + .d2-1927191183 .stroke-B3{stroke:#E3E9FD;} + .d2-1927191183 .stroke-B4{stroke:#E3E9FD;} + .d2-1927191183 .stroke-B5{stroke:#EDF0FD;} + .d2-1927191183 .stroke-B6{stroke:#F7F8FE;} + .d2-1927191183 .stroke-AA2{stroke:#4A6FF3;} + .d2-1927191183 .stroke-AA4{stroke:#EDF0FD;} + .d2-1927191183 .stroke-AA5{stroke:#F7F8FE;} + .d2-1927191183 .stroke-AB4{stroke:#EDF0FD;} + .d2-1927191183 .stroke-AB5{stroke:#F7F8FE;} + .d2-1927191183 .background-color-N1{background-color:#0A0F25;} + .d2-1927191183 .background-color-N2{background-color:#676C7E;} + .d2-1927191183 .background-color-N3{background-color:#9499AB;} + .d2-1927191183 .background-color-N4{background-color:#CFD2DD;} + .d2-1927191183 .background-color-N5{background-color:#DEE1EB;} + .d2-1927191183 .background-color-N6{background-color:#EEF1F8;} + .d2-1927191183 .background-color-N7{background-color:#FFFFFF;} + .d2-1927191183 .background-color-B1{background-color:#0D32B2;} + .d2-1927191183 .background-color-B2{background-color:#0D32B2;} + .d2-1927191183 .background-color-B3{background-color:#E3E9FD;} + .d2-1927191183 .background-color-B4{background-color:#E3E9FD;} + .d2-1927191183 .background-color-B5{background-color:#EDF0FD;} + .d2-1927191183 .background-color-B6{background-color:#F7F8FE;} + .d2-1927191183 .background-color-AA2{background-color:#4A6FF3;} + .d2-1927191183 .background-color-AA4{background-color:#EDF0FD;} + .d2-1927191183 .background-color-AA5{background-color:#F7F8FE;} + .d2-1927191183 .background-color-AB4{background-color:#EDF0FD;} + .d2-1927191183 .background-color-AB5{background-color:#F7F8FE;} + .d2-1927191183 .color-N1{color:#0A0F25;} + .d2-1927191183 .color-N2{color:#676C7E;} + .d2-1927191183 .color-N3{color:#9499AB;} + .d2-1927191183 .color-N4{color:#CFD2DD;} + .d2-1927191183 .color-N5{color:#DEE1EB;} + .d2-1927191183 .color-N6{color:#EEF1F8;} + .d2-1927191183 .color-N7{color:#FFFFFF;} + .d2-1927191183 .color-B1{color:#0D32B2;} + .d2-1927191183 .color-B2{color:#0D32B2;} + .d2-1927191183 .color-B3{color:#E3E9FD;} + .d2-1927191183 .color-B4{color:#E3E9FD;} + .d2-1927191183 .color-B5{color:#EDF0FD;} + .d2-1927191183 .color-B6{color:#F7F8FE;} + .d2-1927191183 .color-AA2{color:#4A6FF3;} + .d2-1927191183 .color-AA4{color:#EDF0FD;} + .d2-1927191183 .color-AA5{color:#F7F8FE;} + .d2-1927191183 .color-AB4{color:#EDF0FD;} + .d2-1927191183 .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);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>a labelblabelsa class+public() boolvoid-private() intvoidcloudyyyya := 5 b := a + 7 fmt.Printf("%d", b)a := 5 b := a + 7 -fmt.Printf("%d", b)cyldiadocssix cornersa random iconoverpackdocs pagetoohard o saysinglepersona queuea squarea step at a timedatausersidintnamevarchar result := callThisFunction(obj, 5) midthis sideother side +fmt.Printf("%d", b)cyldiadocssix cornersa random iconoverpackdocs pagetoohard o saysinglepersona queuea squarea step at a timedatausersidintnamevarchar result := callThisFunction(obj, 5) midthis sideother side diff --git a/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/board.exp.json b/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/board.exp.json index 7b5c31322..dd6b3f0d2 100644 --- a/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/board.exp.json @@ -860,7 +860,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -888,7 +888,7 @@ "labelWidth": 64, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], diff --git a/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/sketch.exp.svg index 663bccda2..cbe4669c2 100644 --- a/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/sketch.exp.svg @@ -1,31 +1,31 @@ -a labelblabelsa class+public() boolvoid-private() intvoidcloudyyyya := 5 + .d2-1927191183 .fill-N1{fill:#0A0F25;} + .d2-1927191183 .fill-N2{fill:#676C7E;} + .d2-1927191183 .fill-N3{fill:#9499AB;} + .d2-1927191183 .fill-N4{fill:#CFD2DD;} + .d2-1927191183 .fill-N5{fill:#DEE1EB;} + .d2-1927191183 .fill-N6{fill:#EEF1F8;} + .d2-1927191183 .fill-N7{fill:#FFFFFF;} + .d2-1927191183 .fill-B1{fill:#0D32B2;} + .d2-1927191183 .fill-B2{fill:#0D32B2;} + .d2-1927191183 .fill-B3{fill:#E3E9FD;} + .d2-1927191183 .fill-B4{fill:#E3E9FD;} + .d2-1927191183 .fill-B5{fill:#EDF0FD;} + .d2-1927191183 .fill-B6{fill:#F7F8FE;} + .d2-1927191183 .fill-AA2{fill:#4A6FF3;} + .d2-1927191183 .fill-AA4{fill:#EDF0FD;} + .d2-1927191183 .fill-AA5{fill:#F7F8FE;} + .d2-1927191183 .fill-AB4{fill:#EDF0FD;} + .d2-1927191183 .fill-AB5{fill:#F7F8FE;} + .d2-1927191183 .stroke-N1{stroke:#0A0F25;} + .d2-1927191183 .stroke-N2{stroke:#676C7E;} + .d2-1927191183 .stroke-N3{stroke:#9499AB;} + .d2-1927191183 .stroke-N4{stroke:#CFD2DD;} + .d2-1927191183 .stroke-N5{stroke:#DEE1EB;} + .d2-1927191183 .stroke-N6{stroke:#EEF1F8;} + .d2-1927191183 .stroke-N7{stroke:#FFFFFF;} + .d2-1927191183 .stroke-B1{stroke:#0D32B2;} + .d2-1927191183 .stroke-B2{stroke:#0D32B2;} + .d2-1927191183 .stroke-B3{stroke:#E3E9FD;} + .d2-1927191183 .stroke-B4{stroke:#E3E9FD;} + .d2-1927191183 .stroke-B5{stroke:#EDF0FD;} + .d2-1927191183 .stroke-B6{stroke:#F7F8FE;} + .d2-1927191183 .stroke-AA2{stroke:#4A6FF3;} + .d2-1927191183 .stroke-AA4{stroke:#EDF0FD;} + .d2-1927191183 .stroke-AA5{stroke:#F7F8FE;} + .d2-1927191183 .stroke-AB4{stroke:#EDF0FD;} + .d2-1927191183 .stroke-AB5{stroke:#F7F8FE;} + .d2-1927191183 .background-color-N1{background-color:#0A0F25;} + .d2-1927191183 .background-color-N2{background-color:#676C7E;} + .d2-1927191183 .background-color-N3{background-color:#9499AB;} + .d2-1927191183 .background-color-N4{background-color:#CFD2DD;} + .d2-1927191183 .background-color-N5{background-color:#DEE1EB;} + .d2-1927191183 .background-color-N6{background-color:#EEF1F8;} + .d2-1927191183 .background-color-N7{background-color:#FFFFFF;} + .d2-1927191183 .background-color-B1{background-color:#0D32B2;} + .d2-1927191183 .background-color-B2{background-color:#0D32B2;} + .d2-1927191183 .background-color-B3{background-color:#E3E9FD;} + .d2-1927191183 .background-color-B4{background-color:#E3E9FD;} + .d2-1927191183 .background-color-B5{background-color:#EDF0FD;} + .d2-1927191183 .background-color-B6{background-color:#F7F8FE;} + .d2-1927191183 .background-color-AA2{background-color:#4A6FF3;} + .d2-1927191183 .background-color-AA4{background-color:#EDF0FD;} + .d2-1927191183 .background-color-AA5{background-color:#F7F8FE;} + .d2-1927191183 .background-color-AB4{background-color:#EDF0FD;} + .d2-1927191183 .background-color-AB5{background-color:#F7F8FE;} + .d2-1927191183 .color-N1{color:#0A0F25;} + .d2-1927191183 .color-N2{color:#676C7E;} + .d2-1927191183 .color-N3{color:#9499AB;} + .d2-1927191183 .color-N4{color:#CFD2DD;} + .d2-1927191183 .color-N5{color:#DEE1EB;} + .d2-1927191183 .color-N6{color:#EEF1F8;} + .d2-1927191183 .color-N7{color:#FFFFFF;} + .d2-1927191183 .color-B1{color:#0D32B2;} + .d2-1927191183 .color-B2{color:#0D32B2;} + .d2-1927191183 .color-B3{color:#E3E9FD;} + .d2-1927191183 .color-B4{color:#E3E9FD;} + .d2-1927191183 .color-B5{color:#EDF0FD;} + .d2-1927191183 .color-B6{color:#F7F8FE;} + .d2-1927191183 .color-AA2{color:#4A6FF3;} + .d2-1927191183 .color-AA4{color:#EDF0FD;} + .d2-1927191183 .color-AA5{color:#F7F8FE;} + .d2-1927191183 .color-AB4{color:#EDF0FD;} + .d2-1927191183 .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);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>a labelblabelsa class+public() boolvoid-private() intvoidcloudyyyya := 5 b := a + 7 fmt.Printf("%d", b)a := 5 b := a + 7 -fmt.Printf("%d", b)cyldiadocssix cornersa random iconoverpackdocs pagetoohard o saysinglepersona queuea squarea step at a timedatausersidintnamevarchar result := callThisFunction(obj, 5) midthis sideother side +fmt.Printf("%d", b)cyldiadocssix cornersa random iconoverpackdocs pagetoohard o saysinglepersona queuea squarea step at a timedatausersidintnamevarchar result := callThisFunction(obj, 5) midthis sideother side diff --git a/e2etests/testdata/stable/sequence_diagram_distance/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_distance/dagre/sketch.exp.svg index e41d7e33c..4ffc47ac0 100644 --- a/e2etests/testdata/stable/sequence_diagram_distance/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_distance/dagre/sketch.exp.svg @@ -4,14 +4,14 @@ } @font-face { font-family: d2-3013112664-font-regular; - src: url("data:application/font-woff;base64,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"); + src: url("data:application/font-woff;base64,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"); } .d2-3013112664 .text-italic { font-family: "d2-3013112664-font-italic"; } @font-face { font-family: d2-3013112664-font-italic; - src: url("data:application/font-woff;base64,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"); + src: url("data:application/font-woff;base64,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"); }]]>Humor in the CourtCould you see him from where you were standing?I could see his head.And where was his head?Just above his shoulders.Humor in the Court2Could you see him from where you were standing?I could see his head.And where was his head?Just above his shoulders.BatchManager-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voidBatchManager-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)void + .d2-4052321575 .fill-N1{fill:#0A0F25;} + .d2-4052321575 .fill-N2{fill:#676C7E;} + .d2-4052321575 .fill-N3{fill:#9499AB;} + .d2-4052321575 .fill-N4{fill:#CFD2DD;} + .d2-4052321575 .fill-N5{fill:#DEE1EB;} + .d2-4052321575 .fill-N6{fill:#EEF1F8;} + .d2-4052321575 .fill-N7{fill:#FFFFFF;} + .d2-4052321575 .fill-B1{fill:#0D32B2;} + .d2-4052321575 .fill-B2{fill:#0D32B2;} + .d2-4052321575 .fill-B3{fill:#E3E9FD;} + .d2-4052321575 .fill-B4{fill:#E3E9FD;} + .d2-4052321575 .fill-B5{fill:#EDF0FD;} + .d2-4052321575 .fill-B6{fill:#F7F8FE;} + .d2-4052321575 .fill-AA2{fill:#4A6FF3;} + .d2-4052321575 .fill-AA4{fill:#EDF0FD;} + .d2-4052321575 .fill-AA5{fill:#F7F8FE;} + .d2-4052321575 .fill-AB4{fill:#EDF0FD;} + .d2-4052321575 .fill-AB5{fill:#F7F8FE;} + .d2-4052321575 .stroke-N1{stroke:#0A0F25;} + .d2-4052321575 .stroke-N2{stroke:#676C7E;} + .d2-4052321575 .stroke-N3{stroke:#9499AB;} + .d2-4052321575 .stroke-N4{stroke:#CFD2DD;} + .d2-4052321575 .stroke-N5{stroke:#DEE1EB;} + .d2-4052321575 .stroke-N6{stroke:#EEF1F8;} + .d2-4052321575 .stroke-N7{stroke:#FFFFFF;} + .d2-4052321575 .stroke-B1{stroke:#0D32B2;} + .d2-4052321575 .stroke-B2{stroke:#0D32B2;} + .d2-4052321575 .stroke-B3{stroke:#E3E9FD;} + .d2-4052321575 .stroke-B4{stroke:#E3E9FD;} + .d2-4052321575 .stroke-B5{stroke:#EDF0FD;} + .d2-4052321575 .stroke-B6{stroke:#F7F8FE;} + .d2-4052321575 .stroke-AA2{stroke:#4A6FF3;} + .d2-4052321575 .stroke-AA4{stroke:#EDF0FD;} + .d2-4052321575 .stroke-AA5{stroke:#F7F8FE;} + .d2-4052321575 .stroke-AB4{stroke:#EDF0FD;} + .d2-4052321575 .stroke-AB5{stroke:#F7F8FE;} + .d2-4052321575 .background-color-N1{background-color:#0A0F25;} + .d2-4052321575 .background-color-N2{background-color:#676C7E;} + .d2-4052321575 .background-color-N3{background-color:#9499AB;} + .d2-4052321575 .background-color-N4{background-color:#CFD2DD;} + .d2-4052321575 .background-color-N5{background-color:#DEE1EB;} + .d2-4052321575 .background-color-N6{background-color:#EEF1F8;} + .d2-4052321575 .background-color-N7{background-color:#FFFFFF;} + .d2-4052321575 .background-color-B1{background-color:#0D32B2;} + .d2-4052321575 .background-color-B2{background-color:#0D32B2;} + .d2-4052321575 .background-color-B3{background-color:#E3E9FD;} + .d2-4052321575 .background-color-B4{background-color:#E3E9FD;} + .d2-4052321575 .background-color-B5{background-color:#EDF0FD;} + .d2-4052321575 .background-color-B6{background-color:#F7F8FE;} + .d2-4052321575 .background-color-AA2{background-color:#4A6FF3;} + .d2-4052321575 .background-color-AA4{background-color:#EDF0FD;} + .d2-4052321575 .background-color-AA5{background-color:#F7F8FE;} + .d2-4052321575 .background-color-AB4{background-color:#EDF0FD;} + .d2-4052321575 .background-color-AB5{background-color:#F7F8FE;} + .d2-4052321575 .color-N1{color:#0A0F25;} + .d2-4052321575 .color-N2{color:#676C7E;} + .d2-4052321575 .color-N3{color:#9499AB;} + .d2-4052321575 .color-N4{color:#CFD2DD;} + .d2-4052321575 .color-N5{color:#DEE1EB;} + .d2-4052321575 .color-N6{color:#EEF1F8;} + .d2-4052321575 .color-N7{color:#FFFFFF;} + .d2-4052321575 .color-B1{color:#0D32B2;} + .d2-4052321575 .color-B2{color:#0D32B2;} + .d2-4052321575 .color-B3{color:#E3E9FD;} + .d2-4052321575 .color-B4{color:#E3E9FD;} + .d2-4052321575 .color-B5{color:#EDF0FD;} + .d2-4052321575 .color-B6{color:#F7F8FE;} + .d2-4052321575 .color-AA2{color:#4A6FF3;} + .d2-4052321575 .color-AA4{color:#EDF0FD;} + .d2-4052321575 .color-AA5{color:#F7F8FE;} + .d2-4052321575 .color-AB4{color:#EDF0FD;} + .d2-4052321575 .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);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>Humor in the CourtCould you see him from where you were standing?I could see his head.And where was his head?Just above his shoulders.Humor in the Court2Could you see him from where you were standing?I could see his head.And where was his head?Just above his shoulders.BatchManager-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voidBatchManager-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)void \ No newline at end of file diff --git a/e2etests/testdata/stable/sql_table_column_styles/elk/board.exp.json b/e2etests/testdata/stable/sql_table_column_styles/elk/board.exp.json index 4819ec11c..220d7395f 100644 --- a/e2etests/testdata/stable/sql_table_column_styles/elk/board.exp.json +++ b/e2etests/testdata/stable/sql_table_column_styles/elk/board.exp.json @@ -55,7 +55,7 @@ "labelWidth": 166, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -83,7 +83,7 @@ "labelWidth": 210, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], @@ -155,7 +155,7 @@ "labelWidth": 248, "labelHeight": 38 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -183,7 +183,7 @@ "labelWidth": 315, "labelHeight": 38 }, - "constraint": "", + "constraint": null, "reference": "" } ], diff --git a/e2etests/testdata/stable/sql_table_column_styles/elk/sketch.exp.svg b/e2etests/testdata/stable/sql_table_column_styles/elk/sketch.exp.svg index 499059a64..40ba626b5 100644 --- a/e2etests/testdata/stable/sql_table_column_styles/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sql_table_column_styles/elk/sketch.exp.svg @@ -1,17 +1,17 @@ -Humor in the CourtCould you see him from where you were standing?I could see his head.And where was his head?Just above his shoulders.Humor in the Court2Could you see him from where you were standing?I could see his head.And where was his head?Just above his shoulders.BatchManager-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voidBatchManager-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)void + .d2-2628520825 .fill-N1{fill:#0A0F25;} + .d2-2628520825 .fill-N2{fill:#676C7E;} + .d2-2628520825 .fill-N3{fill:#9499AB;} + .d2-2628520825 .fill-N4{fill:#CFD2DD;} + .d2-2628520825 .fill-N5{fill:#DEE1EB;} + .d2-2628520825 .fill-N6{fill:#EEF1F8;} + .d2-2628520825 .fill-N7{fill:#FFFFFF;} + .d2-2628520825 .fill-B1{fill:#0D32B2;} + .d2-2628520825 .fill-B2{fill:#0D32B2;} + .d2-2628520825 .fill-B3{fill:#E3E9FD;} + .d2-2628520825 .fill-B4{fill:#E3E9FD;} + .d2-2628520825 .fill-B5{fill:#EDF0FD;} + .d2-2628520825 .fill-B6{fill:#F7F8FE;} + .d2-2628520825 .fill-AA2{fill:#4A6FF3;} + .d2-2628520825 .fill-AA4{fill:#EDF0FD;} + .d2-2628520825 .fill-AA5{fill:#F7F8FE;} + .d2-2628520825 .fill-AB4{fill:#EDF0FD;} + .d2-2628520825 .fill-AB5{fill:#F7F8FE;} + .d2-2628520825 .stroke-N1{stroke:#0A0F25;} + .d2-2628520825 .stroke-N2{stroke:#676C7E;} + .d2-2628520825 .stroke-N3{stroke:#9499AB;} + .d2-2628520825 .stroke-N4{stroke:#CFD2DD;} + .d2-2628520825 .stroke-N5{stroke:#DEE1EB;} + .d2-2628520825 .stroke-N6{stroke:#EEF1F8;} + .d2-2628520825 .stroke-N7{stroke:#FFFFFF;} + .d2-2628520825 .stroke-B1{stroke:#0D32B2;} + .d2-2628520825 .stroke-B2{stroke:#0D32B2;} + .d2-2628520825 .stroke-B3{stroke:#E3E9FD;} + .d2-2628520825 .stroke-B4{stroke:#E3E9FD;} + .d2-2628520825 .stroke-B5{stroke:#EDF0FD;} + .d2-2628520825 .stroke-B6{stroke:#F7F8FE;} + .d2-2628520825 .stroke-AA2{stroke:#4A6FF3;} + .d2-2628520825 .stroke-AA4{stroke:#EDF0FD;} + .d2-2628520825 .stroke-AA5{stroke:#F7F8FE;} + .d2-2628520825 .stroke-AB4{stroke:#EDF0FD;} + .d2-2628520825 .stroke-AB5{stroke:#F7F8FE;} + .d2-2628520825 .background-color-N1{background-color:#0A0F25;} + .d2-2628520825 .background-color-N2{background-color:#676C7E;} + .d2-2628520825 .background-color-N3{background-color:#9499AB;} + .d2-2628520825 .background-color-N4{background-color:#CFD2DD;} + .d2-2628520825 .background-color-N5{background-color:#DEE1EB;} + .d2-2628520825 .background-color-N6{background-color:#EEF1F8;} + .d2-2628520825 .background-color-N7{background-color:#FFFFFF;} + .d2-2628520825 .background-color-B1{background-color:#0D32B2;} + .d2-2628520825 .background-color-B2{background-color:#0D32B2;} + .d2-2628520825 .background-color-B3{background-color:#E3E9FD;} + .d2-2628520825 .background-color-B4{background-color:#E3E9FD;} + .d2-2628520825 .background-color-B5{background-color:#EDF0FD;} + .d2-2628520825 .background-color-B6{background-color:#F7F8FE;} + .d2-2628520825 .background-color-AA2{background-color:#4A6FF3;} + .d2-2628520825 .background-color-AA4{background-color:#EDF0FD;} + .d2-2628520825 .background-color-AA5{background-color:#F7F8FE;} + .d2-2628520825 .background-color-AB4{background-color:#EDF0FD;} + .d2-2628520825 .background-color-AB5{background-color:#F7F8FE;} + .d2-2628520825 .color-N1{color:#0A0F25;} + .d2-2628520825 .color-N2{color:#676C7E;} + .d2-2628520825 .color-N3{color:#9499AB;} + .d2-2628520825 .color-N4{color:#CFD2DD;} + .d2-2628520825 .color-N5{color:#DEE1EB;} + .d2-2628520825 .color-N6{color:#EEF1F8;} + .d2-2628520825 .color-N7{color:#FFFFFF;} + .d2-2628520825 .color-B1{color:#0D32B2;} + .d2-2628520825 .color-B2{color:#0D32B2;} + .d2-2628520825 .color-B3{color:#E3E9FD;} + .d2-2628520825 .color-B4{color:#E3E9FD;} + .d2-2628520825 .color-B5{color:#EDF0FD;} + .d2-2628520825 .color-B6{color:#F7F8FE;} + .d2-2628520825 .color-AA2{color:#4A6FF3;} + .d2-2628520825 .color-AA4{color:#EDF0FD;} + .d2-2628520825 .color-AA5{color:#F7F8FE;} + .d2-2628520825 .color-AB4{color:#EDF0FD;} + .d2-2628520825 .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);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>Humor in the CourtCould you see him from where you were standing?I could see his head.And where was his head?Just above his shoulders.Humor in the Court2Could you see him from where you were standing?I could see his head.And where was his head?Just above his shoulders.BatchManager-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voidBatchManager-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)void \ No newline at end of file diff --git a/e2etests/testdata/stable/sql_table_constraints_width/dagre/board.exp.json b/e2etests/testdata/stable/sql_table_constraints_width/dagre/board.exp.json new file mode 100644 index 000000000..b407c93a4 --- /dev/null +++ b/e2etests/testdata/stable/sql_table_constraints_width/dagre/board.exp.json @@ -0,0 +1,554 @@ +{ + "name": "", + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "a", + "type": "sql_table", + "pos": { + "x": 0, + "y": 36 + }, + "width": 146, + "height": 72, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N1", + "stroke": "N7", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": [ + { + "name": { + "label": "x", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 9, + "labelHeight": 26 + }, + "type": { + "label": "INT", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 29, + "labelHeight": 26 + }, + "constraint": [ + "unique" + ], + "reference": "" + } + ], + "label": "a", + "fontSize": 20, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 11, + "labelHeight": 31, + "zIndex": 0, + "level": 1, + "primaryAccentColor": "B2", + "secondaryAccentColor": "AA2", + "neutralAccentColor": "N2" + }, + { + "id": "b", + "type": "sql_table", + "pos": { + "x": 206, + "y": 36 + }, + "width": 161, + "height": 72, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N1", + "stroke": "N7", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": [ + { + "name": { + "label": "x", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 9, + "labelHeight": 26 + }, + "type": { + "label": "INT", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 29, + "labelHeight": 26 + }, + "constraint": [ + "primary_key", + "foreign_key" + ], + "reference": "" + } + ], + "label": "b", + "fontSize": 20, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 12, + "labelHeight": 31, + "zIndex": 0, + "level": 1, + "primaryAccentColor": "B2", + "secondaryAccentColor": "AA2", + "neutralAccentColor": "N2" + }, + { + "id": "c", + "type": "sql_table", + "pos": { + "x": 427, + "y": 36 + }, + "width": 177, + "height": 72, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N1", + "stroke": "N7", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": [ + { + "name": { + "label": "x", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 9, + "labelHeight": 26 + }, + "type": { + "label": "INT", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 29, + "labelHeight": 26 + }, + "constraint": [ + "foreign_key", + "unique" + ], + "reference": "" + } + ], + "label": "c", + "fontSize": 20, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 11, + "labelHeight": 31, + "zIndex": 0, + "level": 1, + "primaryAccentColor": "B2", + "secondaryAccentColor": "AA2", + "neutralAccentColor": "N2" + }, + { + "id": "d", + "type": "sql_table", + "pos": { + "x": 664, + "y": 36 + }, + "width": 209, + "height": 72, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N1", + "stroke": "N7", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": [ + { + "name": { + "label": "x", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 9, + "labelHeight": 26 + }, + "type": { + "label": "INT", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 29, + "labelHeight": 26 + }, + "constraint": [ + "primary_key", + "foreign_key", + "unique" + ], + "reference": "" + } + ], + "label": "d", + "fontSize": 20, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 13, + "labelHeight": 31, + "zIndex": 0, + "level": 1, + "primaryAccentColor": "B2", + "secondaryAccentColor": "AA2", + "neutralAccentColor": "N2" + }, + { + "id": "e", + "type": "sql_table", + "pos": { + "x": 933, + "y": 0 + }, + "width": 312, + "height": 144, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N1", + "stroke": "N7", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": [ + { + "name": { + "label": "x", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 9, + "labelHeight": 26 + }, + "type": { + "label": "INT", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 29, + "labelHeight": 26 + }, + "constraint": [ + "no_abbrev", + "foreign_key", + "hello" + ], + "reference": "" + }, + { + "name": { + "label": "y", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 10, + "labelHeight": 26 + }, + "type": { + "label": "string", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 48, + "labelHeight": 26 + }, + "constraint": null, + "reference": "" + }, + { + "name": { + "label": "z", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 8, + "labelHeight": 26 + }, + "type": { + "label": "STRING", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 62, + "labelHeight": 26 + }, + "constraint": [ + "yo" + ], + "reference": "" + } + ], + "label": "e", + "fontSize": 20, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 12, + "labelHeight": 31, + "zIndex": 0, + "level": 1, + "primaryAccentColor": "B2", + "secondaryAccentColor": "AA2", + "neutralAccentColor": "N2" + }, + { + "id": "f", + "type": "sql_table", + "pos": { + "x": 1305, + "y": 36 + }, + "width": 88, + "height": 72, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N1", + "stroke": "N7", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": [ + { + "name": { + "label": "x", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 9, + "labelHeight": 26 + }, + "type": { + "label": "INT", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 29, + "labelHeight": 26 + }, + "constraint": null, + "reference": "" + } + ], + "label": "f", + "fontSize": 20, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 9, + "labelHeight": 31, + "zIndex": 0, + "level": 1, + "primaryAccentColor": "B2", + "secondaryAccentColor": "AA2", + "neutralAccentColor": "N2" + } + ], + "connections": [], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "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/stable/sql_table_constraints_width/dagre/sketch.exp.svg b/e2etests/testdata/stable/sql_table_constraints_width/dagre/sketch.exp.svg new file mode 100644 index 000000000..b7f668c83 --- /dev/null +++ b/e2etests/testdata/stable/sql_table_constraints_width/dagre/sketch.exp.svg @@ -0,0 +1,95 @@ +axINTUNQbxINTPK, FKcxINTFK, UNQdxINTPK, FK, UNQexINTno_abbrev, FK, helloystringzSTRINGyofxINT + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/sql_table_constraints_width/elk/board.exp.json b/e2etests/testdata/stable/sql_table_constraints_width/elk/board.exp.json new file mode 100644 index 000000000..5717ef2fb --- /dev/null +++ b/e2etests/testdata/stable/sql_table_constraints_width/elk/board.exp.json @@ -0,0 +1,554 @@ +{ + "name": "", + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "a", + "type": "sql_table", + "pos": { + "x": 12, + "y": 48 + }, + "width": 146, + "height": 72, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N1", + "stroke": "N7", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": [ + { + "name": { + "label": "x", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 9, + "labelHeight": 26 + }, + "type": { + "label": "INT", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 29, + "labelHeight": 26 + }, + "constraint": [ + "unique" + ], + "reference": "" + } + ], + "label": "a", + "fontSize": 20, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 11, + "labelHeight": 31, + "zIndex": 0, + "level": 1, + "primaryAccentColor": "B2", + "secondaryAccentColor": "AA2", + "neutralAccentColor": "N2" + }, + { + "id": "b", + "type": "sql_table", + "pos": { + "x": 178, + "y": 48 + }, + "width": 161, + "height": 72, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N1", + "stroke": "N7", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": [ + { + "name": { + "label": "x", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 9, + "labelHeight": 26 + }, + "type": { + "label": "INT", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 29, + "labelHeight": 26 + }, + "constraint": [ + "primary_key", + "foreign_key" + ], + "reference": "" + } + ], + "label": "b", + "fontSize": 20, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 12, + "labelHeight": 31, + "zIndex": 0, + "level": 1, + "primaryAccentColor": "B2", + "secondaryAccentColor": "AA2", + "neutralAccentColor": "N2" + }, + { + "id": "c", + "type": "sql_table", + "pos": { + "x": 359, + "y": 48 + }, + "width": 177, + "height": 72, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N1", + "stroke": "N7", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": [ + { + "name": { + "label": "x", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 9, + "labelHeight": 26 + }, + "type": { + "label": "INT", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 29, + "labelHeight": 26 + }, + "constraint": [ + "foreign_key", + "unique" + ], + "reference": "" + } + ], + "label": "c", + "fontSize": 20, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 11, + "labelHeight": 31, + "zIndex": 0, + "level": 1, + "primaryAccentColor": "B2", + "secondaryAccentColor": "AA2", + "neutralAccentColor": "N2" + }, + { + "id": "d", + "type": "sql_table", + "pos": { + "x": 556, + "y": 48 + }, + "width": 209, + "height": 72, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N1", + "stroke": "N7", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": [ + { + "name": { + "label": "x", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 9, + "labelHeight": 26 + }, + "type": { + "label": "INT", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 29, + "labelHeight": 26 + }, + "constraint": [ + "primary_key", + "foreign_key", + "unique" + ], + "reference": "" + } + ], + "label": "d", + "fontSize": 20, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 13, + "labelHeight": 31, + "zIndex": 0, + "level": 1, + "primaryAccentColor": "B2", + "secondaryAccentColor": "AA2", + "neutralAccentColor": "N2" + }, + { + "id": "e", + "type": "sql_table", + "pos": { + "x": 785, + "y": 12 + }, + "width": 312, + "height": 144, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N1", + "stroke": "N7", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": [ + { + "name": { + "label": "x", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 9, + "labelHeight": 26 + }, + "type": { + "label": "INT", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 29, + "labelHeight": 26 + }, + "constraint": [ + "no_abbrev", + "foreign_key", + "hello" + ], + "reference": "" + }, + { + "name": { + "label": "y", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 10, + "labelHeight": 26 + }, + "type": { + "label": "string", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 48, + "labelHeight": 26 + }, + "constraint": null, + "reference": "" + }, + { + "name": { + "label": "z", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 8, + "labelHeight": 26 + }, + "type": { + "label": "STRING", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 62, + "labelHeight": 26 + }, + "constraint": [ + "yo" + ], + "reference": "" + } + ], + "label": "e", + "fontSize": 20, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 12, + "labelHeight": 31, + "zIndex": 0, + "level": 1, + "primaryAccentColor": "B2", + "secondaryAccentColor": "AA2", + "neutralAccentColor": "N2" + }, + { + "id": "f", + "type": "sql_table", + "pos": { + "x": 1117, + "y": 48 + }, + "width": 88, + "height": 72, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N1", + "stroke": "N7", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": [ + { + "name": { + "label": "x", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 9, + "labelHeight": 26 + }, + "type": { + "label": "INT", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 29, + "labelHeight": 26 + }, + "constraint": null, + "reference": "" + } + ], + "label": "f", + "fontSize": 20, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 9, + "labelHeight": 31, + "zIndex": 0, + "level": 1, + "primaryAccentColor": "B2", + "secondaryAccentColor": "AA2", + "neutralAccentColor": "N2" + } + ], + "connections": [], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "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/stable/sql_table_constraints_width/elk/sketch.exp.svg b/e2etests/testdata/stable/sql_table_constraints_width/elk/sketch.exp.svg new file mode 100644 index 000000000..6928b2ad5 --- /dev/null +++ b/e2etests/testdata/stable/sql_table_constraints_width/elk/sketch.exp.svg @@ -0,0 +1,95 @@ +axINTUNQbxINTPK, FKcxINTFK, UNQdxINTPK, FK, UNQexINTno_abbrev, FK, helloystringzSTRINGyofxINT + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/sql_table_tooltip_animated/dagre/board.exp.json b/e2etests/testdata/stable/sql_table_tooltip_animated/dagre/board.exp.json index 24914b479..9e4967a4c 100644 --- a/e2etests/testdata/stable/sql_table_tooltip_animated/dagre/board.exp.json +++ b/e2etests/testdata/stable/sql_table_tooltip_animated/dagre/board.exp.json @@ -55,7 +55,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "", + "constraint": null, "reference": "" } ], @@ -127,7 +127,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "", + "constraint": null, "reference": "" } ], diff --git a/e2etests/testdata/stable/sql_table_tooltip_animated/dagre/sketch.exp.svg b/e2etests/testdata/stable/sql_table_tooltip_animated/dagre/sketch.exp.svg index a09f6f083..beb7da117 100644 --- a/e2etests/testdata/stable/sql_table_tooltip_animated/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sql_table_tooltip_animated/dagre/sketch.exp.svg @@ -1,10 +1,10 @@ -xy + .d2-3227093269 .fill-N1{fill:#0A0F25;} + .d2-3227093269 .fill-N2{fill:#676C7E;} + .d2-3227093269 .fill-N3{fill:#9499AB;} + .d2-3227093269 .fill-N4{fill:#CFD2DD;} + .d2-3227093269 .fill-N5{fill:#DEE1EB;} + .d2-3227093269 .fill-N6{fill:#EEF1F8;} + .d2-3227093269 .fill-N7{fill:#FFFFFF;} + .d2-3227093269 .fill-B1{fill:#0D32B2;} + .d2-3227093269 .fill-B2{fill:#0D32B2;} + .d2-3227093269 .fill-B3{fill:#E3E9FD;} + .d2-3227093269 .fill-B4{fill:#E3E9FD;} + .d2-3227093269 .fill-B5{fill:#EDF0FD;} + .d2-3227093269 .fill-B6{fill:#F7F8FE;} + .d2-3227093269 .fill-AA2{fill:#4A6FF3;} + .d2-3227093269 .fill-AA4{fill:#EDF0FD;} + .d2-3227093269 .fill-AA5{fill:#F7F8FE;} + .d2-3227093269 .fill-AB4{fill:#EDF0FD;} + .d2-3227093269 .fill-AB5{fill:#F7F8FE;} + .d2-3227093269 .stroke-N1{stroke:#0A0F25;} + .d2-3227093269 .stroke-N2{stroke:#676C7E;} + .d2-3227093269 .stroke-N3{stroke:#9499AB;} + .d2-3227093269 .stroke-N4{stroke:#CFD2DD;} + .d2-3227093269 .stroke-N5{stroke:#DEE1EB;} + .d2-3227093269 .stroke-N6{stroke:#EEF1F8;} + .d2-3227093269 .stroke-N7{stroke:#FFFFFF;} + .d2-3227093269 .stroke-B1{stroke:#0D32B2;} + .d2-3227093269 .stroke-B2{stroke:#0D32B2;} + .d2-3227093269 .stroke-B3{stroke:#E3E9FD;} + .d2-3227093269 .stroke-B4{stroke:#E3E9FD;} + .d2-3227093269 .stroke-B5{stroke:#EDF0FD;} + .d2-3227093269 .stroke-B6{stroke:#F7F8FE;} + .d2-3227093269 .stroke-AA2{stroke:#4A6FF3;} + .d2-3227093269 .stroke-AA4{stroke:#EDF0FD;} + .d2-3227093269 .stroke-AA5{stroke:#F7F8FE;} + .d2-3227093269 .stroke-AB4{stroke:#EDF0FD;} + .d2-3227093269 .stroke-AB5{stroke:#F7F8FE;} + .d2-3227093269 .background-color-N1{background-color:#0A0F25;} + .d2-3227093269 .background-color-N2{background-color:#676C7E;} + .d2-3227093269 .background-color-N3{background-color:#9499AB;} + .d2-3227093269 .background-color-N4{background-color:#CFD2DD;} + .d2-3227093269 .background-color-N5{background-color:#DEE1EB;} + .d2-3227093269 .background-color-N6{background-color:#EEF1F8;} + .d2-3227093269 .background-color-N7{background-color:#FFFFFF;} + .d2-3227093269 .background-color-B1{background-color:#0D32B2;} + .d2-3227093269 .background-color-B2{background-color:#0D32B2;} + .d2-3227093269 .background-color-B3{background-color:#E3E9FD;} + .d2-3227093269 .background-color-B4{background-color:#E3E9FD;} + .d2-3227093269 .background-color-B5{background-color:#EDF0FD;} + .d2-3227093269 .background-color-B6{background-color:#F7F8FE;} + .d2-3227093269 .background-color-AA2{background-color:#4A6FF3;} + .d2-3227093269 .background-color-AA4{background-color:#EDF0FD;} + .d2-3227093269 .background-color-AA5{background-color:#F7F8FE;} + .d2-3227093269 .background-color-AB4{background-color:#EDF0FD;} + .d2-3227093269 .background-color-AB5{background-color:#F7F8FE;} + .d2-3227093269 .color-N1{color:#0A0F25;} + .d2-3227093269 .color-N2{color:#676C7E;} + .d2-3227093269 .color-N3{color:#9499AB;} + .d2-3227093269 .color-N4{color:#CFD2DD;} + .d2-3227093269 .color-N5{color:#DEE1EB;} + .d2-3227093269 .color-N6{color:#EEF1F8;} + .d2-3227093269 .color-N7{color:#FFFFFF;} + .d2-3227093269 .color-B1{color:#0D32B2;} + .d2-3227093269 .color-B2{color:#0D32B2;} + .d2-3227093269 .color-B3{color:#E3E9FD;} + .d2-3227093269 .color-B4{color:#E3E9FD;} + .d2-3227093269 .color-B5{color:#EDF0FD;} + .d2-3227093269 .color-B6{color:#F7F8FE;} + .d2-3227093269 .color-AA2{color:#4A6FF3;} + .d2-3227093269 .color-AA4{color:#EDF0FD;} + .d2-3227093269 .color-AA5{color:#F7F8FE;} + .d2-3227093269 .color-AB4{color:#EDF0FD;} + .d2-3227093269 .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);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>xy @@ -111,7 +111,7 @@ -I like turtlesab +I like turtlesab \ No newline at end of file diff --git a/e2etests/testdata/stable/sql_table_tooltip_animated/elk/board.exp.json b/e2etests/testdata/stable/sql_table_tooltip_animated/elk/board.exp.json index 196665d6c..613062453 100644 --- a/e2etests/testdata/stable/sql_table_tooltip_animated/elk/board.exp.json +++ b/e2etests/testdata/stable/sql_table_tooltip_animated/elk/board.exp.json @@ -55,7 +55,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "", + "constraint": null, "reference": "" } ], @@ -127,7 +127,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "", + "constraint": null, "reference": "" } ], diff --git a/e2etests/testdata/stable/sql_table_tooltip_animated/elk/sketch.exp.svg b/e2etests/testdata/stable/sql_table_tooltip_animated/elk/sketch.exp.svg index 386709920..743c80c1c 100644 --- a/e2etests/testdata/stable/sql_table_tooltip_animated/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sql_table_tooltip_animated/elk/sketch.exp.svg @@ -1,10 +1,10 @@ -xy + .d2-514706804 .fill-N1{fill:#0A0F25;} + .d2-514706804 .fill-N2{fill:#676C7E;} + .d2-514706804 .fill-N3{fill:#9499AB;} + .d2-514706804 .fill-N4{fill:#CFD2DD;} + .d2-514706804 .fill-N5{fill:#DEE1EB;} + .d2-514706804 .fill-N6{fill:#EEF1F8;} + .d2-514706804 .fill-N7{fill:#FFFFFF;} + .d2-514706804 .fill-B1{fill:#0D32B2;} + .d2-514706804 .fill-B2{fill:#0D32B2;} + .d2-514706804 .fill-B3{fill:#E3E9FD;} + .d2-514706804 .fill-B4{fill:#E3E9FD;} + .d2-514706804 .fill-B5{fill:#EDF0FD;} + .d2-514706804 .fill-B6{fill:#F7F8FE;} + .d2-514706804 .fill-AA2{fill:#4A6FF3;} + .d2-514706804 .fill-AA4{fill:#EDF0FD;} + .d2-514706804 .fill-AA5{fill:#F7F8FE;} + .d2-514706804 .fill-AB4{fill:#EDF0FD;} + .d2-514706804 .fill-AB5{fill:#F7F8FE;} + .d2-514706804 .stroke-N1{stroke:#0A0F25;} + .d2-514706804 .stroke-N2{stroke:#676C7E;} + .d2-514706804 .stroke-N3{stroke:#9499AB;} + .d2-514706804 .stroke-N4{stroke:#CFD2DD;} + .d2-514706804 .stroke-N5{stroke:#DEE1EB;} + .d2-514706804 .stroke-N6{stroke:#EEF1F8;} + .d2-514706804 .stroke-N7{stroke:#FFFFFF;} + .d2-514706804 .stroke-B1{stroke:#0D32B2;} + .d2-514706804 .stroke-B2{stroke:#0D32B2;} + .d2-514706804 .stroke-B3{stroke:#E3E9FD;} + .d2-514706804 .stroke-B4{stroke:#E3E9FD;} + .d2-514706804 .stroke-B5{stroke:#EDF0FD;} + .d2-514706804 .stroke-B6{stroke:#F7F8FE;} + .d2-514706804 .stroke-AA2{stroke:#4A6FF3;} + .d2-514706804 .stroke-AA4{stroke:#EDF0FD;} + .d2-514706804 .stroke-AA5{stroke:#F7F8FE;} + .d2-514706804 .stroke-AB4{stroke:#EDF0FD;} + .d2-514706804 .stroke-AB5{stroke:#F7F8FE;} + .d2-514706804 .background-color-N1{background-color:#0A0F25;} + .d2-514706804 .background-color-N2{background-color:#676C7E;} + .d2-514706804 .background-color-N3{background-color:#9499AB;} + .d2-514706804 .background-color-N4{background-color:#CFD2DD;} + .d2-514706804 .background-color-N5{background-color:#DEE1EB;} + .d2-514706804 .background-color-N6{background-color:#EEF1F8;} + .d2-514706804 .background-color-N7{background-color:#FFFFFF;} + .d2-514706804 .background-color-B1{background-color:#0D32B2;} + .d2-514706804 .background-color-B2{background-color:#0D32B2;} + .d2-514706804 .background-color-B3{background-color:#E3E9FD;} + .d2-514706804 .background-color-B4{background-color:#E3E9FD;} + .d2-514706804 .background-color-B5{background-color:#EDF0FD;} + .d2-514706804 .background-color-B6{background-color:#F7F8FE;} + .d2-514706804 .background-color-AA2{background-color:#4A6FF3;} + .d2-514706804 .background-color-AA4{background-color:#EDF0FD;} + .d2-514706804 .background-color-AA5{background-color:#F7F8FE;} + .d2-514706804 .background-color-AB4{background-color:#EDF0FD;} + .d2-514706804 .background-color-AB5{background-color:#F7F8FE;} + .d2-514706804 .color-N1{color:#0A0F25;} + .d2-514706804 .color-N2{color:#676C7E;} + .d2-514706804 .color-N3{color:#9499AB;} + .d2-514706804 .color-N4{color:#CFD2DD;} + .d2-514706804 .color-N5{color:#DEE1EB;} + .d2-514706804 .color-N6{color:#EEF1F8;} + .d2-514706804 .color-N7{color:#FFFFFF;} + .d2-514706804 .color-B1{color:#0D32B2;} + .d2-514706804 .color-B2{color:#0D32B2;} + .d2-514706804 .color-B3{color:#E3E9FD;} + .d2-514706804 .color-B4{color:#E3E9FD;} + .d2-514706804 .color-B5{color:#EDF0FD;} + .d2-514706804 .color-B6{color:#F7F8FE;} + .d2-514706804 .color-AA2{color:#4A6FF3;} + .d2-514706804 .color-AA4{color:#EDF0FD;} + .d2-514706804 .color-AA5{color:#F7F8FE;} + .d2-514706804 .color-AB4{color:#EDF0FD;} + .d2-514706804 .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);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>xy @@ -111,7 +111,7 @@ -I like turtlesab +I like turtlesab \ No newline at end of file diff --git a/e2etests/testdata/stable/sql_tables/dagre/board.exp.json b/e2etests/testdata/stable/sql_tables/dagre/board.exp.json index 3eede9e4e..c400a4c67 100644 --- a/e2etests/testdata/stable/sql_tables/dagre/board.exp.json +++ b/e2etests/testdata/stable/sql_tables/dagre/board.exp.json @@ -10,7 +10,7 @@ "x": 0, "y": 0 }, - "width": 268, + "width": 251, "height": 216, "opacity": 1, "strokeDash": 0, @@ -55,7 +55,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -83,7 +83,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -111,7 +111,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -139,7 +139,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -167,7 +167,9 @@ "labelWidth": 77, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" } ], @@ -191,7 +193,7 @@ "id": "products", "type": "sql_table", "pos": { - "x": 328, + "x": 311, "y": 18 }, "width": 164, @@ -239,7 +241,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -267,7 +269,7 @@ "labelWidth": 67, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -295,7 +297,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -323,7 +325,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], @@ -347,7 +349,7 @@ "id": "orders", "type": "sql_table", "pos": { - "x": 328, + "x": 311, "y": 316 }, "width": 164, @@ -395,7 +397,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -423,7 +425,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -451,7 +453,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], @@ -475,7 +477,7 @@ "id": "shipments", "type": "sql_table", "pos": { - "x": 552, + "x": 535, "y": 18 }, "width": 244, @@ -523,7 +525,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -551,7 +553,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -579,7 +581,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -607,7 +609,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], @@ -654,20 +656,20 @@ "labelPercentage": 0, "route": [ { - "x": 134, + "x": 125.5, "y": 216 }, { - "x": 134, + "x": 125.5, "y": 256 }, { - "x": 172.8000030517578, - "y": 283.20001220703125 + "x": 162.6999969482422, + "y": 283 }, { - "x": 328, - "y": 352 + "x": 311.5, + "y": 351 } ], "isCurve": true, @@ -701,19 +703,19 @@ "labelPercentage": 0, "route": [ { - "x": 410, + "x": 393, "y": 198 }, { - "x": 410, + "x": 393, "y": 252.39999389648438 }, { - "x": 410, + "x": 393, "y": 276 }, { - "x": 410, + "x": 393, "y": 316 } ], @@ -748,19 +750,19 @@ "labelPercentage": 0, "route": [ { - "x": 674, + "x": 657, "y": 198 }, { - "x": 674, + "x": 657, "y": 252.39999389648438 }, { - "x": 637.5999755859375, + "x": 620.5999755859375, "y": 282.79998779296875 }, { - "x": 492, + "x": 475, "y": 350 } ], diff --git a/e2etests/testdata/stable/sql_tables/dagre/sketch.exp.svg b/e2etests/testdata/stable/sql_tables/dagre/sketch.exp.svg index 3f7b6ccc5..695ba85a1 100644 --- a/e2etests/testdata/stable/sql_tables/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sql_tables/dagre/sketch.exp.svg @@ -1,10 +1,10 @@ -usersidintnamestringemailstringpasswordstringlast_logindatetimePKproductsidintpricedecimalskustringnamestringordersidintuser_idintproduct_idintshipmentsidintorder_idinttracking_numberstringstatusstring - + .d2-995024594 .fill-N1{fill:#0A0F25;} + .d2-995024594 .fill-N2{fill:#676C7E;} + .d2-995024594 .fill-N3{fill:#9499AB;} + .d2-995024594 .fill-N4{fill:#CFD2DD;} + .d2-995024594 .fill-N5{fill:#DEE1EB;} + .d2-995024594 .fill-N6{fill:#EEF1F8;} + .d2-995024594 .fill-N7{fill:#FFFFFF;} + .d2-995024594 .fill-B1{fill:#0D32B2;} + .d2-995024594 .fill-B2{fill:#0D32B2;} + .d2-995024594 .fill-B3{fill:#E3E9FD;} + .d2-995024594 .fill-B4{fill:#E3E9FD;} + .d2-995024594 .fill-B5{fill:#EDF0FD;} + .d2-995024594 .fill-B6{fill:#F7F8FE;} + .d2-995024594 .fill-AA2{fill:#4A6FF3;} + .d2-995024594 .fill-AA4{fill:#EDF0FD;} + .d2-995024594 .fill-AA5{fill:#F7F8FE;} + .d2-995024594 .fill-AB4{fill:#EDF0FD;} + .d2-995024594 .fill-AB5{fill:#F7F8FE;} + .d2-995024594 .stroke-N1{stroke:#0A0F25;} + .d2-995024594 .stroke-N2{stroke:#676C7E;} + .d2-995024594 .stroke-N3{stroke:#9499AB;} + .d2-995024594 .stroke-N4{stroke:#CFD2DD;} + .d2-995024594 .stroke-N5{stroke:#DEE1EB;} + .d2-995024594 .stroke-N6{stroke:#EEF1F8;} + .d2-995024594 .stroke-N7{stroke:#FFFFFF;} + .d2-995024594 .stroke-B1{stroke:#0D32B2;} + .d2-995024594 .stroke-B2{stroke:#0D32B2;} + .d2-995024594 .stroke-B3{stroke:#E3E9FD;} + .d2-995024594 .stroke-B4{stroke:#E3E9FD;} + .d2-995024594 .stroke-B5{stroke:#EDF0FD;} + .d2-995024594 .stroke-B6{stroke:#F7F8FE;} + .d2-995024594 .stroke-AA2{stroke:#4A6FF3;} + .d2-995024594 .stroke-AA4{stroke:#EDF0FD;} + .d2-995024594 .stroke-AA5{stroke:#F7F8FE;} + .d2-995024594 .stroke-AB4{stroke:#EDF0FD;} + .d2-995024594 .stroke-AB5{stroke:#F7F8FE;} + .d2-995024594 .background-color-N1{background-color:#0A0F25;} + .d2-995024594 .background-color-N2{background-color:#676C7E;} + .d2-995024594 .background-color-N3{background-color:#9499AB;} + .d2-995024594 .background-color-N4{background-color:#CFD2DD;} + .d2-995024594 .background-color-N5{background-color:#DEE1EB;} + .d2-995024594 .background-color-N6{background-color:#EEF1F8;} + .d2-995024594 .background-color-N7{background-color:#FFFFFF;} + .d2-995024594 .background-color-B1{background-color:#0D32B2;} + .d2-995024594 .background-color-B2{background-color:#0D32B2;} + .d2-995024594 .background-color-B3{background-color:#E3E9FD;} + .d2-995024594 .background-color-B4{background-color:#E3E9FD;} + .d2-995024594 .background-color-B5{background-color:#EDF0FD;} + .d2-995024594 .background-color-B6{background-color:#F7F8FE;} + .d2-995024594 .background-color-AA2{background-color:#4A6FF3;} + .d2-995024594 .background-color-AA4{background-color:#EDF0FD;} + .d2-995024594 .background-color-AA5{background-color:#F7F8FE;} + .d2-995024594 .background-color-AB4{background-color:#EDF0FD;} + .d2-995024594 .background-color-AB5{background-color:#F7F8FE;} + .d2-995024594 .color-N1{color:#0A0F25;} + .d2-995024594 .color-N2{color:#676C7E;} + .d2-995024594 .color-N3{color:#9499AB;} + .d2-995024594 .color-N4{color:#CFD2DD;} + .d2-995024594 .color-N5{color:#DEE1EB;} + .d2-995024594 .color-N6{color:#EEF1F8;} + .d2-995024594 .color-N7{color:#FFFFFF;} + .d2-995024594 .color-B1{color:#0D32B2;} + .d2-995024594 .color-B2{color:#0D32B2;} + .d2-995024594 .color-B3{color:#E3E9FD;} + .d2-995024594 .color-B4{color:#E3E9FD;} + .d2-995024594 .color-B5{color:#EDF0FD;} + .d2-995024594 .color-B6{color:#F7F8FE;} + .d2-995024594 .color-AA2{color:#4A6FF3;} + .d2-995024594 .color-AA4{color:#EDF0FD;} + .d2-995024594 .color-AA5{color:#F7F8FE;} + .d2-995024594 .color-AB4{color:#EDF0FD;} + .d2-995024594 .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);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>usersidintnamestringemailstringpasswordstringlast_logindatetimePKproductsidintpricedecimalskustringnamestringordersidintuser_idintproduct_idintshipmentsidintorder_idinttracking_numberstringstatusstring + \ No newline at end of file diff --git a/e2etests/testdata/stable/sql_tables/elk/board.exp.json b/e2etests/testdata/stable/sql_tables/elk/board.exp.json index 286573e69..fece8e814 100644 --- a/e2etests/testdata/stable/sql_tables/elk/board.exp.json +++ b/e2etests/testdata/stable/sql_tables/elk/board.exp.json @@ -10,7 +10,7 @@ "x": 12, "y": 12 }, - "width": 268, + "width": 251, "height": 216, "opacity": 1, "strokeDash": 0, @@ -55,7 +55,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -83,7 +83,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -111,7 +111,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -139,7 +139,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -167,7 +167,9 @@ "labelWidth": 77, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" } ], @@ -191,7 +193,7 @@ "id": "products", "type": "sql_table", "pos": { - "x": 300, + "x": 283, "y": 48 }, "width": 164, @@ -239,7 +241,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -267,7 +269,7 @@ "labelWidth": 67, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -295,7 +297,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -323,7 +325,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], @@ -347,7 +349,7 @@ "id": "orders", "type": "sql_table", "pos": { - "x": 300, + "x": 283, "y": 308 }, "width": 164, @@ -395,7 +397,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -423,7 +425,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -451,7 +453,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], @@ -475,7 +477,7 @@ "id": "shipments", "type": "sql_table", "pos": { - "x": 484, + "x": 467, "y": 48 }, "width": 244, @@ -523,7 +525,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -551,7 +553,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -579,7 +581,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -607,7 +609,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], @@ -654,19 +656,19 @@ "labelPercentage": 0, "route": [ { - "x": 146, + "x": 137.5, "y": 228 }, { - "x": 146, + "x": 137.5, "y": 268 }, { - "x": 341, + "x": 324, "y": 268 }, { - "x": 341, + "x": 324, "y": 308 } ], @@ -700,11 +702,11 @@ "labelPercentage": 0, "route": [ { - "x": 382, + "x": 365, "y": 228 }, { - "x": 382, + "x": 365, "y": 308 } ], @@ -738,19 +740,19 @@ "labelPercentage": 0, "route": [ { - "x": 606, + "x": 589, "y": 228 }, { - "x": 606, + "x": 589, "y": 268 }, { - "x": 423, + "x": 406, "y": 268 }, { - "x": 423, + "x": 406, "y": 308 } ], diff --git a/e2etests/testdata/stable/sql_tables/elk/sketch.exp.svg b/e2etests/testdata/stable/sql_tables/elk/sketch.exp.svg index 0d0b63167..d5d04df18 100644 --- a/e2etests/testdata/stable/sql_tables/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sql_tables/elk/sketch.exp.svg @@ -1,10 +1,10 @@ -usersidintnamestringemailstringpasswordstringlast_logindatetimePKproductsidintpricedecimalskustringnamestringordersidintuser_idintproduct_idintshipmentsidintorder_idinttracking_numberstringstatusstring - + .d2-2093233888 .fill-N1{fill:#0A0F25;} + .d2-2093233888 .fill-N2{fill:#676C7E;} + .d2-2093233888 .fill-N3{fill:#9499AB;} + .d2-2093233888 .fill-N4{fill:#CFD2DD;} + .d2-2093233888 .fill-N5{fill:#DEE1EB;} + .d2-2093233888 .fill-N6{fill:#EEF1F8;} + .d2-2093233888 .fill-N7{fill:#FFFFFF;} + .d2-2093233888 .fill-B1{fill:#0D32B2;} + .d2-2093233888 .fill-B2{fill:#0D32B2;} + .d2-2093233888 .fill-B3{fill:#E3E9FD;} + .d2-2093233888 .fill-B4{fill:#E3E9FD;} + .d2-2093233888 .fill-B5{fill:#EDF0FD;} + .d2-2093233888 .fill-B6{fill:#F7F8FE;} + .d2-2093233888 .fill-AA2{fill:#4A6FF3;} + .d2-2093233888 .fill-AA4{fill:#EDF0FD;} + .d2-2093233888 .fill-AA5{fill:#F7F8FE;} + .d2-2093233888 .fill-AB4{fill:#EDF0FD;} + .d2-2093233888 .fill-AB5{fill:#F7F8FE;} + .d2-2093233888 .stroke-N1{stroke:#0A0F25;} + .d2-2093233888 .stroke-N2{stroke:#676C7E;} + .d2-2093233888 .stroke-N3{stroke:#9499AB;} + .d2-2093233888 .stroke-N4{stroke:#CFD2DD;} + .d2-2093233888 .stroke-N5{stroke:#DEE1EB;} + .d2-2093233888 .stroke-N6{stroke:#EEF1F8;} + .d2-2093233888 .stroke-N7{stroke:#FFFFFF;} + .d2-2093233888 .stroke-B1{stroke:#0D32B2;} + .d2-2093233888 .stroke-B2{stroke:#0D32B2;} + .d2-2093233888 .stroke-B3{stroke:#E3E9FD;} + .d2-2093233888 .stroke-B4{stroke:#E3E9FD;} + .d2-2093233888 .stroke-B5{stroke:#EDF0FD;} + .d2-2093233888 .stroke-B6{stroke:#F7F8FE;} + .d2-2093233888 .stroke-AA2{stroke:#4A6FF3;} + .d2-2093233888 .stroke-AA4{stroke:#EDF0FD;} + .d2-2093233888 .stroke-AA5{stroke:#F7F8FE;} + .d2-2093233888 .stroke-AB4{stroke:#EDF0FD;} + .d2-2093233888 .stroke-AB5{stroke:#F7F8FE;} + .d2-2093233888 .background-color-N1{background-color:#0A0F25;} + .d2-2093233888 .background-color-N2{background-color:#676C7E;} + .d2-2093233888 .background-color-N3{background-color:#9499AB;} + .d2-2093233888 .background-color-N4{background-color:#CFD2DD;} + .d2-2093233888 .background-color-N5{background-color:#DEE1EB;} + .d2-2093233888 .background-color-N6{background-color:#EEF1F8;} + .d2-2093233888 .background-color-N7{background-color:#FFFFFF;} + .d2-2093233888 .background-color-B1{background-color:#0D32B2;} + .d2-2093233888 .background-color-B2{background-color:#0D32B2;} + .d2-2093233888 .background-color-B3{background-color:#E3E9FD;} + .d2-2093233888 .background-color-B4{background-color:#E3E9FD;} + .d2-2093233888 .background-color-B5{background-color:#EDF0FD;} + .d2-2093233888 .background-color-B6{background-color:#F7F8FE;} + .d2-2093233888 .background-color-AA2{background-color:#4A6FF3;} + .d2-2093233888 .background-color-AA4{background-color:#EDF0FD;} + .d2-2093233888 .background-color-AA5{background-color:#F7F8FE;} + .d2-2093233888 .background-color-AB4{background-color:#EDF0FD;} + .d2-2093233888 .background-color-AB5{background-color:#F7F8FE;} + .d2-2093233888 .color-N1{color:#0A0F25;} + .d2-2093233888 .color-N2{color:#676C7E;} + .d2-2093233888 .color-N3{color:#9499AB;} + .d2-2093233888 .color-N4{color:#CFD2DD;} + .d2-2093233888 .color-N5{color:#DEE1EB;} + .d2-2093233888 .color-N6{color:#EEF1F8;} + .d2-2093233888 .color-N7{color:#FFFFFF;} + .d2-2093233888 .color-B1{color:#0D32B2;} + .d2-2093233888 .color-B2{color:#0D32B2;} + .d2-2093233888 .color-B3{color:#E3E9FD;} + .d2-2093233888 .color-B4{color:#E3E9FD;} + .d2-2093233888 .color-B5{color:#EDF0FD;} + .d2-2093233888 .color-B6{color:#F7F8FE;} + .d2-2093233888 .color-AA2{color:#4A6FF3;} + .d2-2093233888 .color-AA4{color:#EDF0FD;} + .d2-2093233888 .color-AA5{color:#F7F8FE;} + .d2-2093233888 .color-AB4{color:#EDF0FD;} + .d2-2093233888 .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);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>usersidintnamestringemailstringpasswordstringlast_logindatetimePKproductsidintpricedecimalskustringnamestringordersidintuser_idintproduct_idintshipmentsidintorder_idinttracking_numberstringstatusstring + \ No newline at end of file diff --git a/e2etests/testdata/stable/square_3d/dagre/sketch.exp.svg b/e2etests/testdata/stable/square_3d/dagre/sketch.exp.svg index e47c6fd0e..fcf8202d3 100644 --- a/e2etests/testdata/stable/square_3d/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/square_3d/dagre/sketch.exp.svg @@ -4,7 +4,7 @@ } @font-face { font-family: d2-3976241457-font-bold; - src: url("data:application/font-woff;base64,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"); + src: url("data:application/font-woff;base64,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"); }]]>-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetimea := 5 + .d2-1407267750 .fill-N1{fill:#0A0F25;} + .d2-1407267750 .fill-N2{fill:#676C7E;} + .d2-1407267750 .fill-N3{fill:#9499AB;} + .d2-1407267750 .fill-N4{fill:#CFD2DD;} + .d2-1407267750 .fill-N5{fill:#DEE1EB;} + .d2-1407267750 .fill-N6{fill:#EEF1F8;} + .d2-1407267750 .fill-N7{fill:#FFFFFF;} + .d2-1407267750 .fill-B1{fill:#0D32B2;} + .d2-1407267750 .fill-B2{fill:#0D32B2;} + .d2-1407267750 .fill-B3{fill:#E3E9FD;} + .d2-1407267750 .fill-B4{fill:#E3E9FD;} + .d2-1407267750 .fill-B5{fill:#EDF0FD;} + .d2-1407267750 .fill-B6{fill:#F7F8FE;} + .d2-1407267750 .fill-AA2{fill:#4A6FF3;} + .d2-1407267750 .fill-AA4{fill:#EDF0FD;} + .d2-1407267750 .fill-AA5{fill:#F7F8FE;} + .d2-1407267750 .fill-AB4{fill:#EDF0FD;} + .d2-1407267750 .fill-AB5{fill:#F7F8FE;} + .d2-1407267750 .stroke-N1{stroke:#0A0F25;} + .d2-1407267750 .stroke-N2{stroke:#676C7E;} + .d2-1407267750 .stroke-N3{stroke:#9499AB;} + .d2-1407267750 .stroke-N4{stroke:#CFD2DD;} + .d2-1407267750 .stroke-N5{stroke:#DEE1EB;} + .d2-1407267750 .stroke-N6{stroke:#EEF1F8;} + .d2-1407267750 .stroke-N7{stroke:#FFFFFF;} + .d2-1407267750 .stroke-B1{stroke:#0D32B2;} + .d2-1407267750 .stroke-B2{stroke:#0D32B2;} + .d2-1407267750 .stroke-B3{stroke:#E3E9FD;} + .d2-1407267750 .stroke-B4{stroke:#E3E9FD;} + .d2-1407267750 .stroke-B5{stroke:#EDF0FD;} + .d2-1407267750 .stroke-B6{stroke:#F7F8FE;} + .d2-1407267750 .stroke-AA2{stroke:#4A6FF3;} + .d2-1407267750 .stroke-AA4{stroke:#EDF0FD;} + .d2-1407267750 .stroke-AA5{stroke:#F7F8FE;} + .d2-1407267750 .stroke-AB4{stroke:#EDF0FD;} + .d2-1407267750 .stroke-AB5{stroke:#F7F8FE;} + .d2-1407267750 .background-color-N1{background-color:#0A0F25;} + .d2-1407267750 .background-color-N2{background-color:#676C7E;} + .d2-1407267750 .background-color-N3{background-color:#9499AB;} + .d2-1407267750 .background-color-N4{background-color:#CFD2DD;} + .d2-1407267750 .background-color-N5{background-color:#DEE1EB;} + .d2-1407267750 .background-color-N6{background-color:#EEF1F8;} + .d2-1407267750 .background-color-N7{background-color:#FFFFFF;} + .d2-1407267750 .background-color-B1{background-color:#0D32B2;} + .d2-1407267750 .background-color-B2{background-color:#0D32B2;} + .d2-1407267750 .background-color-B3{background-color:#E3E9FD;} + .d2-1407267750 .background-color-B4{background-color:#E3E9FD;} + .d2-1407267750 .background-color-B5{background-color:#EDF0FD;} + .d2-1407267750 .background-color-B6{background-color:#F7F8FE;} + .d2-1407267750 .background-color-AA2{background-color:#4A6FF3;} + .d2-1407267750 .background-color-AA4{background-color:#EDF0FD;} + .d2-1407267750 .background-color-AA5{background-color:#F7F8FE;} + .d2-1407267750 .background-color-AB4{background-color:#EDF0FD;} + .d2-1407267750 .background-color-AB5{background-color:#F7F8FE;} + .d2-1407267750 .color-N1{color:#0A0F25;} + .d2-1407267750 .color-N2{color:#676C7E;} + .d2-1407267750 .color-N3{color:#9499AB;} + .d2-1407267750 .color-N4{color:#CFD2DD;} + .d2-1407267750 .color-N5{color:#DEE1EB;} + .d2-1407267750 .color-N6{color:#EEF1F8;} + .d2-1407267750 .color-N7{color:#FFFFFF;} + .d2-1407267750 .color-B1{color:#0D32B2;} + .d2-1407267750 .color-B2{color:#0D32B2;} + .d2-1407267750 .color-B3{color:#E3E9FD;} + .d2-1407267750 .color-B4{color:#E3E9FD;} + .d2-1407267750 .color-B5{color:#EDF0FD;} + .d2-1407267750 .color-B6{color:#F7F8FE;} + .d2-1407267750 .color-AA2{color:#4A6FF3;} + .d2-1407267750 .color-AA4{color:#EDF0FD;} + .d2-1407267750 .color-AA5{color:#F7F8FE;} + .d2-1407267750 .color-AB4{color:#EDF0FD;} + .d2-1407267750 .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);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetimea := 5 b := a + 7 fmt.Printf("%d", b)a := 5 b := a + 7 -fmt.Printf("%d", b) +fmt.Printf("%d", b) \ No newline at end of file diff --git a/e2etests/testdata/stable/unnamed_only_height/elk/board.exp.json b/e2etests/testdata/stable/unnamed_only_height/elk/board.exp.json index 93804d206..b4c0804d3 100644 --- a/e2etests/testdata/stable/unnamed_only_height/elk/board.exp.json +++ b/e2etests/testdata/stable/unnamed_only_height/elk/board.exp.json @@ -130,7 +130,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -158,7 +158,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -186,7 +186,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -214,7 +214,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -242,7 +242,7 @@ "labelWidth": 77, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], diff --git a/e2etests/testdata/stable/unnamed_only_height/elk/sketch.exp.svg b/e2etests/testdata/stable/unnamed_only_height/elk/sketch.exp.svg index 7c10d272a..411d4cf91 100644 --- a/e2etests/testdata/stable/unnamed_only_height/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/unnamed_only_height/elk/sketch.exp.svg @@ -1,24 +1,24 @@ --numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetimea := 5 + .d2-161332075 .fill-N1{fill:#0A0F25;} + .d2-161332075 .fill-N2{fill:#676C7E;} + .d2-161332075 .fill-N3{fill:#9499AB;} + .d2-161332075 .fill-N4{fill:#CFD2DD;} + .d2-161332075 .fill-N5{fill:#DEE1EB;} + .d2-161332075 .fill-N6{fill:#EEF1F8;} + .d2-161332075 .fill-N7{fill:#FFFFFF;} + .d2-161332075 .fill-B1{fill:#0D32B2;} + .d2-161332075 .fill-B2{fill:#0D32B2;} + .d2-161332075 .fill-B3{fill:#E3E9FD;} + .d2-161332075 .fill-B4{fill:#E3E9FD;} + .d2-161332075 .fill-B5{fill:#EDF0FD;} + .d2-161332075 .fill-B6{fill:#F7F8FE;} + .d2-161332075 .fill-AA2{fill:#4A6FF3;} + .d2-161332075 .fill-AA4{fill:#EDF0FD;} + .d2-161332075 .fill-AA5{fill:#F7F8FE;} + .d2-161332075 .fill-AB4{fill:#EDF0FD;} + .d2-161332075 .fill-AB5{fill:#F7F8FE;} + .d2-161332075 .stroke-N1{stroke:#0A0F25;} + .d2-161332075 .stroke-N2{stroke:#676C7E;} + .d2-161332075 .stroke-N3{stroke:#9499AB;} + .d2-161332075 .stroke-N4{stroke:#CFD2DD;} + .d2-161332075 .stroke-N5{stroke:#DEE1EB;} + .d2-161332075 .stroke-N6{stroke:#EEF1F8;} + .d2-161332075 .stroke-N7{stroke:#FFFFFF;} + .d2-161332075 .stroke-B1{stroke:#0D32B2;} + .d2-161332075 .stroke-B2{stroke:#0D32B2;} + .d2-161332075 .stroke-B3{stroke:#E3E9FD;} + .d2-161332075 .stroke-B4{stroke:#E3E9FD;} + .d2-161332075 .stroke-B5{stroke:#EDF0FD;} + .d2-161332075 .stroke-B6{stroke:#F7F8FE;} + .d2-161332075 .stroke-AA2{stroke:#4A6FF3;} + .d2-161332075 .stroke-AA4{stroke:#EDF0FD;} + .d2-161332075 .stroke-AA5{stroke:#F7F8FE;} + .d2-161332075 .stroke-AB4{stroke:#EDF0FD;} + .d2-161332075 .stroke-AB5{stroke:#F7F8FE;} + .d2-161332075 .background-color-N1{background-color:#0A0F25;} + .d2-161332075 .background-color-N2{background-color:#676C7E;} + .d2-161332075 .background-color-N3{background-color:#9499AB;} + .d2-161332075 .background-color-N4{background-color:#CFD2DD;} + .d2-161332075 .background-color-N5{background-color:#DEE1EB;} + .d2-161332075 .background-color-N6{background-color:#EEF1F8;} + .d2-161332075 .background-color-N7{background-color:#FFFFFF;} + .d2-161332075 .background-color-B1{background-color:#0D32B2;} + .d2-161332075 .background-color-B2{background-color:#0D32B2;} + .d2-161332075 .background-color-B3{background-color:#E3E9FD;} + .d2-161332075 .background-color-B4{background-color:#E3E9FD;} + .d2-161332075 .background-color-B5{background-color:#EDF0FD;} + .d2-161332075 .background-color-B6{background-color:#F7F8FE;} + .d2-161332075 .background-color-AA2{background-color:#4A6FF3;} + .d2-161332075 .background-color-AA4{background-color:#EDF0FD;} + .d2-161332075 .background-color-AA5{background-color:#F7F8FE;} + .d2-161332075 .background-color-AB4{background-color:#EDF0FD;} + .d2-161332075 .background-color-AB5{background-color:#F7F8FE;} + .d2-161332075 .color-N1{color:#0A0F25;} + .d2-161332075 .color-N2{color:#676C7E;} + .d2-161332075 .color-N3{color:#9499AB;} + .d2-161332075 .color-N4{color:#CFD2DD;} + .d2-161332075 .color-N5{color:#DEE1EB;} + .d2-161332075 .color-N6{color:#EEF1F8;} + .d2-161332075 .color-N7{color:#FFFFFF;} + .d2-161332075 .color-B1{color:#0D32B2;} + .d2-161332075 .color-B2{color:#0D32B2;} + .d2-161332075 .color-B3{color:#E3E9FD;} + .d2-161332075 .color-B4{color:#E3E9FD;} + .d2-161332075 .color-B5{color:#EDF0FD;} + .d2-161332075 .color-B6{color:#F7F8FE;} + .d2-161332075 .color-AA2{color:#4A6FF3;} + .d2-161332075 .color-AA4{color:#EDF0FD;} + .d2-161332075 .color-AA5{color:#F7F8FE;} + .d2-161332075 .color-AB4{color:#EDF0FD;} + .d2-161332075 .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);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetimea := 5 b := a + 7 fmt.Printf("%d", b)a := 5 b := a + 7 -fmt.Printf("%d", b) +fmt.Printf("%d", b) \ No newline at end of file diff --git a/e2etests/testdata/stable/unnamed_only_width/dagre/board.exp.json b/e2etests/testdata/stable/unnamed_only_width/dagre/board.exp.json index bc19074e8..508c0dfda 100644 --- a/e2etests/testdata/stable/unnamed_only_width/dagre/board.exp.json +++ b/e2etests/testdata/stable/unnamed_only_width/dagre/board.exp.json @@ -130,7 +130,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -158,7 +158,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -186,7 +186,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -214,7 +214,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -242,7 +242,7 @@ "labelWidth": 77, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], diff --git a/e2etests/testdata/stable/unnamed_only_width/dagre/sketch.exp.svg b/e2etests/testdata/stable/unnamed_only_width/dagre/sketch.exp.svg index 4ae7b928a..214e1d697 100644 --- a/e2etests/testdata/stable/unnamed_only_width/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/unnamed_only_width/dagre/sketch.exp.svg @@ -1,24 +1,24 @@ --numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetimea := 5 + .d2-2995629861 .fill-N1{fill:#0A0F25;} + .d2-2995629861 .fill-N2{fill:#676C7E;} + .d2-2995629861 .fill-N3{fill:#9499AB;} + .d2-2995629861 .fill-N4{fill:#CFD2DD;} + .d2-2995629861 .fill-N5{fill:#DEE1EB;} + .d2-2995629861 .fill-N6{fill:#EEF1F8;} + .d2-2995629861 .fill-N7{fill:#FFFFFF;} + .d2-2995629861 .fill-B1{fill:#0D32B2;} + .d2-2995629861 .fill-B2{fill:#0D32B2;} + .d2-2995629861 .fill-B3{fill:#E3E9FD;} + .d2-2995629861 .fill-B4{fill:#E3E9FD;} + .d2-2995629861 .fill-B5{fill:#EDF0FD;} + .d2-2995629861 .fill-B6{fill:#F7F8FE;} + .d2-2995629861 .fill-AA2{fill:#4A6FF3;} + .d2-2995629861 .fill-AA4{fill:#EDF0FD;} + .d2-2995629861 .fill-AA5{fill:#F7F8FE;} + .d2-2995629861 .fill-AB4{fill:#EDF0FD;} + .d2-2995629861 .fill-AB5{fill:#F7F8FE;} + .d2-2995629861 .stroke-N1{stroke:#0A0F25;} + .d2-2995629861 .stroke-N2{stroke:#676C7E;} + .d2-2995629861 .stroke-N3{stroke:#9499AB;} + .d2-2995629861 .stroke-N4{stroke:#CFD2DD;} + .d2-2995629861 .stroke-N5{stroke:#DEE1EB;} + .d2-2995629861 .stroke-N6{stroke:#EEF1F8;} + .d2-2995629861 .stroke-N7{stroke:#FFFFFF;} + .d2-2995629861 .stroke-B1{stroke:#0D32B2;} + .d2-2995629861 .stroke-B2{stroke:#0D32B2;} + .d2-2995629861 .stroke-B3{stroke:#E3E9FD;} + .d2-2995629861 .stroke-B4{stroke:#E3E9FD;} + .d2-2995629861 .stroke-B5{stroke:#EDF0FD;} + .d2-2995629861 .stroke-B6{stroke:#F7F8FE;} + .d2-2995629861 .stroke-AA2{stroke:#4A6FF3;} + .d2-2995629861 .stroke-AA4{stroke:#EDF0FD;} + .d2-2995629861 .stroke-AA5{stroke:#F7F8FE;} + .d2-2995629861 .stroke-AB4{stroke:#EDF0FD;} + .d2-2995629861 .stroke-AB5{stroke:#F7F8FE;} + .d2-2995629861 .background-color-N1{background-color:#0A0F25;} + .d2-2995629861 .background-color-N2{background-color:#676C7E;} + .d2-2995629861 .background-color-N3{background-color:#9499AB;} + .d2-2995629861 .background-color-N4{background-color:#CFD2DD;} + .d2-2995629861 .background-color-N5{background-color:#DEE1EB;} + .d2-2995629861 .background-color-N6{background-color:#EEF1F8;} + .d2-2995629861 .background-color-N7{background-color:#FFFFFF;} + .d2-2995629861 .background-color-B1{background-color:#0D32B2;} + .d2-2995629861 .background-color-B2{background-color:#0D32B2;} + .d2-2995629861 .background-color-B3{background-color:#E3E9FD;} + .d2-2995629861 .background-color-B4{background-color:#E3E9FD;} + .d2-2995629861 .background-color-B5{background-color:#EDF0FD;} + .d2-2995629861 .background-color-B6{background-color:#F7F8FE;} + .d2-2995629861 .background-color-AA2{background-color:#4A6FF3;} + .d2-2995629861 .background-color-AA4{background-color:#EDF0FD;} + .d2-2995629861 .background-color-AA5{background-color:#F7F8FE;} + .d2-2995629861 .background-color-AB4{background-color:#EDF0FD;} + .d2-2995629861 .background-color-AB5{background-color:#F7F8FE;} + .d2-2995629861 .color-N1{color:#0A0F25;} + .d2-2995629861 .color-N2{color:#676C7E;} + .d2-2995629861 .color-N3{color:#9499AB;} + .d2-2995629861 .color-N4{color:#CFD2DD;} + .d2-2995629861 .color-N5{color:#DEE1EB;} + .d2-2995629861 .color-N6{color:#EEF1F8;} + .d2-2995629861 .color-N7{color:#FFFFFF;} + .d2-2995629861 .color-B1{color:#0D32B2;} + .d2-2995629861 .color-B2{color:#0D32B2;} + .d2-2995629861 .color-B3{color:#E3E9FD;} + .d2-2995629861 .color-B4{color:#E3E9FD;} + .d2-2995629861 .color-B5{color:#EDF0FD;} + .d2-2995629861 .color-B6{color:#F7F8FE;} + .d2-2995629861 .color-AA2{color:#4A6FF3;} + .d2-2995629861 .color-AA4{color:#EDF0FD;} + .d2-2995629861 .color-AA5{color:#F7F8FE;} + .d2-2995629861 .color-AB4{color:#EDF0FD;} + .d2-2995629861 .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);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetimea := 5 b := a + 7 fmt.Printf("%d", b)a := 5 b := a + 7 -fmt.Printf("%d", b) +fmt.Printf("%d", b) \ No newline at end of file diff --git a/e2etests/testdata/stable/unnamed_only_width/elk/board.exp.json b/e2etests/testdata/stable/unnamed_only_width/elk/board.exp.json index e3549a896..bbcdf884f 100644 --- a/e2etests/testdata/stable/unnamed_only_width/elk/board.exp.json +++ b/e2etests/testdata/stable/unnamed_only_width/elk/board.exp.json @@ -130,7 +130,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -158,7 +158,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -186,7 +186,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -214,7 +214,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -242,7 +242,7 @@ "labelWidth": 77, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], diff --git a/e2etests/testdata/stable/unnamed_only_width/elk/sketch.exp.svg b/e2etests/testdata/stable/unnamed_only_width/elk/sketch.exp.svg index 767149720..e595adfb4 100644 --- a/e2etests/testdata/stable/unnamed_only_width/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/unnamed_only_width/elk/sketch.exp.svg @@ -1,24 +1,24 @@ --numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetimea := 5 + .d2-2813224635 .fill-N1{fill:#0A0F25;} + .d2-2813224635 .fill-N2{fill:#676C7E;} + .d2-2813224635 .fill-N3{fill:#9499AB;} + .d2-2813224635 .fill-N4{fill:#CFD2DD;} + .d2-2813224635 .fill-N5{fill:#DEE1EB;} + .d2-2813224635 .fill-N6{fill:#EEF1F8;} + .d2-2813224635 .fill-N7{fill:#FFFFFF;} + .d2-2813224635 .fill-B1{fill:#0D32B2;} + .d2-2813224635 .fill-B2{fill:#0D32B2;} + .d2-2813224635 .fill-B3{fill:#E3E9FD;} + .d2-2813224635 .fill-B4{fill:#E3E9FD;} + .d2-2813224635 .fill-B5{fill:#EDF0FD;} + .d2-2813224635 .fill-B6{fill:#F7F8FE;} + .d2-2813224635 .fill-AA2{fill:#4A6FF3;} + .d2-2813224635 .fill-AA4{fill:#EDF0FD;} + .d2-2813224635 .fill-AA5{fill:#F7F8FE;} + .d2-2813224635 .fill-AB4{fill:#EDF0FD;} + .d2-2813224635 .fill-AB5{fill:#F7F8FE;} + .d2-2813224635 .stroke-N1{stroke:#0A0F25;} + .d2-2813224635 .stroke-N2{stroke:#676C7E;} + .d2-2813224635 .stroke-N3{stroke:#9499AB;} + .d2-2813224635 .stroke-N4{stroke:#CFD2DD;} + .d2-2813224635 .stroke-N5{stroke:#DEE1EB;} + .d2-2813224635 .stroke-N6{stroke:#EEF1F8;} + .d2-2813224635 .stroke-N7{stroke:#FFFFFF;} + .d2-2813224635 .stroke-B1{stroke:#0D32B2;} + .d2-2813224635 .stroke-B2{stroke:#0D32B2;} + .d2-2813224635 .stroke-B3{stroke:#E3E9FD;} + .d2-2813224635 .stroke-B4{stroke:#E3E9FD;} + .d2-2813224635 .stroke-B5{stroke:#EDF0FD;} + .d2-2813224635 .stroke-B6{stroke:#F7F8FE;} + .d2-2813224635 .stroke-AA2{stroke:#4A6FF3;} + .d2-2813224635 .stroke-AA4{stroke:#EDF0FD;} + .d2-2813224635 .stroke-AA5{stroke:#F7F8FE;} + .d2-2813224635 .stroke-AB4{stroke:#EDF0FD;} + .d2-2813224635 .stroke-AB5{stroke:#F7F8FE;} + .d2-2813224635 .background-color-N1{background-color:#0A0F25;} + .d2-2813224635 .background-color-N2{background-color:#676C7E;} + .d2-2813224635 .background-color-N3{background-color:#9499AB;} + .d2-2813224635 .background-color-N4{background-color:#CFD2DD;} + .d2-2813224635 .background-color-N5{background-color:#DEE1EB;} + .d2-2813224635 .background-color-N6{background-color:#EEF1F8;} + .d2-2813224635 .background-color-N7{background-color:#FFFFFF;} + .d2-2813224635 .background-color-B1{background-color:#0D32B2;} + .d2-2813224635 .background-color-B2{background-color:#0D32B2;} + .d2-2813224635 .background-color-B3{background-color:#E3E9FD;} + .d2-2813224635 .background-color-B4{background-color:#E3E9FD;} + .d2-2813224635 .background-color-B5{background-color:#EDF0FD;} + .d2-2813224635 .background-color-B6{background-color:#F7F8FE;} + .d2-2813224635 .background-color-AA2{background-color:#4A6FF3;} + .d2-2813224635 .background-color-AA4{background-color:#EDF0FD;} + .d2-2813224635 .background-color-AA5{background-color:#F7F8FE;} + .d2-2813224635 .background-color-AB4{background-color:#EDF0FD;} + .d2-2813224635 .background-color-AB5{background-color:#F7F8FE;} + .d2-2813224635 .color-N1{color:#0A0F25;} + .d2-2813224635 .color-N2{color:#676C7E;} + .d2-2813224635 .color-N3{color:#9499AB;} + .d2-2813224635 .color-N4{color:#CFD2DD;} + .d2-2813224635 .color-N5{color:#DEE1EB;} + .d2-2813224635 .color-N6{color:#EEF1F8;} + .d2-2813224635 .color-N7{color:#FFFFFF;} + .d2-2813224635 .color-B1{color:#0D32B2;} + .d2-2813224635 .color-B2{color:#0D32B2;} + .d2-2813224635 .color-B3{color:#E3E9FD;} + .d2-2813224635 .color-B4{color:#E3E9FD;} + .d2-2813224635 .color-B5{color:#EDF0FD;} + .d2-2813224635 .color-B6{color:#F7F8FE;} + .d2-2813224635 .color-AA2{color:#4A6FF3;} + .d2-2813224635 .color-AA4{color:#EDF0FD;} + .d2-2813224635 .color-AA5{color:#F7F8FE;} + .d2-2813224635 .color-AB4{color:#EDF0FD;} + .d2-2813224635 .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);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetimea := 5 b := a + 7 fmt.Printf("%d", b)a := 5 b := a + 7 -fmt.Printf("%d", b) +fmt.Printf("%d", b) \ No newline at end of file diff --git a/e2etests/testdata/stable/us_map/dagre/sketch.exp.svg b/e2etests/testdata/stable/us_map/dagre/sketch.exp.svg index f59483bca..df9b03f61 100644 --- a/e2etests/testdata/stable/us_map/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/us_map/dagre/sketch.exp.svg @@ -4,7 +4,7 @@ } @font-face { font-family: d2-4078018276-font-bold; - src: url("data:application/font-woff;base64,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"); + src: url("data:application/font-woff;base64,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"); }]]>networkuserapi serverlogsusersidintnamestringemailstringpasswordstringlast_logindatetimeproducts+idint+pricedecimal+skustring+namestring

A tale

+networkuserapi serverlogsusersidintnamestringemailstringpasswordstringlast_logindatetimeproducts+idint+pricedecimal+skustring+namestring

A tale

  • of
  • two cities
    • @@ -908,7 +908,7 @@     city2 := City{Name: "CityB", Population: 1200000}     tellTale(city1, city2) -}Cell Toweronline portaldata processorsatellitesTRANSMITTERuistorage sendsendsendphone logsmake call accessdisplaypersist +}Cell Toweronline portaldata processorsatellitesTRANSMITTERuistorage sendsendsendphone logsmake call accessdisplaypersist diff --git a/e2etests/testdata/themes/dark_terrastruct_flagship/elk/board.exp.json b/e2etests/testdata/themes/dark_terrastruct_flagship/elk/board.exp.json index c9ccab85e..446b8df1a 100644 --- a/e2etests/testdata/themes/dark_terrastruct_flagship/elk/board.exp.json +++ b/e2etests/testdata/themes/dark_terrastruct_flagship/elk/board.exp.json @@ -506,7 +506,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -534,7 +534,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -562,7 +562,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -590,7 +590,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -618,7 +618,7 @@ "labelWidth": 77, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], diff --git a/e2etests/testdata/themes/dark_terrastruct_flagship/elk/sketch.exp.svg b/e2etests/testdata/themes/dark_terrastruct_flagship/elk/sketch.exp.svg index 8ae359ae2..0762ba5ad 100644 --- a/e2etests/testdata/themes/dark_terrastruct_flagship/elk/sketch.exp.svg +++ b/e2etests/testdata/themes/dark_terrastruct_flagship/elk/sketch.exp.svg @@ -1,42 +1,42 @@ -networkuserapi serverlogsusersidintnamestringemailstringpasswordstringlast_logindatetimeproducts+idint+pricedecimal+skustring+namestring

    A tale

    +networkuserapi serverlogsusersidintnamestringemailstringpasswordstringlast_logindatetimeproducts+idint+pricedecimal+skustring+namestring

    A tale

    • of
    • two cities
      • @@ -908,7 +908,7 @@     city2 := City{Name: "CityB", Population: 1200000}     tellTale(city1, city2) -}Cell Toweronline portaldata processorsatellitesTRANSMITTERuistorage sendsendsendphone logsmake call accessdisplaypersist +}Cell Toweronline portaldata processorsatellitesTRANSMITTERuistorage sendsendsendphone logsmake call accessdisplaypersist diff --git a/e2etests/testdata/themes/origami/dagre/sketch.exp.svg b/e2etests/testdata/themes/origami/dagre/sketch.exp.svg index be30d2b19..c9cbd8e53 100644 --- a/e2etests/testdata/themes/origami/dagre/sketch.exp.svg +++ b/e2etests/testdata/themes/origami/dagre/sketch.exp.svg @@ -4,21 +4,21 @@ } @font-face { font-family: d2-4006446019-font-regular; - src: url("data:application/font-woff;base64,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"); + src: url("data:application/font-woff;base64,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"); } .d2-4006446019 .text-bold { font-family: "d2-4006446019-font-bold"; } @font-face { font-family: d2-4006446019-font-bold; - src: url("data:application/font-woff;base64,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"); + src: url("data:application/font-woff;base64,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"); } .d2-4006446019 .text-italic { font-family: "d2-4006446019-font-italic"; } @font-face { font-family: d2-4006446019-font-italic; - src: url("data:application/font-woff;base64,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"); + src: url("data:application/font-woff;base64,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"); }]]>containerscloudtall cylinderclass2-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voidusersidintnamestringemailstringpasswordstringlast_logindatetimecontainer

      markdown text expanded to 800x400

      +containerscloudtall cylinderclass2-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voidusersidintnamestringemailstringpasswordstringlast_logindatetimecontainer

      markdown text expanded to 800x400

      a := 5 b := a + 7 fmt.Printf("%d", b)a := 5 @@ -859,7 +859,7 @@ b := a + 7 fmt.Printf("%d", b)a := 5 b := a + 7 -fmt.Printf("%d", b)circle containerdiamond containeroval containerhexagon containerdiamondcirclehexagonoval +fmt.Printf("%d", b)circle containerdiamond containeroval containerhexagon containerdiamondcirclehexagonoval \ No newline at end of file diff --git a/e2etests/testdata/todo/shape_set_width_height/elk/board.exp.json b/e2etests/testdata/todo/shape_set_width_height/elk/board.exp.json index a461cb6a0..f83df4dbe 100644 --- a/e2etests/testdata/todo/shape_set_width_height/elk/board.exp.json +++ b/e2etests/testdata/todo/shape_set_width_height/elk/board.exp.json @@ -581,7 +581,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -609,7 +609,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -637,7 +637,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -665,7 +665,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -693,7 +693,7 @@ "labelWidth": 77, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], diff --git a/e2etests/testdata/todo/shape_set_width_height/elk/sketch.exp.svg b/e2etests/testdata/todo/shape_set_width_height/elk/sketch.exp.svg index 2b7d29ab7..8b8248447 100644 --- a/e2etests/testdata/todo/shape_set_width_height/elk/sketch.exp.svg +++ b/e2etests/testdata/todo/shape_set_width_height/elk/sketch.exp.svg @@ -1,35 +1,35 @@ -containerscloudtall cylinderclass2-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voidusersidintnamestringemailstringpasswordstringlast_logindatetimecontainer

      markdown text expanded to 800x400

      +containerscloudtall cylinderclass2-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voidusersidintnamestringemailstringpasswordstringlast_logindatetimecontainer

      markdown text expanded to 800x400

      a := 5 b := a + 7 fmt.Printf("%d", b)a := 5 @@ -859,7 +859,7 @@ b := a + 7 fmt.Printf("%d", b)a := 5 b := a + 7 -fmt.Printf("%d", b)circle containerdiamond containeroval containerhexagon containerdiamondcirclehexagonoval +fmt.Printf("%d", b)circle containerdiamond containeroval containerhexagon containerdiamondcirclehexagonoval \ No newline at end of file diff --git a/e2etests/testdata/unicode/japanese-full/dagre/sketch.exp.svg b/e2etests/testdata/unicode/japanese-full/dagre/sketch.exp.svg index 6020e5abb..518b0f16b 100644 --- a/e2etests/testdata/unicode/japanese-full/dagre/sketch.exp.svg +++ b/e2etests/testdata/unicode/japanese-full/dagre/sketch.exp.svg @@ -4,14 +4,14 @@ } @font-face { font-family: d2-2100912734-font-bold; - src: url("data:application/font-woff;base64,d09GRgABAAAAAAWwAAoAAAAACmwAAguFAAAAAAAAAAAAAAAAAAAAAAAAAABPUy8yAAAA9AAAAGAAAABgXxHXrmNtYXAAAAFUAAAAMAAAADAADQBWZ2x5ZgAAAYQAAABYAAAAWA4fL09oZWFkAAAB3AAAADYAAAA2G38e1GhoZWEAAAIUAAAAJAAAACQKfwXBaG10eAAAAjgAAAAIAAAACAN6AFBsb2NhAAACQAAAAAYAAAAGACwALG1heHAAAAJIAAAAIAAAACAAGgD3bmFtZQAAAmgAAAMoAAAIKgjwVkFwb3N0AAAFkAAAAB0AAAAg/9EAMgADAioCvAAFAAACigJYAAAASwKKAlgAAAFeADIBKQAAAgsHAwMEAwICBGAAAvcAAAADAAAAAAAAAABBREJPACAAIP//Au7/BgAAA9gBESAAAZ8AAAAAAfAClAAAACAAAwAAAAEAAwABAAAADAAEACMAAAAEAAQAAQAAACD//wAAACD////hAAEAAAAAAAEAAAAFAFAAAAJiApQAAwAJAA8AEgAVAAAzESERJTMnJyMHNzM3NyMXAzcnAREHUAIS/qWkJykEKSkEKiCYH3pfXwFNXgKU/WxbTWJi9l87O/6eubr+jQFzugAAAQAAAAILhWYdgy1fDzz1AAED6AAAAADYXaCEAAAAAN1mLzb+N/7ECG0D8QABAAMAAgAAAAAAAAABAAAD2P7vAAAImP43/jcIbQABAAAAAAAAAAAAAAAAAAAAAgKyAFAAyAAAAAAALAAsAAAAAQAAAAIAkAAMAGMABwABAAAAAAAAAAAAAAAAAAQAA3icnJTPbhtVFMZ/TmzTCsECRVW6ie6CRZHo2FRJ1TYrh9SKRRQHjwtCQkgTz/iPMp4ZeSYO4QlY8xa8RVc8BM+BWKP5fOzYBdEmipJ8d+75851zvnOBHf5mm0r1IfBHPTFcYa9+bniLB/UTw9u061uGqzyp/Wm4RlibG67zea1n+CPeVn8z/ID96k+GH7JbbRv+mGfVHcOfbDv+Mvwp+7xd4Aq84FfDFXbJDG+xw4+Gt3mExaxUeUTTcI3P2DNcZw/oM6EgZkLCCMeQCSOumBGR4xMxY8KQiBBHhxYxhb4mBEKO0X9+DfApmBEo4pgCR4xPTEDO2CL+Iq+Uc2Uc6jSzuxYFYwIu5HFJQIIjZURKQsSl4hQUZLyiQYOcgfhmFOR45EyI8UiZMaJBlzan9BkzIcfRVqSSmU/KkIJrAuV3ZlF2ZkBEQm6srkgIxdOJXyTvDqc4umSyXY98uhHhSxzfybvklsr2Kzz9ujVmm3mXbALm6mesrsS6udYEx7ot87b4VrjgFe5e/dlk8v4ehfpfKPIFV5p/qEklYpLg3C4tfCnId49xHOncwVdHvqdDnxO6vKGvc4sePVqc0afDa/l26eH4mi5nHMujI7y4a0sxZ/yA4xs6siljR9afxcQifiYzdefiOFMdUzL1vGTuqdZIFd59wuUOpRvqyOUz0B6Vlk7zS7RnASNTRSaGU/VyqY3c+heaIqaqpZzt7X25DXPbveUW35Bqh0u1LjiVk1swet9UvXc0c60fj4CQlAtZDEiZ0qDgRrzPCbgixnGs7p1oSwpaK58yz41UEjEVgw6J4szI9Dcw3fjGfbChe2dvSSj/kunlqqr7ZHHq1e2M3qh7yzvfuhytTaBhU03X1DQQ18S0H2mn1vn78s31uqU85YiUmPBfL8AzPJrsc8AhY2UY6GZur0NTL0STlxyq+ksiWQ2l58giHODxnAMOeMnzd/q4ZOKMi1txWc/d4pgjuhx+UBUL+y5HvF59+/+sv4tpU7U4nq5OL+49xSd3UOsX2rPb97KniZWTmFu02604I2BacnG76zW5x3j/AAAA//8BAAD///S3T1F4nGJgZgCD/+cYjBiwAAAAAAD//wEAAP//LwECAwAAAA=="); + src: url("data:application/font-woff;base64,d09GRgABAAAAAAWwAAoAAAAACmwAAguFAAAAAAAAAAAAAAAAAAAAAAAAAABPUy8yAAAA9AAAAGAAAABgXxHXrmNtYXAAAAFUAAAAMAAAADAADQBXZ2x5ZgAAAYQAAABYAAAAWA4fL09oZWFkAAAB3AAAADYAAAA2G38e1GhoZWEAAAIUAAAAJAAAACQKfwXBaG10eAAAAjgAAAAIAAAACAN6AFBsb2NhAAACQAAAAAYAAAAGACwALG1heHAAAAJIAAAAIAAAACAAGgD3bmFtZQAAAmgAAAMoAAAIKgjwVkFwb3N0AAAFkAAAAB0AAAAg/9EAMgADAioCvAAFAAACigJYAAAASwKKAlgAAAFeADIBKQAAAgsHAwMEAwICBGAAAvcAAAADAAAAAAAAAABBREJPACAAIP//Au7/BgAAA9gBESAAAZ8AAAAAAfAClAAAACAAAwAAAAEAAwABAAAADAAEACQAAAAEAAQAAQAAACD//wAAACD////hAAEAAAAAAAEAAAAFAFAAAAJiApQAAwAJAA8AEgAVAAAzESERJTMnJyMHNzM3NyMXAzcnAREHUAIS/qWkJykEKSkEKiCYH3pfXwFNXgKU/WxbTWJi9l87O/6eubr+jQFzugAAAQAAAAILhWYdgytfDzz1AAED6AAAAADYXaCEAAAAAN1mLzb+N/7ECG0D8QABAAMAAgAAAAAAAAABAAAD2P7vAAAImP43/jcIbQABAAAAAAAAAAAAAAAAAAAAAgKyAFAAyAAAAAAALAAsAAAAAQAAAAIAkAAMAGMABwABAAAAAAAAAAAAAAAAAAQAA3icnJTPbhtVFMZ/TmzTCsECRVW6ie6CRZHo2FRJ1TYrh9SKRRQHjwtCQkgTz/iPMp4ZeSYO4QlY8xa8RVc8BM+BWKP5fOzYBdEmipJ8d+75851zvnOBHf5mm0r1IfBHPTFcYa9+bniLB/UTw9u061uGqzyp/Wm4RlibG67zea1n+CPeVn8z/ID96k+GH7JbbRv+mGfVHcOfbDv+Mvwp+7xd4Aq84FfDFXbJDG+xw4+Gt3mExaxUeUTTcI3P2DNcZw/oM6EgZkLCCMeQCSOumBGR4xMxY8KQiBBHhxYxhb4mBEKO0X9+DfApmBEo4pgCR4xPTEDO2CL+Iq+Uc2Uc6jSzuxYFYwIu5HFJQIIjZURKQsSl4hQUZLyiQYOcgfhmFOR45EyI8UiZMaJBlzan9BkzIcfRVqSSmU/KkIJrAuV3ZlF2ZkBEQm6srkgIxdOJXyTvDqc4umSyXY98uhHhSxzfybvklsr2Kzz9ujVmm3mXbALm6mesrsS6udYEx7ot87b4VrjgFe5e/dlk8v4ehfpfKPIFV5p/qEklYpLg3C4tfCnId49xHOncwVdHvqdDnxO6vKGvc4sePVqc0afDa/l26eH4mi5nHMujI7y4a0sxZ/yA4xs6siljR9afxcQifiYzdefiOFMdUzL1vGTuqdZIFd59wuUOpRvqyOUz0B6Vlk7zS7RnASNTRSaGU/VyqY3c+heaIqaqpZzt7X25DXPbveUW35Bqh0u1LjiVk1swet9UvXc0c60fj4CQlAtZDEiZ0qDgRrzPCbgixnGs7p1oSwpaK58yz41UEjEVgw6J4szI9Dcw3fjGfbChe2dvSSj/kunlqqr7ZHHq1e2M3qh7yzvfuhytTaBhU03X1DQQ18S0H2mn1vn78s31uqU85YiUmPBfL8AzPJrsc8AhY2UY6GZur0NTL0STlxyq+ksiWQ2l58giHODxnAMOeMnzd/q4ZOKMi1txWc/d4pgjuhx+UBUL+y5HvF59+/+sv4tpU7U4nq5OL+49xSd3UOsX2rPb97KniZWTmFu02604I2BacnG76zW5x3j/AAAA//8BAAD///S3T1F4nGJgZgCD/+cYjBiwAAAAAAD//wEAAP//LwECAwAAAA=="); } .d2-2100912734 .text-italic { font-family: "d2-2100912734-font-italic"; } @font-face { font-family: d2-2100912734-font-italic; - src: url("data:application/font-woff;base64,d09GRgABAAAAAAW0AAoAAAAACngAARhRAAAAAAAAAAAAAAAAAAAAAAAAAABPUy8yAAAA9AAAAGAAAABgW1SVeGNtYXAAAAFUAAAAMAAAADAADQBWZ2x5ZgAAAYQAAABcAAAAXDmDoR1oZWFkAAAB4AAAADYAAAA2G7Ur2mhoZWEAAAIYAAAAJAAAACQLeAimaG10eAAAAjwAAAAIAAAACAM8ACRsb2NhAAACRAAAAAYAAAAGAC4ALm1heHAAAAJMAAAAIAAAACAAGgD2bmFtZQAAAmwAAAMmAAAIMgntVzNwb3N0AAAFlAAAACAAAAAg/8YAMgADAeEBkAAFAAACigJY//EASwKKAlgARAFeADIBIwAAAgsFAwMEAwkCBCAAAHcAAAADAAAAAAAAAABBREJPAAEAIP//Au7/BgAAA9gBESAAAZMAAAAAAeYClAAAACAAAwAAAAEAAwABAAAADAAEACMAAAAEAAQAAQAAACD//wAAACD////hAAEAAAAAAAEAAAAFACQAAAJuApQAAwAJAA8AEgAVAAAzEyEDAzM3NyMXAzMnJyMHBzcnExMHJIIByIKaBENa5Sig+SwfBEeBqUvsYKsClP1sAYBdf3/+W4hlZVfr6/4qAdbrAAAAAAEAAAABGFETBQJpXw889QABA+gAAAAA2F2gzAAAAADdZi83/r3+3QgdA8kAAgADAAIAAAAAAAAAAQAAA9j+7wAACED+vf28CB0D6ADC/9EAAAAAAAAAAAAAAAICdAAkAMgAAAAAAC4ALgAAAAEAAAACAIwADABmAAcAAQAAAAAAAAAAAAAAAAAEAAN4nJyU204bVxSGPwfbbXq6qFBEbtC+TKVkTKMQJeHKlKCMinDqcXqQqkqDPT6I8czIM5iSJ+h136Jvkas+Rp+i6nW1fy+DHUVBIAT8e/Y6/Gutf21gk//YoFa/C/zdnBuusd382fAdvmgeGd5gv/mZ4ToPG/8YbjBovDXc5EGja/gT3tX/NPwpT+q/Gb7LVv3Q8Oc8rm8a/nLD8a/hr3jCuwWuwTP+MFxji8LwHTb51fAG97CYtTr32DHc4Gu2DTfZBnpMqEiZkDHCMWTCiDNmJJREJMyYMCRhgCOkTUqlrxmxkGP0wa8xERUzYkUcU+FIiUiJKRlbxLfyynmtjEOdZnbXpmJMzIk8TonJcOSMyMlIOFWcioqCF7RoUdIX34KKkoCSCSkBOTNGtOhwyBE9xkwocRwqkmcWkTOk4pxY+Z1Z+M70ScgojdUZGQPxdOKXyDvkCEeHQrarkY/WIjzE8aO8Pbdctt8S6NetMFvPu2QTM1c/U3Ul1c25JjjWrc/b5gfhihe4W/Vnncn1PRrof6XIJ5xp/gNNKhOTDOe2aBNJQZG7j2Nf55BIHfmJkB6v6PCGns5tunRpc0yPkJfy7dDF8R0djjmQRyi8uDuUYo75Bcf3hLLxsRPrz2JiCb9TmLpLcZypjimFeu6ZB6o1UYU3n7DfoXxNHaV8+tojb+k0v0x7FjMyVRRiOFUvl9oorX8DU8RUtfjZXt37bZjb7i23+IJcO+zVuuDkJ7dgdN1Ug/c0c66fgJgBOSey6JMzpUXFhXi/JuaMFMeBuvdKW1LRvvTxeS6kkoSpGIRkijOj0N/YdBMZ9/6a7p29JQP5e6anl1XdJotTr65m9EbdW95F1uVkZQItm2q+oqa+uGam/UQ7tco/km+p1y3nEaHiLnb7Q6/ADs/ZZY+xsvR1M7+886+Et9hTB05JZDWUpn0NjwnYJeApu+zynKfv9XLJxhkft8ZnNX+bA/bpsHdtNQvbDvu8XIv28cx/ie2O6nE8ujw9u/U0H9xAtd9o367eza4m56cxt2hX23FMzNRzcVurNbn7BP8DAAD//wEAAP//cqFRQAAAAAMAAP/1AAD/zgAyAAAAAAAAAAAAAAAAAAAAAAAAAAA="); + src: url("data:application/font-woff;base64,d09GRgABAAAAAAW0AAoAAAAACngAARhRAAAAAAAAAAAAAAAAAAAAAAAAAABPUy8yAAAA9AAAAGAAAABgW1SVeGNtYXAAAAFUAAAAMAAAADAADQBXZ2x5ZgAAAYQAAABcAAAAXDmDoR1oZWFkAAAB4AAAADYAAAA2G7Ur2mhoZWEAAAIYAAAAJAAAACQLeAimaG10eAAAAjwAAAAIAAAACAM8ACRsb2NhAAACRAAAAAYAAAAGAC4ALm1heHAAAAJMAAAAIAAAACAAGgD2bmFtZQAAAmwAAAMmAAAIMgntVzNwb3N0AAAFlAAAACAAAAAg/8YAMgADAeEBkAAFAAACigJY//EASwKKAlgARAFeADIBIwAAAgsFAwMEAwkCBCAAAHcAAAADAAAAAAAAAABBREJPAAEAIP//Au7/BgAAA9gBESAAAZMAAAAAAeYClAAAACAAAwAAAAEAAwABAAAADAAEACQAAAAEAAQAAQAAACD//wAAACD////hAAEAAAAAAAEAAAAFACQAAAJuApQAAwAJAA8AEgAVAAAzEyEDAzM3NyMXAzMnJyMHBzcnExMHJIIByIKaBENa5Sig+SwfBEeBqUvsYKsClP1sAYBdf3/+W4hlZVfr6/4qAdbrAAAAAAEAAAABGFETBQJnXw889QABA+gAAAAA2F2gzAAAAADdZi83/r3+3QgdA8kAAgADAAIAAAAAAAAAAQAAA9j+7wAACED+vf28CB0D6ADC/9EAAAAAAAAAAAAAAAICdAAkAMgAAAAAAC4ALgAAAAEAAAACAIwADABmAAcAAQAAAAAAAAAAAAAAAAAEAAN4nJyU204bVxSGPwfbbXq6qFBEbtC+TKVkTKMQJeHKlKCMinDqcXqQqkqDPT6I8czIM5iSJ+h136Jvkas+Rp+i6nW1fy+DHUVBIAT8e/Y6/Gutf21gk//YoFa/C/zdnBuusd382fAdvmgeGd5gv/mZ4ToPG/8YbjBovDXc5EGja/gT3tX/NPwpT+q/Gb7LVv3Q8Oc8rm8a/nLD8a/hr3jCuwWuwTP+MFxji8LwHTb51fAG97CYtTr32DHc4Gu2DTfZBnpMqEiZkDHCMWTCiDNmJJREJMyYMCRhgCOkTUqlrxmxkGP0wa8xERUzYkUcU+FIiUiJKRlbxLfyynmtjEOdZnbXpmJMzIk8TonJcOSMyMlIOFWcioqCF7RoUdIX34KKkoCSCSkBOTNGtOhwyBE9xkwocRwqkmcWkTOk4pxY+Z1Z+M70ScgojdUZGQPxdOKXyDvkCEeHQrarkY/WIjzE8aO8Pbdctt8S6NetMFvPu2QTM1c/U3Ul1c25JjjWrc/b5gfhihe4W/Vnncn1PRrof6XIJ5xp/gNNKhOTDOe2aBNJQZG7j2Nf55BIHfmJkB6v6PCGns5tunRpc0yPkJfy7dDF8R0djjmQRyi8uDuUYo75Bcf3hLLxsRPrz2JiCb9TmLpLcZypjimFeu6ZB6o1UYU3n7DfoXxNHaV8+tojb+k0v0x7FjMyVRRiOFUvl9oorX8DU8RUtfjZXt37bZjb7i23+IJcO+zVuuDkJ7dgdN1Ug/c0c66fgJgBOSey6JMzpUXFhXi/JuaMFMeBuvdKW1LRvvTxeS6kkoSpGIRkijOj0N/YdBMZ9/6a7p29JQP5e6anl1XdJotTr65m9EbdW95F1uVkZQItm2q+oqa+uGam/UQ7tco/km+p1y3nEaHiLnb7Q6/ADs/ZZY+xsvR1M7+886+Et9hTB05JZDWUpn0NjwnYJeApu+zynKfv9XLJxhkft8ZnNX+bA/bpsHdtNQvbDvu8XIv28cx/ie2O6nE8ujw9u/U0H9xAtd9o367eza4m56cxt2hX23FMzNRzcVurNbn7BP8DAAD//wEAAP//cqFRQAAAAAMAAP/1AAD/zgAyAAAAAAAAAAAAAAAAAAAAAAAAAAA="); }]]>ab +`, url1, url2) + + ms := &xmain.State{ + Name: "test", + + Stdin: os.Stdin, + Stdout: os.Stdout, + Stderr: os.Stderr, + + Env: xos.NewEnv(os.Environ()), + } + ms.Log = cmdlog.NewTB(ms.Env, t) + + count := 0 + + httpClient.Transport = roundTripFunc(func(req *http.Request) *http.Response { + count++ + respRecorder := httptest.NewRecorder() + respRecorder.WriteString(`\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n`) + respRecorder.WriteHeader(200) + return respRecorder.Result() + }) + + out, err := BundleRemote(ctx, ms, []byte(sampleSVG)) + if err != nil { + t.Fatal(err) + } + tassert.Equal(t, 1, count) + if strings.Contains(string(out), url1) { + t.Fatal("links still exist") + } + tassert.Equal(t, 2, strings.Count(string(out), "image/svg+xml")) +} + +func TestImgCache(t *testing.T) { + imgCache = sync.Map{} + ctx := context.Background() + url1 := "https://icons.terrastruct.com/essentials/004-picture.svg" + url2 := "https://icons.terrastruct.com/essentials/004-picture.svg" + + sampleSVG := fmt.Sprintf(` +ab +`, url1, url2) + + ms := &xmain.State{ + Name: "test", + + Stdin: os.Stdin, + Stdout: os.Stdout, + Stderr: os.Stderr, + + Env: xos.NewEnv(os.Environ()), + } + ms.Log = cmdlog.NewTB(ms.Env, t) + + count := 0 + + httpClient.Transport = roundTripFunc(func(req *http.Request) *http.Response { + count++ + respRecorder := httptest.NewRecorder() + respRecorder.WriteString(`\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n`) + respRecorder.WriteHeader(200) + return respRecorder.Result() + }) + + // Using a cache, imgs are not refetched on multiple runs + ms.Env.Setenv("IMG_CACHE", "1") + _, err := BundleRemote(ctx, ms, []byte(sampleSVG)) + if err != nil { + t.Fatal(err) + } + _, err = BundleRemote(ctx, ms, []byte(sampleSVG)) + if err != nil { + t.Fatal(err) + } + tassert.Equal(t, 1, count) + + // With cache disabled, it refetches + ms.Env.Setenv("IMG_CACHE", "0") + count = 0 + _, err = BundleRemote(ctx, ms, []byte(sampleSVG)) + if err != nil { + t.Fatal(err) + } + _, err = BundleRemote(ctx, ms, []byte(sampleSVG)) + if err != nil { + t.Fatal(err) + } + tassert.Equal(t, 2, count) +} diff --git a/lib/urlenc/testdata/TestChanges.exp.txt b/lib/urlenc/testdata/TestChanges.exp.txt new file mode 100644 index 000000000..c8aeb9aed --- /dev/null +++ b/lib/urlenc/testdata/TestChanges.exp.txt @@ -0,0 +1 @@ +vFdtb9s4Ev6uXzFwWvQuiN5sN0mFwx1yadMUaLHe2rv9UmBBiyOZrUSqJGUn3ea_L4aSbFl2usUusPkQkzPkzMNnXkhZUSIpoBR3qBMYjeB3DwDvqoJJRkwm8K3kHgDAyQmcni72NpyeOo0Pb-QnTC0wbs5gs1K-VX6mikJtzkDJpWKaC5m3a6-VXKM2zjqUitcFdppaG6WFzM8qlovGf6tabJBZ4MjrqhBpXzNHvUYOnFkGhcrzxtE378GboaoKBC5Mqtao7xMYDUXwURrUa5HiyGO8JeGKN6dzVDiiA0qZBEYnaczG2WTkPXje7lzQmkhg9NNO2LO8zzL4_4UhjiNLDu0fWdRi9lJKRyFRR9sY5ppVqy-FB5CqskRpPQBbGFYJ76G3PmjXJfCaBj-__ShvkKOmyoO51cwquHbl0NBB6ZqAKFlOUaPkT2BlbWWSMKyrQjEebMRnUSIXLFA6D2lW0SwkHEqa0K7qchnGYXwRtj5_e6tyFZh1HsbjKKru_KE8qGS-D7s9VJeeJyeUImjD2qAGWofSwuqea5crZ7AWRixFIew9ZKKwSGnmfetbbMhJYPF27l_N3sC_lkjkc6w0pkTHv4_QRkHYD8swSv_x4cCJZzeCWhFklDSLdnKjHWwOTQD3uaWZCSxqzYzVdWqJgdCoVLAijOKJ35r0Y-JrGKmHnkeCfCz-YrZSEmGDy8cXdxzdLhYzuJJcK8G9DS4T-IDLH0bNvtYaww-4fDqO5k1uPx1H19SHw6uq2pO-VCUT0hw_lPemIsxJz_OzzrUxF8H668Y5FCZ0W8Jf0bXuD0JjgcaErKoK9IWz4sdj_3yaL_2q1iR9PoniC7_8JONJUfjsf084Eia_yJ88O4TSkpEcISHlchqQKBPUiB0ialcNO6Epmba-g2B8i-lKqkLlAk34PB6HrLHb6F0ZHLKwwaXLw23UdjloUqVdY-8a90c5d6LRke6WZRyzmLrbSpUImsnPtPeWJu_dxOtZ7pre9kqYP9qmDuAsVlpkFt7Pro-s3nO-Q9m7CROYDsQEP4qiV5OXBP97CFqQzknb8G-3Y-fu5NGmf7z--6b-EtydgSNkDbR_n5zHvLXElEyumLVMwjiBd93Ey8VXuqvTzwm87oZe034cFQnM3aS5dzxLzfi-EpQfbggzgQPXPU8DzdbZQN7zNzxG569tCYN6aKtzIK00cuHei93pxwnMdsI2of_84ku59F0x-5XMg6xglmau0KmGz6fnsft3Gb9obzKHvqsGl39NWX63KreE9QNTYpmydIUJvGtHR1oQj7-cZxHD4i6qlA7SQtU8o-smkGjDShPZ1i9UrkzIMZrGz6OpH3G-9KeT7NxfXr5AP8NoOo0macouud955e15vAxtukrghn56h-gewAlYXeOOR3rhNtuYrTXSRjf48a1EnpB54oiji_qHdzqolAqt8w6Ey7DGmHckN_6p1GghEJpDEDvw2140DlLdvDz6WbVXYPQoPNRuE2c0GuqOVEb_Ttg2on6L2qkOoSVwzSQXnFlsUmTXSsfbF-tjLeuwIOiP5Dvr-t22fQ-X31zcXN68ouUP9GnDdHG_FJon8IqG_xea3o-1ZXkCv1jm7teKUbjn9NO-n2sprECTwPVu4j14aNMEgiBAmx7w63RdWt92L1Gvn23bAO0J27j0Zc7WjsLme9F4fwQAAP__ \ No newline at end of file diff --git a/lib/urlenc/urlenc.go b/lib/urlenc/urlenc.go index a409fbdcd..a7bc18cd4 100644 --- a/lib/urlenc/urlenc.go +++ b/lib/urlenc/urlenc.go @@ -20,15 +20,9 @@ var compressionDict = "->" + func init() { var common []string - for k := range d2graph.StyleKeywords { - common = append(common, k) - } for k := range d2graph.ReservedKeywords { common = append(common, k) } - for k := range d2graph.ReservedKeywordHolders { - common = append(common, k) - } sort.Strings(common) for _, k := range common { compressionDict += k diff --git a/lib/urlenc/urlenc_test.go b/lib/urlenc/urlenc_test.go index c5b9a4866..5b492938f 100644 --- a/lib/urlenc/urlenc_test.go +++ b/lib/urlenc/urlenc_test.go @@ -21,3 +21,168 @@ I just forgot my whole philosophy of life!!!: { assert.String(t, script, decoded) } + +// TestChanges makes it explicit in PRs when encoding changes +// Something we might want to know for playground compatability +func TestChanges(t *testing.T) { + // Choose something with many keywords and varied text + const script = `timeline mixer: "" { + explanation: |md + ## **Timeline mixer** + - Inject ads, who-to-follow, onboarding + - Conversation module + - Cursoring,pagination + - Tweat deduplication + - Served data logging + | +} +People discovery: "People discovery \nservice" +admixer: Ad mixer { + style.fill: "#c1a2f3" +} + +onboarding service: "Onboarding \nservice" +timeline mixer -> People discovery +timeline mixer -> onboarding service +timeline mixer -> admixer +container0: "" { + graphql + comment + tlsapi +} +container0.graphql: GraphQL\nFederated Strato Column { + shape: image + icon: https://upload.wikimedia.org/wikipedia/commons/thumb/1/17/GraphQL_Logo.svg/1200px-GraphQL_Logo.svg.png +} +container0.comment: |md + ## Tweet/user content hydration, visibility filtering +| +container0.tlsapi: TLS-API (being deprecated) +container0.graphql -> timeline mixer +timeline mixer <- container0.tlsapi +twitter fe: "Twitter Frontend " { + icon: https://icons.terrastruct.com/social/013-twitter-1.svg + shape: image +} +twitter fe -> container0.graphql: iPhone web +twitter fe -> container0.tlsapi: HTTP Android +web: Web { + icon: https://icons.terrastruct.com/azure/Web%20Service%20Color/App%20Service%20Domains.svg + shape: image +} + +Iphone: { + icon: 'https://ss7.vzw.com/is/image/VerizonWireless/apple-iphone-12-64gb-purple-53017-mjn13ll-a?$device-lg$' + shape: image +} +Android: { + icon: https://cdn4.iconfinder.com/data/icons/smart-phones-technologies/512/android-phone.png + shape: image +} + +web -> twitter fe +timeline scorer: "Timeline\nScorer" { + style.fill: "#ffdef1" +} +home ranker: Home Ranker + +timeline service: Timeline Service +timeline mixer -> timeline scorer: Thrift RPC +timeline mixer -> home ranker: { + style.stroke-dash: 4 + style.stroke: "#000E3D" +} +timeline mixer -> timeline service +home mixer: Home mixer { + # style.fill: "#c1a2f3" +} +container0.graphql -> home mixer: { + style.stroke-dash: 4 + style.stroke: "#000E3D" +} +home mixer -> timeline scorer +home mixer -> home ranker: { + style.stroke-dash: 4 + style.stroke: "#000E3D" +} +home mixer -> timeline service +manhattan 2: Manhattan +gizmoduck: Gizmoduck +socialgraph: Social graph +tweetypie: Tweety Pie +home mixer -> manhattan 2 +home mixer -> gizmoduck +home mixer -> socialgraph +home mixer -> tweetypie +Iphone -> twitter fe +Android -> twitter fe +prediction service2: Prediction Service { + shape: image + icon: https://cdn-icons-png.flaticon.com/512/6461/6461819.png +} +home scorer: Home Scorer { + style.fill: "#ffdef1" +} +manhattan: Manhattan +memcache: Memcache { + icon: https://d1q6f0aelx0por.cloudfront.net/product-logos/de041504-0ddb-43f6-b89e-fe04403cca8d-memcached.png +} + +fetch: Fetch { + style.multiple: true + shape: step +} + +feature: Feature { + style.multiple: true + shape: step +} +scoring: Scoring { + style.multiple: true + shape: step +} +fetch -> feature +feature -> scoring + +prediction service: Prediction Service { + shape: image + icon: https://cdn-icons-png.flaticon.com/512/6461/6461819.png +} +scoring -> prediction service +fetch -> container2.crmixer + +home scorer -> manhattan: "" + +home scorer -> memcache: "" +home scorer -> prediction service2 +home ranker -> home scorer +home ranker -> container2.crmixer: Candidate Fetch +container2: "" { + style.stroke: "#000E3D" + style.fill: "#ffffff" + crmixer: CrMixer { + style.fill: "#F7F8FE" + } + earlybird: EarlyBird + utag: Utag + space: Space + communities: Communities +} +etc: ...etc + +home scorer -> etc: Feature Hydration + +feature -> manhattan +feature -> memcache +feature -> etc: Candidate sources +` + + encoded, err := Encode(script) + assert.Success(t, err) + assert.Testdata(t, ".txt", []byte(encoded)) + + decoded, err := Decode(encoded) + assert.Success(t, err) + + assert.String(t, script, decoded) +} diff --git a/testdata/d2compiler/TestCompile/array-classes.exp.json b/testdata/d2compiler/TestCompile/array-classes.exp.json index 34b6b536d..55f49e18a 100644 --- a/testdata/d2compiler/TestCompile/array-classes.exp.json +++ b/testdata/d2compiler/TestCompile/array-classes.exp.json @@ -623,9 +623,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -660,9 +658,11 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null, + "classes": [ + "path", + "path2" + ] }, "zIndex": 0 } @@ -736,9 +736,11 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null, + "classes": [ + "dragon_ball", + "path" + ] }, "zIndex": 0 }, @@ -810,9 +812,11 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null, + "classes": [ + "path", + "dragon_ball" + ] }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/basic_icon.exp.json b/testdata/d2compiler/TestCompile/basic_icon.exp.json index 8b16ed57d..c4e7552f6 100644 --- a/testdata/d2compiler/TestCompile/basic_icon.exp.json +++ b/testdata/d2compiler/TestCompile/basic_icon.exp.json @@ -93,9 +93,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -155,9 +153,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/basic_sequence.exp.json b/testdata/d2compiler/TestCompile/basic_sequence.exp.json index 5b6fd830a..f5e4620d6 100644 --- a/testdata/d2compiler/TestCompile/basic_sequence.exp.json +++ b/testdata/d2compiler/TestCompile/basic_sequence.exp.json @@ -88,9 +88,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -137,9 +135,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/basic_shape.exp.json b/testdata/d2compiler/TestCompile/basic_shape.exp.json index 712818c78..ff306f1c4 100644 --- a/testdata/d2compiler/TestCompile/basic_shape.exp.json +++ b/testdata/d2compiler/TestCompile/basic_shape.exp.json @@ -88,9 +88,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -137,9 +135,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/basic_style.exp.json b/testdata/d2compiler/TestCompile/basic_style.exp.json index 6ea3ff1b7..8a855ee99 100644 --- a/testdata/d2compiler/TestCompile/basic_style.exp.json +++ b/testdata/d2compiler/TestCompile/basic_style.exp.json @@ -95,9 +95,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -148,9 +146,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/class-shape-class.exp.json b/testdata/d2compiler/TestCompile/class-shape-class.exp.json index dd3a62ba4..049d4ed34 100644 --- a/testdata/d2compiler/TestCompile/class-shape-class.exp.json +++ b/testdata/d2compiler/TestCompile/class-shape-class.exp.json @@ -212,9 +212,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -271,9 +269,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - }, + "constraint": null, "classes": [ "classClass" ] diff --git a/testdata/d2compiler/TestCompile/class_paren.exp.json b/testdata/d2compiler/TestCompile/class_paren.exp.json index fbf89fc85..c6b641edc 100644 --- a/testdata/d2compiler/TestCompile/class_paren.exp.json +++ b/testdata/d2compiler/TestCompile/class_paren.exp.json @@ -187,9 +187,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -257,9 +255,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/class_style.exp.json b/testdata/d2compiler/TestCompile/class_style.exp.json index a1d7f7116..f139da4f2 100644 --- a/testdata/d2compiler/TestCompile/class_style.exp.json +++ b/testdata/d2compiler/TestCompile/class_style.exp.json @@ -161,9 +161,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -224,9 +222,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/classes.exp.json b/testdata/d2compiler/TestCompile/classes.exp.json index fbc180c96..ac50b12bd 100644 --- a/testdata/d2compiler/TestCompile/classes.exp.json +++ b/testdata/d2compiler/TestCompile/classes.exp.json @@ -649,9 +649,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -686,9 +684,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - }, + "constraint": null, "classes": [ "path" ] @@ -762,9 +758,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - }, + "constraint": null, "classes": [ "dragon_ball" ] @@ -836,9 +830,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - }, + "constraint": null, "classes": [ "dragon_ball" ] @@ -890,9 +882,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - }, + "constraint": null, "classes": [ "dragon_ball" ] diff --git a/testdata/d2compiler/TestCompile/comma-array-class.exp.json b/testdata/d2compiler/TestCompile/comma-array-class.exp.json new file mode 100644 index 000000000..e67c0ec48 --- /dev/null +++ b/testdata/d2compiler/TestCompile/comma-array-class.exp.json @@ -0,0 +1,11 @@ +{ + "graph": null, + "err": { + "errs": [ + { + "range": "d2/testdata/d2compiler/TestCompile/comma-array-class.d2,11:10:157-11:15:162", + "errmsg": "d2/testdata/d2compiler/TestCompile/comma-array-class.d2:12:11: class \"dragon_ball, path\" not found. Did you mean to use \";\" to separate array items?" + } + ] + } +} diff --git a/testdata/d2compiler/TestCompile/constraint_label.exp.json b/testdata/d2compiler/TestCompile/constraint_label.exp.json index 6701223ef..ddc5dcdea 100644 --- a/testdata/d2compiler/TestCompile/constraint_label.exp.json +++ b/testdata/d2compiler/TestCompile/constraint_label.exp.json @@ -121,9 +121,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -170,9 +168,9 @@ "direction": { "value": "" }, - "constraint": { - "value": "BIZ" - } + "constraint": [ + "BIZ" + ] }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/default_direction.exp.json b/testdata/d2compiler/TestCompile/default_direction.exp.json index 32057225f..b412ef6b2 100644 --- a/testdata/d2compiler/TestCompile/default_direction.exp.json +++ b/testdata/d2compiler/TestCompile/default_direction.exp.json @@ -49,9 +49,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -98,9 +96,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/dimension_with_style.exp.json b/testdata/d2compiler/TestCompile/dimension_with_style.exp.json index 27e097fe3..0f9d3dd6b 100644 --- a/testdata/d2compiler/TestCompile/dimension_with_style.exp.json +++ b/testdata/d2compiler/TestCompile/dimension_with_style.exp.json @@ -123,9 +123,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -179,9 +177,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/dimensions_on_containers.exp.json b/testdata/d2compiler/TestCompile/dimensions_on_containers.exp.json index 1ec0f28b8..6072848cd 100644 --- a/testdata/d2compiler/TestCompile/dimensions_on_containers.exp.json +++ b/testdata/d2compiler/TestCompile/dimensions_on_containers.exp.json @@ -957,9 +957,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1006,9 +1004,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1056,9 +1052,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1109,9 +1103,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1162,9 +1154,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1212,9 +1202,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1265,9 +1253,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1318,9 +1304,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1371,9 +1355,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1424,9 +1406,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/dimensions_on_nonimage.exp.json b/testdata/d2compiler/TestCompile/dimensions_on_nonimage.exp.json index 909b07972..2aad6eb2d 100644 --- a/testdata/d2compiler/TestCompile/dimensions_on_nonimage.exp.json +++ b/testdata/d2compiler/TestCompile/dimensions_on_nonimage.exp.json @@ -151,9 +151,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -206,9 +204,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge.exp.json b/testdata/d2compiler/TestCompile/edge.exp.json index dec4dc8ec..04daae90e 100644 --- a/testdata/d2compiler/TestCompile/edge.exp.json +++ b/testdata/d2compiler/TestCompile/edge.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -105,9 +103,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -154,9 +150,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -201,9 +195,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json b/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json index 3e1496a33..573bd41bb 100644 --- a/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json +++ b/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json @@ -251,9 +251,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -278,9 +276,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "dst_arrow": true, "dstArrowhead": { @@ -303,9 +299,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "references": [ { @@ -328,9 +322,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -377,9 +369,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -424,9 +414,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_arrowhead_primary.exp.json b/testdata/d2compiler/TestCompile/edge_arrowhead_primary.exp.json index 50f2f04da..43dbe6934 100644 --- a/testdata/d2compiler/TestCompile/edge_arrowhead_primary.exp.json +++ b/testdata/d2compiler/TestCompile/edge_arrowhead_primary.exp.json @@ -111,9 +111,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -138,9 +136,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "dst_arrow": true, "references": [ @@ -164,9 +160,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -213,9 +207,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -260,9 +252,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_chain.exp.json b/testdata/d2compiler/TestCompile/edge_chain.exp.json index 529cfb405..fc3cb532e 100644 --- a/testdata/d2compiler/TestCompile/edge_chain.exp.json +++ b/testdata/d2compiler/TestCompile/edge_chain.exp.json @@ -119,9 +119,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -152,9 +150,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -184,9 +180,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -233,9 +227,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -300,9 +292,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -347,9 +337,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_chain_map.exp.json b/testdata/d2compiler/TestCompile/edge_chain_map.exp.json index fec443aa2..7b58cb7bd 100644 --- a/testdata/d2compiler/TestCompile/edge_chain_map.exp.json +++ b/testdata/d2compiler/TestCompile/edge_chain_map.exp.json @@ -148,9 +148,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -181,9 +179,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -213,9 +209,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -262,9 +256,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -329,9 +321,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -376,9 +366,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_column_index.exp.json b/testdata/d2compiler/TestCompile/edge_column_index.exp.json index 749938dbd..a1f43e986 100644 --- a/testdata/d2compiler/TestCompile/edge_column_index.exp.json +++ b/testdata/d2compiler/TestCompile/edge_column_index.exp.json @@ -350,9 +350,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -385,9 +383,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -476,7 +472,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -504,7 +500,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "", + "constraint": null, "reference": "" } ] @@ -525,9 +521,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -614,7 +608,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -642,7 +636,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "", + "constraint": null, "reference": "" } ] @@ -663,9 +657,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json b/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json index 445d9bc7b..a2e8b7dc6 100644 --- a/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json +++ b/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json @@ -117,9 +117,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -154,9 +152,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -203,9 +199,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -250,9 +244,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json index a5a83a569..50be77f89 100644 --- a/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json @@ -160,9 +160,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -187,9 +185,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "dst_arrow": true, "references": [ @@ -216,9 +212,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -285,9 +279,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -352,9 +344,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json index b46ef9366..bccfb9129 100644 --- a/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json @@ -128,9 +128,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -155,9 +153,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "dst_arrow": true, "references": [ @@ -181,9 +177,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -230,9 +224,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -277,9 +269,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_index.exp.json b/testdata/d2compiler/TestCompile/edge_index.exp.json index aeb34ecb9..dec38ad77 100644 --- a/testdata/d2compiler/TestCompile/edge_index.exp.json +++ b/testdata/d2compiler/TestCompile/edge_index.exp.json @@ -143,9 +143,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -179,9 +177,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -248,9 +244,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -315,9 +309,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_index_map.exp.json b/testdata/d2compiler/TestCompile/edge_index_map.exp.json index 846ab083a..14c91274e 100644 --- a/testdata/d2compiler/TestCompile/edge_index_map.exp.json +++ b/testdata/d2compiler/TestCompile/edge_index_map.exp.json @@ -162,9 +162,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -198,9 +196,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -267,9 +263,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -334,9 +328,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_index_nested.exp.json b/testdata/d2compiler/TestCompile/edge_index_nested.exp.json index 10df2e0aa..6ebba4d34 100644 --- a/testdata/d2compiler/TestCompile/edge_index_nested.exp.json +++ b/testdata/d2compiler/TestCompile/edge_index_nested.exp.json @@ -172,9 +172,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -208,9 +206,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -257,9 +253,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -324,9 +318,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -391,9 +383,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } 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 b0a71b47e..084167741 100644 --- a/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json +++ b/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json @@ -188,9 +188,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -224,9 +222,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -293,9 +289,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -360,9 +354,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -427,9 +419,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } 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 515aa5f3c..5a9afc37d 100644 --- a/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.exp.json +++ b/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.exp.json @@ -201,9 +201,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -241,9 +239,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -310,9 +306,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -377,9 +371,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -444,9 +436,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } 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 72d765f4c..846333d45 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 @@ -207,9 +207,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -247,9 +245,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -296,9 +292,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -343,9 +337,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -390,9 +382,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } 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 06a967f42..6ac0e489b 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 @@ -220,9 +220,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -260,9 +258,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -309,9 +305,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -356,9 +350,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -403,9 +395,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } 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 dfa717006..b3a8c19ed 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 @@ -238,9 +238,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -278,9 +276,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -327,9 +323,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -374,9 +368,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -421,9 +413,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_label_map.exp.json b/testdata/d2compiler/TestCompile/edge_label_map.exp.json index bf5ec0d2f..04edc0e31 100644 --- a/testdata/d2compiler/TestCompile/edge_label_map.exp.json +++ b/testdata/d2compiler/TestCompile/edge_label_map.exp.json @@ -128,9 +128,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -165,9 +163,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -214,9 +210,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -261,9 +255,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_map.exp.json b/testdata/d2compiler/TestCompile/edge_map.exp.json index 0b2f9fd4d..4e4652c77 100644 --- a/testdata/d2compiler/TestCompile/edge_map.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map.exp.json @@ -111,9 +111,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -144,9 +142,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -193,9 +189,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -240,9 +234,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json index 0c2291704..9874c0c27 100644 --- a/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json @@ -140,9 +140,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -167,9 +165,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "dst_arrow": true, "references": [ @@ -193,9 +189,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -242,9 +236,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -289,9 +281,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json b/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json index 1741fcde2..4821d0012 100644 --- a/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json @@ -156,9 +156,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -196,9 +194,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -265,9 +261,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -332,9 +326,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json b/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json index eab55ec33..1a0f715fa 100644 --- a/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json @@ -174,9 +174,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -214,9 +212,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -283,9 +279,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -350,9 +344,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_map_nested.exp.json b/testdata/d2compiler/TestCompile/edge_map_nested.exp.json index 53e80dbee..ab4523fa7 100644 --- a/testdata/d2compiler/TestCompile/edge_map_nested.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_nested.exp.json @@ -136,9 +136,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -173,9 +171,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -222,9 +218,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -269,9 +263,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json b/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json index 4ca7a689f..6e83a2f2e 100644 --- a/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json @@ -118,9 +118,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -155,9 +153,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -204,9 +200,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -251,9 +245,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json index 46e2807ef..c00936b2d 100644 --- a/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json @@ -228,9 +228,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -255,9 +253,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "dst_arrow": true, "dstArrowhead": { @@ -276,9 +272,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "references": [ { @@ -304,9 +298,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -373,9 +365,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -440,9 +430,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json index 2d0380cbd..6f5721e7c 100644 --- a/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json @@ -122,9 +122,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -149,9 +147,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "dst_arrow": true, "references": [ @@ -175,9 +171,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -224,9 +218,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -271,9 +263,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json index b4d1aadd1..18c537b79 100644 --- a/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json @@ -178,9 +178,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -205,9 +203,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "dst_arrow": true, "references": [ @@ -234,9 +230,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -303,9 +297,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -370,9 +362,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/escaped_id.exp.json b/testdata/d2compiler/TestCompile/escaped_id.exp.json index a5135358f..796618579 100644 --- a/testdata/d2compiler/TestCompile/escaped_id.exp.json +++ b/testdata/d2compiler/TestCompile/escaped_id.exp.json @@ -49,9 +49,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -98,9 +96,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/fill-pattern.exp.json b/testdata/d2compiler/TestCompile/fill-pattern.exp.json index cd107b6dc..fcdeecfc7 100644 --- a/testdata/d2compiler/TestCompile/fill-pattern.exp.json +++ b/testdata/d2compiler/TestCompile/fill-pattern.exp.json @@ -117,9 +117,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -170,9 +168,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/grid.exp.json b/testdata/d2compiler/TestCompile/grid.exp.json index f1e7bbade..2b2c4b674 100644 --- a/testdata/d2compiler/TestCompile/grid.exp.json +++ b/testdata/d2compiler/TestCompile/grid.exp.json @@ -113,9 +113,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -162,9 +160,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - }, + "constraint": null, "gridRows": { "value": "200" }, diff --git a/testdata/d2compiler/TestCompile/grid_nested.exp.json b/testdata/d2compiler/TestCompile/grid_nested.exp.json index 8ddc377d4..c424ef3df 100644 --- a/testdata/d2compiler/TestCompile/grid_nested.exp.json +++ b/testdata/d2compiler/TestCompile/grid_nested.exp.json @@ -349,9 +349,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -398,9 +396,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - }, + "constraint": null, "gridRows": { "value": "200" }, @@ -451,9 +447,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -498,9 +492,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -545,9 +537,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -603,9 +593,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -661,9 +649,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -708,9 +694,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - }, + "constraint": null, "gridRows": { "value": "1" }, @@ -761,9 +745,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -808,9 +790,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/image_style.exp.json b/testdata/d2compiler/TestCompile/image_style.exp.json index 0842c6078..0f22863e9 100644 --- a/testdata/d2compiler/TestCompile/image_style.exp.json +++ b/testdata/d2compiler/TestCompile/image_style.exp.json @@ -170,9 +170,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -236,9 +234,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/keyword-container.exp.json b/testdata/d2compiler/TestCompile/keyword-container.exp.json new file mode 100644 index 000000000..e802be7d9 --- /dev/null +++ b/testdata/d2compiler/TestCompile/keyword-container.exp.json @@ -0,0 +1,11 @@ +{ + "graph": null, + "err": { + "errs": [ + { + "range": "d2/testdata/d2compiler/TestCompile/keyword-container.d2,0:2:2-0:6:6", + "errmsg": "d2/testdata/d2compiler/TestCompile/keyword-container.d2:1:3: \"near\" must be the last part of the key" + } + ] + } +} diff --git a/testdata/d2compiler/TestCompile/link-board-key-nested.exp.json b/testdata/d2compiler/TestCompile/link-board-key-nested.exp.json index 04529700c..a2ea20a5e 100644 --- a/testdata/d2compiler/TestCompile/link-board-key-nested.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-key-nested.exp.json @@ -179,9 +179,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -228,9 +226,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -289,9 +285,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -477,9 +471,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -526,9 +518,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/link-board-mixed.exp.json b/testdata/d2compiler/TestCompile/link-board-mixed.exp.json index b780e2386..15c2b7076 100644 --- a/testdata/d2compiler/TestCompile/link-board-mixed.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-mixed.exp.json @@ -329,9 +329,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -412,9 +410,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -750,9 +746,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -783,9 +777,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -832,9 +824,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -879,9 +869,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -1219,9 +1207,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1348,9 +1334,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/link-board-nested.exp.json b/testdata/d2compiler/TestCompile/link-board-nested.exp.json index 257d2c3bf..4ea2f48a0 100644 --- a/testdata/d2compiler/TestCompile/link-board-nested.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-nested.exp.json @@ -208,9 +208,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -271,9 +269,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -488,9 +484,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -706,9 +700,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -755,9 +747,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/link-board-ok.exp.json b/testdata/d2compiler/TestCompile/link-board-ok.exp.json index f94c17553..d81c69956 100644 --- a/testdata/d2compiler/TestCompile/link-board-ok.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-ok.exp.json @@ -150,9 +150,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -213,9 +211,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -372,9 +368,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -421,9 +415,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/link-board-underscore.exp.json b/testdata/d2compiler/TestCompile/link-board-underscore.exp.json index f84251f05..89bdcb03b 100644 --- a/testdata/d2compiler/TestCompile/link-board-underscore.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-underscore.exp.json @@ -274,9 +274,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -323,9 +321,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -606,9 +602,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -655,9 +649,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -938,9 +930,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1001,9 +991,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1062,9 +1050,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/missing-class.exp.json b/testdata/d2compiler/TestCompile/missing-class.exp.json index 9ba720cd7..1aa7a9673 100644 --- a/testdata/d2compiler/TestCompile/missing-class.exp.json +++ b/testdata/d2compiler/TestCompile/missing-class.exp.json @@ -70,9 +70,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -130,9 +128,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - }, + "constraint": null, "classes": [ "yo" ] diff --git a/testdata/d2compiler/TestCompile/near_constant.exp.json b/testdata/d2compiler/TestCompile/near_constant.exp.json index 9d3e863ea..6139e09c5 100644 --- a/testdata/d2compiler/TestCompile/near_constant.exp.json +++ b/testdata/d2compiler/TestCompile/near_constant.exp.json @@ -70,9 +70,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -145,9 +143,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/nested-array-classes.exp.json b/testdata/d2compiler/TestCompile/nested-array-classes.exp.json new file mode 100644 index 000000000..a897f1678 --- /dev/null +++ b/testdata/d2compiler/TestCompile/nested-array-classes.exp.json @@ -0,0 +1,650 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,0:0:0-11:0:203", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,0:0:0-7:1:111", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,0:0:0-0:7:7", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,0:0:0-0:7:7", + "value": [ + { + "string": "classes", + "raw_string": "classes" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,0:9:9-7:1:111", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,1:2:13-3:3:58", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,1:2:13-1:12:23", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,1:2:13-1:12:23", + "value": [ + { + "string": "one target", + "raw_string": "one target" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,1:14:25-3:3:58", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,2:2:29-2:27:54", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,2:2:29-2:24:51", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,2:2:29-2:18:45", + "value": [ + { + "string": "target-arrowhead", + "raw_string": "target-arrowhead" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,2:19:46-2:24:51", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "number": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,2:26:53-2:27:54", + "raw": "1", + "value": "1" + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,4:1:60-6:2:109", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,4:1:60-4:12:71", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,4:1:60-4:12:71", + "value": [ + { + "string": "association", + "raw_string": "association" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,4:14:73-6:2:109", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,5:2:77-5:31:106", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,5:2:77-5:24:99", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,5:2:77-5:18:93", + "value": [ + { + "string": "target-arrowhead", + "raw_string": "target-arrowhead" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,5:19:94-5:24:99", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,5:26:101-5:31:106", + "value": [ + { + "string": "arrow", + "raw_string": "arrow" + } + ] + } + } + } + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,9:0:113-9:44:157", + "edges": [ + { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,9:0:113-9:6:119", + "src": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,9:0:113-9:1:114", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,9:0:113-9:1:114", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,9:5:118-9:6:119", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,9:5:118-9:6:119", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,9:8:121-9:44:157", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,9:10:123-9:42:155", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,9:10:123-9:15:128", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,9:10:123-9:15:128", + "value": [ + { + "string": "class", + "raw_string": "class" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "array": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,9:17:130-9:41:154", + "nodes": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,9:18:131-9:28:141", + "value": [ + { + "string": "one target", + "raw_string": "one target" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,9:30:143-9:41:154", + "value": [ + { + "string": "association", + "raw_string": "association" + } + ] + } + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,10:0:158-10:44:202", + "edges": [ + { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,10:0:158-10:6:164", + "src": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,10:0:158-10:1:159", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,10:0:158-10:1:159", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,10:5:163-10:6:164", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,10:5:163-10:6:164", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,10:8:166-10:44:202", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,10:10:168-10:42:200", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,10:10:168-10:15:173", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,10:10:168-10:15:173", + "value": [ + { + "string": "class", + "raw_string": "class" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "array": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,10:17:175-10:41:199", + "nodes": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,10:18:176-10:29:187", + "value": [ + { + "string": "association", + "raw_string": "association" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,10:31:189-10:41:199", + "value": [ + { + "string": "one target", + "raw_string": "one target" + } + ] + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": [ + { + "index": 0, + "isCurve": false, + "src_arrow": false, + "dst_arrow": true, + "dstArrowhead": { + "label": { + "value": "1" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "arrow" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "references": [ + { + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null, + "classes": [ + "one target", + "association" + ] + }, + "zIndex": 0 + }, + { + "index": 1, + "isCurve": false, + "src_arrow": false, + "dst_arrow": true, + "dstArrowhead": { + "label": { + "value": "1" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "arrow" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "references": [ + { + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null, + "classes": [ + "association", + "one target" + ] + }, + "zIndex": 0 + } + ], + "objects": [ + { + "id": "a", + "id_val": "a", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,9:0:113-9:1:114", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,9:0:113-9:1:114", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,10:0:158-10:1:159", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,10:0:158-10:1:159", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "a" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "b", + "id_val": "b", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,9:5:118-9:6:119", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,9:5:118-9:6:119", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,10:5:163-10:6:164", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,10:5:163-10:6:164", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "b" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "err": null +} diff --git a/testdata/d2compiler/TestCompile/nested_sql.exp.json b/testdata/d2compiler/TestCompile/nested_sql.exp.json index 08025a178..1781b2ac6 100644 --- a/testdata/d2compiler/TestCompile/nested_sql.exp.json +++ b/testdata/d2compiler/TestCompile/nested_sql.exp.json @@ -183,9 +183,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -232,9 +230,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -290,7 +286,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -318,7 +314,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "", + "constraint": null, "reference": "" } ] @@ -339,9 +335,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/nil_scope_obj_regression.exp.json b/testdata/d2compiler/TestCompile/nil_scope_obj_regression.exp.json index a91e667b7..94c666990 100644 --- a/testdata/d2compiler/TestCompile/nil_scope_obj_regression.exp.json +++ b/testdata/d2compiler/TestCompile/nil_scope_obj_regression.exp.json @@ -112,9 +112,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -192,9 +190,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -239,9 +235,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/no_empty_block_string.exp.json b/testdata/d2compiler/TestCompile/no_empty_block_string.exp.json new file mode 100644 index 000000000..36c36c51e --- /dev/null +++ b/testdata/d2compiler/TestCompile/no_empty_block_string.exp.json @@ -0,0 +1,11 @@ +{ + "graph": null, + "err": { + "errs": [ + { + "range": "d2/testdata/d2compiler/TestCompile/no_empty_block_string.d2,0:0:0-0:11:11", + "errmsg": "d2/testdata/d2compiler/TestCompile/no_empty_block_string.d2:1:1: block string cannot be empty" + } + ] + } +} diff --git a/testdata/d2compiler/TestCompile/no_empty_block_strings.exp.json b/testdata/d2compiler/TestCompile/no_empty_block_strings.exp.json new file mode 100644 index 000000000..be534202f --- /dev/null +++ b/testdata/d2compiler/TestCompile/no_empty_block_strings.exp.json @@ -0,0 +1,12 @@ +{ + "graph": null, + "err": { + "ioerr": null, + "errs": [ + { + "range": "d2/testdata/d2compiler/TestCompile/no_empty_block_strings.d2,0:0:0-0:11:11", + "errmsg": "d2/testdata/d2compiler/TestCompile/no_empty_block_strings.d2:1:1: block string cannot be empty" + } + ] + } +} diff --git a/testdata/d2compiler/TestCompile/no_new_lines_only_block_string.exp.json b/testdata/d2compiler/TestCompile/no_new_lines_only_block_string.exp.json new file mode 100644 index 000000000..3f6be6e7b --- /dev/null +++ b/testdata/d2compiler/TestCompile/no_new_lines_only_block_string.exp.json @@ -0,0 +1,11 @@ +{ + "graph": null, + "err": { + "errs": [ + { + "range": "d2/testdata/d2compiler/TestCompile/no_new_lines_only_block_string.d2,0:0:0-3:1:13", + "errmsg": "d2/testdata/d2compiler/TestCompile/no_new_lines_only_block_string.d2:1:1: block string cannot be empty" + } + ] + } +} diff --git a/testdata/d2compiler/TestCompile/no_white_spaces_only_block_string.exp.json b/testdata/d2compiler/TestCompile/no_white_spaces_only_block_string.exp.json new file mode 100644 index 000000000..45e64ba5c --- /dev/null +++ b/testdata/d2compiler/TestCompile/no_white_spaces_only_block_string.exp.json @@ -0,0 +1,11 @@ +{ + "graph": null, + "err": { + "errs": [ + { + "range": "d2/testdata/d2compiler/TestCompile/no_white_spaces_only_block_string.d2,0:0:0-0:16:16", + "errmsg": "d2/testdata/d2compiler/TestCompile/no_white_spaces_only_block_string.d2:1:1: block string cannot be empty" + } + ] + } +} diff --git a/testdata/d2compiler/TestCompile/null.exp.json b/testdata/d2compiler/TestCompile/null.exp.json index 65705d6c7..9781daf23 100644 --- a/testdata/d2compiler/TestCompile/null.exp.json +++ b/testdata/d2compiler/TestCompile/null.exp.json @@ -49,9 +49,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -98,9 +96,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/path_link.exp.json b/testdata/d2compiler/TestCompile/path_link.exp.json index d89b63e43..af370962e 100644 --- a/testdata/d2compiler/TestCompile/path_link.exp.json +++ b/testdata/d2compiler/TestCompile/path_link.exp.json @@ -88,9 +88,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -140,9 +138,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/positions.exp.json b/testdata/d2compiler/TestCompile/positions.exp.json index 66e311c94..700810882 100644 --- a/testdata/d2compiler/TestCompile/positions.exp.json +++ b/testdata/d2compiler/TestCompile/positions.exp.json @@ -113,9 +113,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -168,9 +166,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/reordered-classes.exp.json b/testdata/d2compiler/TestCompile/reordered-classes.exp.json index 7fa5d529c..07280d1c2 100644 --- a/testdata/d2compiler/TestCompile/reordered-classes.exp.json +++ b/testdata/d2compiler/TestCompile/reordered-classes.exp.json @@ -216,9 +216,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -276,9 +274,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - }, + "constraint": null, "classes": [ "x" ] diff --git a/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json b/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json index 18169d3e7..d037b9da4 100644 --- a/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json +++ b/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json @@ -283,9 +283,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -401,9 +399,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -448,9 +444,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/root_direction.exp.json b/testdata/d2compiler/TestCompile/root_direction.exp.json index 64fce1459..98ba30eda 100644 --- a/testdata/d2compiler/TestCompile/root_direction.exp.json +++ b/testdata/d2compiler/TestCompile/root_direction.exp.json @@ -59,9 +59,7 @@ "direction": { "value": "right" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, diff --git a/testdata/d2compiler/TestCompile/root_sequence.exp.json b/testdata/d2compiler/TestCompile/root_sequence.exp.json index 39d523dd3..353ce9a61 100644 --- a/testdata/d2compiler/TestCompile/root_sequence.exp.json +++ b/testdata/d2compiler/TestCompile/root_sequence.exp.json @@ -59,9 +59,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, diff --git a/testdata/d2compiler/TestCompile/self-referencing.exp.json b/testdata/d2compiler/TestCompile/self-referencing.exp.json index 88f3bf8f3..461633527 100644 --- a/testdata/d2compiler/TestCompile/self-referencing.exp.json +++ b/testdata/d2compiler/TestCompile/self-referencing.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -105,9 +103,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -174,9 +170,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/sequence-timestamp.exp.json b/testdata/d2compiler/TestCompile/sequence-timestamp.exp.json index 5843d3472..4c90eaac0 100644 --- a/testdata/d2compiler/TestCompile/sequence-timestamp.exp.json +++ b/testdata/d2compiler/TestCompile/sequence-timestamp.exp.json @@ -243,9 +243,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -276,9 +274,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -376,9 +372,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -443,9 +437,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -490,9 +482,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -537,9 +527,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -595,9 +583,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/sequence_container.exp.json b/testdata/d2compiler/TestCompile/sequence_container.exp.json index 5538052fd..5dd16ad44 100644 --- a/testdata/d2compiler/TestCompile/sequence_container.exp.json +++ b/testdata/d2compiler/TestCompile/sequence_container.exp.json @@ -268,9 +268,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -301,9 +299,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -333,9 +329,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -446,9 +440,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -557,9 +549,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -668,9 +658,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -779,9 +767,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -890,9 +876,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1001,9 +985,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1048,9 +1030,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/sequence_container_2.exp.json b/testdata/d2compiler/TestCompile/sequence_container_2.exp.json index 716d637aa..503423b6c 100644 --- a/testdata/d2compiler/TestCompile/sequence_container_2.exp.json +++ b/testdata/d2compiler/TestCompile/sequence_container_2.exp.json @@ -246,9 +246,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -279,9 +277,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -392,9 +388,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -503,9 +497,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -614,9 +606,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -661,9 +651,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -730,9 +718,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -799,9 +785,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -868,9 +852,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -915,9 +897,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/sequence_grouped_note.exp.json b/testdata/d2compiler/TestCompile/sequence_grouped_note.exp.json index ce0b6ab62..1958d8227 100644 --- a/testdata/d2compiler/TestCompile/sequence_grouped_note.exp.json +++ b/testdata/d2compiler/TestCompile/sequence_grouped_note.exp.json @@ -168,9 +168,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -217,9 +215,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -295,9 +291,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -342,9 +336,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -400,9 +392,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/sequence_scoping.exp.json b/testdata/d2compiler/TestCompile/sequence_scoping.exp.json index 777ed0693..0870aa4c1 100644 --- a/testdata/d2compiler/TestCompile/sequence_scoping.exp.json +++ b/testdata/d2compiler/TestCompile/sequence_scoping.exp.json @@ -356,9 +356,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -389,9 +387,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -421,9 +417,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -453,9 +447,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -502,9 +494,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -600,9 +590,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -771,9 +759,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -818,9 +804,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -876,9 +860,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1007,9 +989,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1076,9 +1056,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/set_direction.exp.json b/testdata/d2compiler/TestCompile/set_direction.exp.json index 180e8243e..b59d6d0da 100644 --- a/testdata/d2compiler/TestCompile/set_direction.exp.json +++ b/testdata/d2compiler/TestCompile/set_direction.exp.json @@ -88,9 +88,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -137,9 +135,7 @@ "direction": { "value": "left" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/single_dimension_on_circle.exp.json b/testdata/d2compiler/TestCompile/single_dimension_on_circle.exp.json index f2575ae6f..3cf517caa 100644 --- a/testdata/d2compiler/TestCompile/single_dimension_on_circle.exp.json +++ b/testdata/d2compiler/TestCompile/single_dimension_on_circle.exp.json @@ -122,9 +122,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -174,9 +172,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/sql-constraints.exp.json b/testdata/d2compiler/TestCompile/sql-constraints.exp.json new file mode 100644 index 000000000..db24296fa --- /dev/null +++ b/testdata/d2compiler/TestCompile/sql-constraints.exp.json @@ -0,0 +1,372 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,0:0:0-4:1:110", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,0:0:0-4:1:110", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,0:3:3-4:1:110", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,1:2:7-1:18:23", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,1:2:7-1:7:12", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,1:2:7-1:7:12", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,1:9:14-1:18:23", + "value": [ + { + "string": "sql_table", + "raw_string": "sql_table" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,2:2:26-2:34:58", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,2:2:26-2:3:27", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,2:2:26-2:3:27", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "primary": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,2:5:29-2:8:32", + "value": [ + { + "string": "int", + "raw_string": "int" + } + ] + } + }, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,2:9:33-2:34:58", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,2:10:34-2:33:57", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,2:10:34-2:20:44", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,2:10:34-2:20:44", + "value": [ + { + "string": "constraint", + "raw_string": "constraint" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,2:22:46-2:33:57", + "value": [ + { + "string": "primary_key", + "raw_string": "primary_key" + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,3:2:61-3:49:108", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,3:2:61-3:3:62", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,3:2:61-3:3:62", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "primary": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,3:5:64-3:8:67", + "value": [ + { + "string": "int", + "raw_string": "int" + } + ] + } + }, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,3:9:68-3:49:108", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,3:10:69-3:48:107", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,3:10:69-3:20:79", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,3:10:69-3:20:79", + "value": [ + { + "string": "constraint", + "raw_string": "constraint" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "array": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,3:22:81-3:47:106", + "nodes": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,3:23:82-3:34:93", + "value": [ + { + "string": "primary_key", + "raw_string": "primary_key" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,3:36:95-3:47:106", + "value": [ + { + "string": "foreign_key", + "raw_string": "foreign_key" + } + ] + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "x", + "id_val": "x", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "sql_table": { + "columns": [ + { + "name": { + "label": "a", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0 + }, + "type": { + "label": "int", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0 + }, + "constraint": [ + "primary_key" + ], + "reference": "" + }, + { + "name": { + "label": "b", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0 + }, + "type": { + "label": "int", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0 + }, + "constraint": [ + "primary_key", + "foreign_key" + ], + "reference": "" + } + ] + }, + "attributes": { + "label": { + "value": "x" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "sql_table" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "err": null +} diff --git a/testdata/d2compiler/TestCompile/sql-regression.exp.json b/testdata/d2compiler/TestCompile/sql-regression.exp.json index d9dd89b60..64b5d46e5 100644 --- a/testdata/d2compiler/TestCompile/sql-regression.exp.json +++ b/testdata/d2compiler/TestCompile/sql-regression.exp.json @@ -225,9 +225,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -278,9 +276,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -336,7 +332,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "", + "constraint": null, "reference": "" } ] @@ -357,9 +353,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -404,9 +398,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/sql_paren.exp.json b/testdata/d2compiler/TestCompile/sql_paren.exp.json index 577d7bfed..8064ff8ed 100644 --- a/testdata/d2compiler/TestCompile/sql_paren.exp.json +++ b/testdata/d2compiler/TestCompile/sql_paren.exp.json @@ -164,9 +164,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -224,7 +222,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -252,7 +250,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "", + "constraint": null, "reference": "" } ] @@ -273,9 +271,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/stroke-width.exp.json b/testdata/d2compiler/TestCompile/stroke-width.exp.json index 3b1fa2a97..1be890e5d 100644 --- a/testdata/d2compiler/TestCompile/stroke-width.exp.json +++ b/testdata/d2compiler/TestCompile/stroke-width.exp.json @@ -95,9 +95,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -148,9 +146,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/table_connection_attr.exp.json b/testdata/d2compiler/TestCompile/table_connection_attr.exp.json index 4db9cec83..9012bd927 100644 --- a/testdata/d2compiler/TestCompile/table_connection_attr.exp.json +++ b/testdata/d2compiler/TestCompile/table_connection_attr.exp.json @@ -309,9 +309,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -348,9 +346,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -439,7 +435,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "", + "constraint": null, "reference": "" } ] @@ -460,9 +456,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -549,7 +543,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "", + "constraint": null, "reference": "" } ] @@ -570,9 +564,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/table_style.exp.json b/testdata/d2compiler/TestCompile/table_style.exp.json index d2e922559..b68772eff 100644 --- a/testdata/d2compiler/TestCompile/table_style.exp.json +++ b/testdata/d2compiler/TestCompile/table_style.exp.json @@ -161,9 +161,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -221,7 +219,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "", + "constraint": null, "reference": "" } ] @@ -246,9 +244,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/table_style_map.exp.json b/testdata/d2compiler/TestCompile/table_style_map.exp.json index 2ecdfd17b..bd065d54f 100644 --- a/testdata/d2compiler/TestCompile/table_style_map.exp.json +++ b/testdata/d2compiler/TestCompile/table_style_map.exp.json @@ -212,9 +212,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -272,7 +270,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "", + "constraint": null, "reference": "" } ] @@ -300,9 +298,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/text-transform.exp.json b/testdata/d2compiler/TestCompile/text-transform.exp.json index f9bcee35a..6d32e0f75 100644 --- a/testdata/d2compiler/TestCompile/text-transform.exp.json +++ b/testdata/d2compiler/TestCompile/text-transform.exp.json @@ -293,9 +293,7 @@ "direction": { "value": "right" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -330,9 +328,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -425,9 +421,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -518,9 +512,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/underscore_connection.exp.json b/testdata/d2compiler/TestCompile/underscore_connection.exp.json index f0968f581..a1f7d0132 100644 --- a/testdata/d2compiler/TestCompile/underscore_connection.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_connection.exp.json @@ -145,9 +145,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -178,9 +176,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -227,9 +223,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -338,9 +332,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -407,9 +399,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -476,9 +466,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/underscore_edge.exp.json b/testdata/d2compiler/TestCompile/underscore_edge.exp.json index 4ed0d6f9c..3e00fcc33 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge.exp.json @@ -123,9 +123,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -156,9 +154,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -236,9 +232,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -294,9 +288,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json index 1ed795599..ab721e9e3 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json @@ -182,9 +182,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -215,9 +213,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -247,9 +243,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -358,9 +352,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -416,9 +408,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -474,9 +464,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json index 85ededb4c..7b44d6ac8 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json @@ -189,9 +189,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -222,9 +220,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -254,9 +250,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -334,9 +328,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -412,9 +404,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -459,9 +449,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json index d6f36f11a..25aa72494 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json @@ -194,9 +194,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -230,9 +228,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -279,9 +275,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -326,9 +320,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -373,9 +365,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json index 359ed5272..3533194a7 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json @@ -163,9 +163,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -196,9 +194,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -245,9 +241,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -323,9 +317,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -392,9 +384,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/underscore_parent_create.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_create.exp.json index aeb65cc65..1145d7dcb 100644 --- a/testdata/d2compiler/TestCompile/underscore_parent_create.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_parent_create.exp.json @@ -89,9 +89,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -138,9 +136,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -196,9 +192,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/underscore_parent_not_root.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_not_root.exp.json index 1cbd356c6..f2af3ad4d 100644 --- a/testdata/d2compiler/TestCompile/underscore_parent_not_root.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_parent_not_root.exp.json @@ -118,9 +118,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -167,9 +165,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -214,9 +210,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -272,9 +266,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/underscore_parent_preference_1.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_preference_1.exp.json index 90dd4ab3c..8e1ecb3f2 100644 --- a/testdata/d2compiler/TestCompile/underscore_parent_preference_1.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_parent_preference_1.exp.json @@ -132,9 +132,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -181,9 +179,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -259,9 +255,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/underscore_parent_preference_2.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_preference_2.exp.json index 53175bb33..e8850d2a2 100644 --- a/testdata/d2compiler/TestCompile/underscore_parent_preference_2.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_parent_preference_2.exp.json @@ -132,9 +132,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -212,9 +210,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -259,9 +255,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/underscore_parent_squared.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_squared.exp.json index 6d1afa8d0..7d9f8ed7f 100644 --- a/testdata/d2compiler/TestCompile/underscore_parent_squared.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_parent_squared.exp.json @@ -129,9 +129,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -178,9 +176,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -225,9 +221,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -294,9 +288,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/underscore_unresolved_obj.exp.json b/testdata/d2compiler/TestCompile/underscore_unresolved_obj.exp.json index 3707ce018..2caaa6a50 100644 --- a/testdata/d2compiler/TestCompile/underscore_unresolved_obj.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_unresolved_obj.exp.json @@ -89,9 +89,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -138,9 +136,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -196,9 +192,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/unescaped_id_cr.exp.json b/testdata/d2compiler/TestCompile/unescaped_id_cr.exp.json index 7a73c0b08..2b2f1b4f8 100644 --- a/testdata/d2compiler/TestCompile/unescaped_id_cr.exp.json +++ b/testdata/d2compiler/TestCompile/unescaped_id_cr.exp.json @@ -49,9 +49,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -98,9 +96,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/url_link.exp.json b/testdata/d2compiler/TestCompile/url_link.exp.json index d04a550c8..0ee2c0378 100644 --- a/testdata/d2compiler/TestCompile/url_link.exp.json +++ b/testdata/d2compiler/TestCompile/url_link.exp.json @@ -88,9 +88,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -140,9 +138,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } 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 a644e6f8f..4fc6b9851 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 @@ -121,9 +121,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -176,9 +174,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/url_tooltip.exp.json b/testdata/d2compiler/TestCompile/url_tooltip.exp.json index 1ab98932f..5191349ed 100644 --- a/testdata/d2compiler/TestCompile/url_tooltip.exp.json +++ b/testdata/d2compiler/TestCompile/url_tooltip.exp.json @@ -88,9 +88,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -140,9 +138,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/wrong_column_index.exp.json b/testdata/d2compiler/TestCompile/wrong_column_index.exp.json index b934f9b02..555ed3efc 100644 --- a/testdata/d2compiler/TestCompile/wrong_column_index.exp.json +++ b/testdata/d2compiler/TestCompile/wrong_column_index.exp.json @@ -710,9 +710,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -745,9 +743,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -836,7 +832,9 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -864,7 +862,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -892,7 +890,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -920,7 +918,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -948,7 +946,9 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" }, { @@ -976,7 +976,9 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" } ] @@ -997,9 +999,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1086,7 +1086,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -1114,7 +1114,9 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" }, { @@ -1142,7 +1144,9 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "foreign_key", + "constraint": [ + "foreign_key" + ], "reference": "" } ] @@ -1163,9 +1167,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile2/boards/isFolderOnly.exp.json b/testdata/d2compiler/TestCompile2/boards/isFolderOnly.exp.json index 5395e25a1..5ee5d2dc2 100644 --- a/testdata/d2compiler/TestCompile2/boards/isFolderOnly.exp.json +++ b/testdata/d2compiler/TestCompile2/boards/isFolderOnly.exp.json @@ -307,9 +307,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -624,9 +622,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -673,9 +669,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -989,9 +983,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1038,9 +1030,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -1354,9 +1344,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1403,9 +1391,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -1719,9 +1705,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1768,9 +1752,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile2/boards/recursive.exp.json b/testdata/d2compiler/TestCompile2/boards/recursive.exp.json index 23e310c37..a304a8ff1 100644 --- a/testdata/d2compiler/TestCompile2/boards/recursive.exp.json +++ b/testdata/d2compiler/TestCompile2/boards/recursive.exp.json @@ -315,9 +315,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -364,9 +362,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -688,9 +684,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -737,9 +731,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -1061,9 +1053,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1110,9 +1100,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -1434,9 +1422,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1483,9 +1469,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1530,9 +1514,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -1854,9 +1836,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1903,9 +1883,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1950,9 +1928,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1997,9 +1973,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile2/boards/root.exp.json b/testdata/d2compiler/TestCompile2/boards/root.exp.json index 83483ec1d..37ac239ee 100644 --- a/testdata/d2compiler/TestCompile2/boards/root.exp.json +++ b/testdata/d2compiler/TestCompile2/boards/root.exp.json @@ -182,9 +182,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -231,9 +229,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -422,9 +418,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -471,9 +465,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -662,9 +654,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -711,9 +701,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.exp.json b/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.exp.json index e4c36bd76..8c8a6eaec 100644 --- a/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.exp.json +++ b/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.exp.json @@ -214,9 +214,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -247,9 +245,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -296,9 +292,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -343,9 +337,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -566,9 +558,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -606,9 +596,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -675,9 +663,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -742,9 +728,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestCreate/base.exp.json b/testdata/d2oracle/TestCreate/base.exp.json index 00929a93d..f552f394a 100644 --- a/testdata/d2oracle/TestCreate/base.exp.json +++ b/testdata/d2oracle/TestCreate/base.exp.json @@ -49,9 +49,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -98,9 +96,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestCreate/container.exp.json b/testdata/d2oracle/TestCreate/container.exp.json index 6fcb79158..a98e70b9f 100644 --- a/testdata/d2oracle/TestCreate/container.exp.json +++ b/testdata/d2oracle/TestCreate/container.exp.json @@ -78,9 +78,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -127,9 +125,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -174,9 +170,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestCreate/container_edge.exp.json b/testdata/d2oracle/TestCreate/container_edge.exp.json index 6ba6e5e8b..be325688f 100644 --- a/testdata/d2oracle/TestCreate/container_edge.exp.json +++ b/testdata/d2oracle/TestCreate/container_edge.exp.json @@ -101,9 +101,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -134,9 +132,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -183,9 +179,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -230,9 +224,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -277,9 +269,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestCreate/container_edge_label.exp.json b/testdata/d2oracle/TestCreate/container_edge_label.exp.json index 1360833c9..5e2691e80 100644 --- a/testdata/d2oracle/TestCreate/container_edge_label.exp.json +++ b/testdata/d2oracle/TestCreate/container_edge_label.exp.json @@ -111,9 +111,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -144,9 +142,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -193,9 +189,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -240,9 +234,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -287,9 +279,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestCreate/edge.exp.json b/testdata/d2oracle/TestCreate/edge.exp.json index bd65e7873..b9391dd96 100644 --- a/testdata/d2oracle/TestCreate/edge.exp.json +++ b/testdata/d2oracle/TestCreate/edge.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -105,9 +103,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -154,9 +150,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -201,9 +195,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestCreate/edge_nested.exp.json b/testdata/d2oracle/TestCreate/edge_nested.exp.json index 811197336..fd96ef6e9 100644 --- a/testdata/d2oracle/TestCreate/edge_nested.exp.json +++ b/testdata/d2oracle/TestCreate/edge_nested.exp.json @@ -88,9 +88,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -121,9 +119,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -170,9 +166,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -217,9 +211,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -264,9 +256,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestCreate/edge_scope.exp.json b/testdata/d2oracle/TestCreate/edge_scope.exp.json index 5b81a0d30..96a1cef5e 100644 --- a/testdata/d2oracle/TestCreate/edge_scope.exp.json +++ b/testdata/d2oracle/TestCreate/edge_scope.exp.json @@ -101,9 +101,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -134,9 +132,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -183,9 +179,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -230,9 +224,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -277,9 +269,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json b/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json index c2c794681..6d529ec3e 100644 --- a/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json +++ b/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json @@ -101,9 +101,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -134,9 +132,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -183,9 +179,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -230,9 +224,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -277,9 +269,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json b/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json index 72f28cd4b..6aa1e8666 100644 --- a/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json +++ b/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json @@ -112,9 +112,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -145,9 +143,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -205,9 +201,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -263,9 +257,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -310,9 +302,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -357,9 +347,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestCreate/edge_unique.exp.json b/testdata/d2oracle/TestCreate/edge_unique.exp.json index 87e16b21a..2228f62f9 100644 --- a/testdata/d2oracle/TestCreate/edge_unique.exp.json +++ b/testdata/d2oracle/TestCreate/edge_unique.exp.json @@ -258,9 +258,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -291,9 +289,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -323,9 +319,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -355,9 +349,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -387,9 +379,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -436,9 +426,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -483,9 +471,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -570,9 +556,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -657,9 +641,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -744,9 +726,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestCreate/gen_key.exp.json b/testdata/d2oracle/TestCreate/gen_key.exp.json index 13f651219..6d3333c4f 100644 --- a/testdata/d2oracle/TestCreate/gen_key.exp.json +++ b/testdata/d2oracle/TestCreate/gen_key.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -121,9 +119,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -168,9 +164,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestCreate/gen_key_n.exp.json b/testdata/d2oracle/TestCreate/gen_key_n.exp.json index 25e951a1e..d35ac1de8 100644 --- a/testdata/d2oracle/TestCreate/gen_key_n.exp.json +++ b/testdata/d2oracle/TestCreate/gen_key_n.exp.json @@ -330,9 +330,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -401,9 +399,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -470,9 +466,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -539,9 +533,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -586,9 +578,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -633,9 +623,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -680,9 +668,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -727,9 +713,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -774,9 +758,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -821,9 +803,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -868,9 +848,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -915,9 +893,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -962,9 +938,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1009,9 +983,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1056,9 +1028,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestCreate/gen_key_nested.exp.json b/testdata/d2oracle/TestCreate/gen_key_nested.exp.json index 64facd4a0..8e43202e6 100644 --- a/testdata/d2oracle/TestCreate/gen_key_nested.exp.json +++ b/testdata/d2oracle/TestCreate/gen_key_nested.exp.json @@ -138,9 +138,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -273,9 +271,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -406,9 +402,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -539,9 +533,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -619,9 +611,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -699,9 +689,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestCreate/gen_key_scope.exp.json b/testdata/d2oracle/TestCreate/gen_key_scope.exp.json index c667d493c..0bcfa43e5 100644 --- a/testdata/d2oracle/TestCreate/gen_key_scope.exp.json +++ b/testdata/d2oracle/TestCreate/gen_key_scope.exp.json @@ -123,9 +123,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -194,9 +192,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -263,9 +259,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -332,9 +326,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -379,9 +371,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -426,9 +416,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestCreate/gen_key_suffix.exp.json b/testdata/d2oracle/TestCreate/gen_key_suffix.exp.json index fb3bda2ab..2cc74b8aa 100644 --- a/testdata/d2oracle/TestCreate/gen_key_suffix.exp.json +++ b/testdata/d2oracle/TestCreate/gen_key_suffix.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -121,9 +119,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -168,9 +164,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestCreate/make_scope_multiline.exp.json b/testdata/d2oracle/TestCreate/make_scope_multiline.exp.json index acfc69b53..3b2eb0b98 100644 --- a/testdata/d2oracle/TestCreate/make_scope_multiline.exp.json +++ b/testdata/d2oracle/TestCreate/make_scope_multiline.exp.json @@ -111,9 +111,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -160,9 +158,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -207,9 +203,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } 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 c3d9ae2a0..c5e68d3cb 100644 --- a/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.exp.json +++ b/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.exp.json @@ -157,9 +157,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -206,9 +204,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -253,9 +249,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -300,9 +294,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -347,9 +339,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } 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 c8e067f34..b5616c220 100644 --- a/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.exp.json +++ b/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.exp.json @@ -157,9 +157,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -206,9 +204,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -253,9 +249,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -300,9 +294,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -347,9 +339,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestCreate/nested.exp.json b/testdata/d2oracle/TestCreate/nested.exp.json index 24fc23908..aa857c317 100644 --- a/testdata/d2oracle/TestCreate/nested.exp.json +++ b/testdata/d2oracle/TestCreate/nested.exp.json @@ -71,9 +71,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -142,9 +140,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -211,9 +207,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -280,9 +274,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestCreate/scope.exp.json b/testdata/d2oracle/TestCreate/scope.exp.json index f9b49e6ca..54f4d8c6a 100644 --- a/testdata/d2oracle/TestCreate/scope.exp.json +++ b/testdata/d2oracle/TestCreate/scope.exp.json @@ -100,9 +100,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -171,9 +169,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -240,9 +236,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -309,9 +303,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -356,9 +348,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/arrowhead.exp.json b/testdata/d2oracle/TestDelete/arrowhead.exp.json index 55ca77da0..6e89878ef 100644 --- a/testdata/d2oracle/TestDelete/arrowhead.exp.json +++ b/testdata/d2oracle/TestDelete/arrowhead.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -105,9 +103,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -154,9 +150,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -201,9 +195,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/arrowhead_label.exp.json b/testdata/d2oracle/TestDelete/arrowhead_label.exp.json index d9d278041..0ca9c574f 100644 --- a/testdata/d2oracle/TestDelete/arrowhead_label.exp.json +++ b/testdata/d2oracle/TestDelete/arrowhead_label.exp.json @@ -122,9 +122,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -150,9 +148,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "references": [ { @@ -175,9 +171,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -224,9 +218,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -271,9 +263,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/arrowhead_map.exp.json b/testdata/d2oracle/TestDelete/arrowhead_map.exp.json index 22c22b4e1..e6ff5d752 100644 --- a/testdata/d2oracle/TestDelete/arrowhead_map.exp.json +++ b/testdata/d2oracle/TestDelete/arrowhead_map.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -105,9 +103,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -154,9 +150,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -201,9 +195,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/arrowhead_shape.exp.json b/testdata/d2oracle/TestDelete/arrowhead_shape.exp.json index 6b3c4f832..28694a0da 100644 --- a/testdata/d2oracle/TestDelete/arrowhead_shape.exp.json +++ b/testdata/d2oracle/TestDelete/arrowhead_shape.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -105,9 +103,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -154,9 +150,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -201,9 +195,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/breakup_arrowhead.exp.json b/testdata/d2oracle/TestDelete/breakup_arrowhead.exp.json index 81f128ca2..59968f1d6 100644 --- a/testdata/d2oracle/TestDelete/breakup_arrowhead.exp.json +++ b/testdata/d2oracle/TestDelete/breakup_arrowhead.exp.json @@ -49,9 +49,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -98,9 +96,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/chaos_1.exp.json b/testdata/d2oracle/TestDelete/chaos_1.exp.json index 55d9bf07f..dc0352817 100644 --- a/testdata/d2oracle/TestDelete/chaos_1.exp.json +++ b/testdata/d2oracle/TestDelete/chaos_1.exp.json @@ -263,9 +263,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -290,9 +288,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "dst_arrow": true, "references": [ @@ -316,9 +312,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -425,9 +419,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -472,9 +464,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -519,9 +509,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/children.exp.json b/testdata/d2oracle/TestDelete/children.exp.json index 1c006a1ac..a0fdc1628 100644 --- a/testdata/d2oracle/TestDelete/children.exp.json +++ b/testdata/d2oracle/TestDelete/children.exp.json @@ -95,9 +95,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -128,9 +126,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -177,9 +173,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -224,9 +218,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -271,9 +263,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/children_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_conflicts.exp.json index b98430de1..bfed5014b 100644 --- a/testdata/d2oracle/TestDelete/children_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_conflicts.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -121,9 +119,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -168,9 +164,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json index c761202f4..7759732a2 100644 --- a/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json @@ -128,9 +128,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -161,9 +159,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -230,9 +226,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -277,9 +271,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -324,9 +316,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json index 13ca0d7c8..a11ffdd2c 100644 --- a/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json @@ -221,9 +221,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -254,9 +252,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -286,9 +282,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -355,9 +349,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -422,9 +414,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -489,9 +479,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -536,9 +524,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -583,9 +569,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/children_flat_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_flat_conflicts.exp.json index 3cfa85bc2..fe212f64a 100644 --- a/testdata/d2oracle/TestDelete/children_flat_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_flat_conflicts.exp.json @@ -105,9 +105,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -174,9 +172,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -221,9 +217,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json index e71f7802c..c1cf6e922 100644 --- a/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json @@ -197,9 +197,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -230,9 +228,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -319,9 +315,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -386,9 +380,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -433,9 +425,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -480,9 +470,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/children_nested_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_nested_conflicts.exp.json index 1c62b38fe..c8465ce86 100644 --- a/testdata/d2oracle/TestDelete/children_nested_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_nested_conflicts.exp.json @@ -101,9 +101,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -150,9 +148,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -197,9 +193,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -244,9 +238,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/children_nested_referenced_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_nested_referenced_conflicts.exp.json index 6c0c07b4d..489e99551 100644 --- a/testdata/d2oracle/TestDelete/children_nested_referenced_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_nested_referenced_conflicts.exp.json @@ -160,9 +160,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -271,9 +269,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -360,9 +356,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -407,9 +401,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/children_no_self_conflict.exp.json b/testdata/d2oracle/TestDelete/children_no_self_conflict.exp.json index d2734da1d..656125a78 100644 --- a/testdata/d2oracle/TestDelete/children_no_self_conflict.exp.json +++ b/testdata/d2oracle/TestDelete/children_no_self_conflict.exp.json @@ -49,9 +49,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -98,9 +96,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/children_order.exp.json b/testdata/d2oracle/TestDelete/children_order.exp.json index 17f67d0e6..a85079f82 100644 --- a/testdata/d2oracle/TestDelete/children_order.exp.json +++ b/testdata/d2oracle/TestDelete/children_order.exp.json @@ -124,9 +124,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -173,9 +171,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -220,9 +216,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -267,9 +261,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -314,9 +306,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/children_referenced_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_referenced_conflicts.exp.json index f9acfe369..25088c478 100644 --- a/testdata/d2oracle/TestDelete/children_referenced_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_referenced_conflicts.exp.json @@ -105,9 +105,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -174,9 +172,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -221,9 +217,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/children_scope.exp.json b/testdata/d2oracle/TestDelete/children_scope.exp.json index 4062ac2b2..13e8a86d1 100644 --- a/testdata/d2oracle/TestDelete/children_scope.exp.json +++ b/testdata/d2oracle/TestDelete/children_scope.exp.json @@ -135,9 +135,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -168,9 +166,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -228,9 +224,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -286,9 +280,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -333,9 +325,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -380,9 +370,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -427,9 +415,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/class_refs.exp.json b/testdata/d2oracle/TestDelete/class_refs.exp.json index 7196b7cab..965ae6c65 100644 --- a/testdata/d2oracle/TestDelete/class_refs.exp.json +++ b/testdata/d2oracle/TestDelete/class_refs.exp.json @@ -25,9 +25,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, diff --git a/testdata/d2oracle/TestDelete/conflicts_generated.exp.json b/testdata/d2oracle/TestDelete/conflicts_generated.exp.json index c88ea51b6..031c8c0ee 100644 --- a/testdata/d2oracle/TestDelete/conflicts_generated.exp.json +++ b/testdata/d2oracle/TestDelete/conflicts_generated.exp.json @@ -124,9 +124,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -173,9 +171,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -220,9 +216,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -267,9 +261,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -314,9 +306,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/conflicts_generated_3.exp.json b/testdata/d2oracle/TestDelete/conflicts_generated_3.exp.json index cdb048501..5bfcfeee6 100644 --- a/testdata/d2oracle/TestDelete/conflicts_generated_3.exp.json +++ b/testdata/d2oracle/TestDelete/conflicts_generated_3.exp.json @@ -118,9 +118,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -167,9 +165,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -214,9 +210,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -261,9 +255,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -308,9 +300,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/conflicts_generated_continued.exp.json b/testdata/d2oracle/TestDelete/conflicts_generated_continued.exp.json index c11ac7776..b6b34b741 100644 --- a/testdata/d2oracle/TestDelete/conflicts_generated_continued.exp.json +++ b/testdata/d2oracle/TestDelete/conflicts_generated_continued.exp.json @@ -95,9 +95,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -144,9 +142,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -191,9 +187,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -238,9 +232,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/container_near.exp.json b/testdata/d2oracle/TestDelete/container_near.exp.json index bb83aea5c..5044d5f4b 100644 --- a/testdata/d2oracle/TestDelete/container_near.exp.json +++ b/testdata/d2oracle/TestDelete/container_near.exp.json @@ -173,9 +173,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -237,9 +235,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -284,9 +280,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -346,9 +340,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/delete_container_of_near.exp.json b/testdata/d2oracle/TestDelete/delete_container_of_near.exp.json index fcf34e63f..4c52363d8 100644 --- a/testdata/d2oracle/TestDelete/delete_container_of_near.exp.json +++ b/testdata/d2oracle/TestDelete/delete_container_of_near.exp.json @@ -481,9 +481,7 @@ "direction": { "value": "down" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -514,9 +512,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -546,9 +542,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -578,9 +572,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -610,9 +602,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -642,9 +632,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -674,9 +662,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -706,9 +692,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -738,9 +722,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -770,9 +752,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -819,9 +799,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -866,9 +844,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -913,9 +889,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -960,9 +934,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1027,9 +999,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1094,9 +1064,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1181,9 +1149,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1294,9 +1260,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1361,9 +1325,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1428,9 +1390,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1475,9 +1435,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/delete_icon.exp.json b/testdata/d2oracle/TestDelete/delete_icon.exp.json index 0fb34062b..09b4bbab9 100644 --- a/testdata/d2oracle/TestDelete/delete_icon.exp.json +++ b/testdata/d2oracle/TestDelete/delete_icon.exp.json @@ -99,9 +99,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -159,9 +157,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -220,9 +216,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/delete_link.exp.json b/testdata/d2oracle/TestDelete/delete_link.exp.json index 8971321a5..b90432335 100644 --- a/testdata/d2oracle/TestDelete/delete_link.exp.json +++ b/testdata/d2oracle/TestDelete/delete_link.exp.json @@ -49,9 +49,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -98,9 +96,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/delete_near.exp.json b/testdata/d2oracle/TestDelete/delete_near.exp.json index 2a1816a00..123053d74 100644 --- a/testdata/d2oracle/TestDelete/delete_near.exp.json +++ b/testdata/d2oracle/TestDelete/delete_near.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -121,9 +119,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -168,9 +164,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/delete_needed_flat_near.exp.json b/testdata/d2oracle/TestDelete/delete_needed_flat_near.exp.json index 3358a6682..1572242cc 100644 --- a/testdata/d2oracle/TestDelete/delete_needed_flat_near.exp.json +++ b/testdata/d2oracle/TestDelete/delete_needed_flat_near.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -121,9 +119,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -168,9 +164,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/delete_redundant_flat_near.exp.json b/testdata/d2oracle/TestDelete/delete_redundant_flat_near.exp.json index 35cb1e9ee..dc12090dc 100644 --- a/testdata/d2oracle/TestDelete/delete_redundant_flat_near.exp.json +++ b/testdata/d2oracle/TestDelete/delete_redundant_flat_near.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -121,9 +119,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -168,9 +164,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/delete_tooltip.exp.json b/testdata/d2oracle/TestDelete/delete_tooltip.exp.json index e69deea55..374052ed6 100644 --- a/testdata/d2oracle/TestDelete/delete_tooltip.exp.json +++ b/testdata/d2oracle/TestDelete/delete_tooltip.exp.json @@ -49,9 +49,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -98,9 +96,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/drop_value.exp.json b/testdata/d2oracle/TestDelete/drop_value.exp.json index e433d441d..ffa928761 100644 --- a/testdata/d2oracle/TestDelete/drop_value.exp.json +++ b/testdata/d2oracle/TestDelete/drop_value.exp.json @@ -60,9 +60,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -120,9 +118,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -178,9 +174,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/drop_value_with_primary.exp.json b/testdata/d2oracle/TestDelete/drop_value_with_primary.exp.json index 95bfecfae..b77b63a71 100644 --- a/testdata/d2oracle/TestDelete/drop_value_with_primary.exp.json +++ b/testdata/d2oracle/TestDelete/drop_value_with_primary.exp.json @@ -49,9 +49,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -98,9 +96,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/duplicate_generated.exp.json b/testdata/d2oracle/TestDelete/duplicate_generated.exp.json index 795869ebc..c157119f0 100644 --- a/testdata/d2oracle/TestDelete/duplicate_generated.exp.json +++ b/testdata/d2oracle/TestDelete/duplicate_generated.exp.json @@ -164,9 +164,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -213,9 +211,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -260,9 +256,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -307,9 +301,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -354,9 +346,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -401,9 +391,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -448,9 +436,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/edge-only-style.exp.json b/testdata/d2oracle/TestDelete/edge-only-style.exp.json index 3ed8aed31..baec4d804 100644 --- a/testdata/d2oracle/TestDelete/edge-only-style.exp.json +++ b/testdata/d2oracle/TestDelete/edge-only-style.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -105,9 +103,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -154,9 +150,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -201,9 +195,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json b/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json index a93ec9cbe..1d8b8d2ea 100644 --- a/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json +++ b/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json @@ -105,9 +105,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -138,9 +136,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -240,9 +236,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -309,9 +303,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -378,9 +370,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -436,9 +426,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/edge_common.exp.json b/testdata/d2oracle/TestDelete/edge_common.exp.json index 09f4f71c8..5f4719f31 100644 --- a/testdata/d2oracle/TestDelete/edge_common.exp.json +++ b/testdata/d2oracle/TestDelete/edge_common.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -105,9 +103,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -154,9 +150,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -201,9 +195,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/edge_common_2.exp.json b/testdata/d2oracle/TestDelete/edge_common_2.exp.json index b59e40e5b..1994e23e7 100644 --- a/testdata/d2oracle/TestDelete/edge_common_2.exp.json +++ b/testdata/d2oracle/TestDelete/edge_common_2.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -105,9 +103,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -154,9 +150,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -201,9 +195,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/edge_common_3.exp.json b/testdata/d2oracle/TestDelete/edge_common_3.exp.json index 24b5ee815..038ad6051 100644 --- a/testdata/d2oracle/TestDelete/edge_common_3.exp.json +++ b/testdata/d2oracle/TestDelete/edge_common_3.exp.json @@ -94,9 +94,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -185,9 +183,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -243,9 +239,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -301,9 +295,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/edge_common_4.exp.json b/testdata/d2oracle/TestDelete/edge_common_4.exp.json index f6af89f48..22dc9057c 100644 --- a/testdata/d2oracle/TestDelete/edge_common_4.exp.json +++ b/testdata/d2oracle/TestDelete/edge_common_4.exp.json @@ -94,9 +94,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -185,9 +183,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -243,9 +239,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -301,9 +295,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/edge_conflict.exp.json b/testdata/d2oracle/TestDelete/edge_conflict.exp.json index 7a57da3ae..40c43ece4 100644 --- a/testdata/d2oracle/TestDelete/edge_conflict.exp.json +++ b/testdata/d2oracle/TestDelete/edge_conflict.exp.json @@ -117,9 +117,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -150,9 +148,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -241,9 +237,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -299,9 +293,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -357,9 +349,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -404,9 +394,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/edge_decrement.exp.json b/testdata/d2oracle/TestDelete/edge_decrement.exp.json index 0244a8b63..13a576bb8 100644 --- a/testdata/d2oracle/TestDelete/edge_decrement.exp.json +++ b/testdata/d2oracle/TestDelete/edge_decrement.exp.json @@ -454,9 +454,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -490,9 +488,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -525,9 +521,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -560,9 +554,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -595,9 +587,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -784,9 +774,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -971,9 +959,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/edge_first.exp.json b/testdata/d2oracle/TestDelete/edge_first.exp.json index 472b97710..b92c2fb3a 100644 --- a/testdata/d2oracle/TestDelete/edge_first.exp.json +++ b/testdata/d2oracle/TestDelete/edge_first.exp.json @@ -183,9 +183,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -216,9 +214,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -248,9 +244,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -319,9 +313,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -388,9 +380,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -457,9 +447,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -504,9 +492,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -551,9 +537,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -618,9 +602,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -665,9 +647,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/edge_flat_style.exp.json b/testdata/d2oracle/TestDelete/edge_flat_style.exp.json index ef273a614..9a91e3f76 100644 --- a/testdata/d2oracle/TestDelete/edge_flat_style.exp.json +++ b/testdata/d2oracle/TestDelete/edge_flat_style.exp.json @@ -49,9 +49,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -98,9 +96,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/edge_identical_child.exp.json b/testdata/d2oracle/TestDelete/edge_identical_child.exp.json index 05ab2e21b..8803c583a 100644 --- a/testdata/d2oracle/TestDelete/edge_identical_child.exp.json +++ b/testdata/d2oracle/TestDelete/edge_identical_child.exp.json @@ -105,9 +105,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -138,9 +136,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -209,9 +205,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -278,9 +272,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -347,9 +339,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -405,9 +395,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -463,9 +451,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/edge_key_style.exp.json b/testdata/d2oracle/TestDelete/edge_key_style.exp.json index 3d0d0f277..92084a164 100644 --- a/testdata/d2oracle/TestDelete/edge_key_style.exp.json +++ b/testdata/d2oracle/TestDelete/edge_key_style.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -105,9 +103,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -154,9 +150,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -201,9 +195,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/edge_last.exp.json b/testdata/d2oracle/TestDelete/edge_last.exp.json index a52719df3..1d565e6c8 100644 --- a/testdata/d2oracle/TestDelete/edge_last.exp.json +++ b/testdata/d2oracle/TestDelete/edge_last.exp.json @@ -220,9 +220,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -253,9 +251,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -285,9 +281,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -317,9 +311,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -388,9 +380,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -457,9 +447,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -526,9 +514,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -573,9 +559,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -640,9 +624,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -707,9 +689,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -754,9 +734,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -801,9 +779,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/edge_map_style.exp.json b/testdata/d2oracle/TestDelete/edge_map_style.exp.json index 777eb0db8..4e09f2ba8 100644 --- a/testdata/d2oracle/TestDelete/edge_map_style.exp.json +++ b/testdata/d2oracle/TestDelete/edge_map_style.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -105,9 +103,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -154,9 +150,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -201,9 +195,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/edge_middle.exp.json b/testdata/d2oracle/TestDelete/edge_middle.exp.json index 13c909fc9..28c0fcd11 100644 --- a/testdata/d2oracle/TestDelete/edge_middle.exp.json +++ b/testdata/d2oracle/TestDelete/edge_middle.exp.json @@ -206,9 +206,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -239,9 +237,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -271,9 +267,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -303,9 +297,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -374,9 +366,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -443,9 +433,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -512,9 +500,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -559,9 +545,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -626,9 +610,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -673,9 +655,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -720,9 +700,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -767,9 +745,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/empty_map.exp.json b/testdata/d2oracle/TestDelete/empty_map.exp.json index 7c8fe8d35..3d7092713 100644 --- a/testdata/d2oracle/TestDelete/empty_map.exp.json +++ b/testdata/d2oracle/TestDelete/empty_map.exp.json @@ -78,9 +78,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -127,9 +125,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -174,9 +170,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/flat.exp.json b/testdata/d2oracle/TestDelete/flat.exp.json index 60ff925c4..f40d4a886 100644 --- a/testdata/d2oracle/TestDelete/flat.exp.json +++ b/testdata/d2oracle/TestDelete/flat.exp.json @@ -25,9 +25,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, diff --git a/testdata/d2oracle/TestDelete/flat_reserved.exp.json b/testdata/d2oracle/TestDelete/flat_reserved.exp.json index 294f462a7..184a6220e 100644 --- a/testdata/d2oracle/TestDelete/flat_reserved.exp.json +++ b/testdata/d2oracle/TestDelete/flat_reserved.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -105,9 +103,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -154,9 +150,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -201,9 +195,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/hoist_children.exp.json b/testdata/d2oracle/TestDelete/hoist_children.exp.json index 128188fca..2e9eb254e 100644 --- a/testdata/d2oracle/TestDelete/hoist_children.exp.json +++ b/testdata/d2oracle/TestDelete/hoist_children.exp.json @@ -78,9 +78,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -127,9 +125,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -174,9 +170,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json b/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json index 790c640a3..5131fc958 100644 --- a/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json +++ b/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json @@ -95,9 +95,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -128,9 +126,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -177,9 +173,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -224,9 +218,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -271,9 +263,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/key_with_edges.exp.json b/testdata/d2oracle/TestDelete/key_with_edges.exp.json index bb035803a..b627b4c4c 100644 --- a/testdata/d2oracle/TestDelete/key_with_edges.exp.json +++ b/testdata/d2oracle/TestDelete/key_with_edges.exp.json @@ -94,9 +94,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -185,9 +183,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -243,9 +239,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -301,9 +295,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/key_with_edges_2.exp.json b/testdata/d2oracle/TestDelete/key_with_edges_2.exp.json index ae47c4e08..3d1f7b584 100644 --- a/testdata/d2oracle/TestDelete/key_with_edges_2.exp.json +++ b/testdata/d2oracle/TestDelete/key_with_edges_2.exp.json @@ -60,9 +60,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -120,9 +118,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -178,9 +174,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/key_with_edges_3.exp.json b/testdata/d2oracle/TestDelete/key_with_edges_3.exp.json index 6a9419684..1506c5f02 100644 --- a/testdata/d2oracle/TestDelete/key_with_edges_3.exp.json +++ b/testdata/d2oracle/TestDelete/key_with_edges_3.exp.json @@ -60,9 +60,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -120,9 +118,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -178,9 +174,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/key_with_edges_4.exp.json b/testdata/d2oracle/TestDelete/key_with_edges_4.exp.json index 98077ceb8..605af29ab 100644 --- a/testdata/d2oracle/TestDelete/key_with_edges_4.exp.json +++ b/testdata/d2oracle/TestDelete/key_with_edges_4.exp.json @@ -94,9 +94,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -185,9 +183,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -243,9 +239,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -301,9 +295,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/left.exp.json b/testdata/d2oracle/TestDelete/left.exp.json index beb1a5894..ecb9c0394 100644 --- a/testdata/d2oracle/TestDelete/left.exp.json +++ b/testdata/d2oracle/TestDelete/left.exp.json @@ -49,9 +49,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -98,9 +96,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/multi_near.exp.json b/testdata/d2oracle/TestDelete/multi_near.exp.json index b77c544d6..f6c3e68b1 100644 --- a/testdata/d2oracle/TestDelete/multi_near.exp.json +++ b/testdata/d2oracle/TestDelete/multi_near.exp.json @@ -196,9 +196,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -245,9 +243,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -307,9 +303,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -369,9 +363,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -416,9 +408,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/multi_path_map_conflict.exp.json b/testdata/d2oracle/TestDelete/multi_path_map_conflict.exp.json index 96780bc6e..88f938d40 100644 --- a/testdata/d2oracle/TestDelete/multi_path_map_conflict.exp.json +++ b/testdata/d2oracle/TestDelete/multi_path_map_conflict.exp.json @@ -130,9 +130,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -199,9 +197,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -246,9 +242,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -293,9 +287,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } 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 ef4537b12..2e67684d4 100644 --- a/testdata/d2oracle/TestDelete/multi_path_map_no_conflict.exp.json +++ b/testdata/d2oracle/TestDelete/multi_path_map_no_conflict.exp.json @@ -101,9 +101,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -150,9 +148,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -197,9 +193,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -244,9 +238,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/multiple_flat_middle_container.exp.json b/testdata/d2oracle/TestDelete/multiple_flat_middle_container.exp.json index 232329175..a50fae2dd 100644 --- a/testdata/d2oracle/TestDelete/multiple_flat_middle_container.exp.json +++ b/testdata/d2oracle/TestDelete/multiple_flat_middle_container.exp.json @@ -94,9 +94,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -185,9 +183,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -243,9 +239,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -301,9 +295,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/multiple_flat_style.exp.json b/testdata/d2oracle/TestDelete/multiple_flat_style.exp.json index dfe56bd26..daca2a820 100644 --- a/testdata/d2oracle/TestDelete/multiple_flat_style.exp.json +++ b/testdata/d2oracle/TestDelete/multiple_flat_style.exp.json @@ -77,9 +77,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -152,9 +150,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/multiple_map_styles.exp.json b/testdata/d2oracle/TestDelete/multiple_map_styles.exp.json index d8e3849b3..01edf7efc 100644 --- a/testdata/d2oracle/TestDelete/multiple_map_styles.exp.json +++ b/testdata/d2oracle/TestDelete/multiple_map_styles.exp.json @@ -113,9 +113,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -166,9 +164,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/near.exp.json b/testdata/d2oracle/TestDelete/near.exp.json index 66eadc967..0ce229964 100644 --- a/testdata/d2oracle/TestDelete/near.exp.json +++ b/testdata/d2oracle/TestDelete/near.exp.json @@ -49,9 +49,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -98,9 +96,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/nested.exp.json b/testdata/d2oracle/TestDelete/nested.exp.json index 0b8366219..462b1f7c6 100644 --- a/testdata/d2oracle/TestDelete/nested.exp.json +++ b/testdata/d2oracle/TestDelete/nested.exp.json @@ -71,9 +71,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -142,9 +140,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -211,9 +207,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -280,9 +274,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/nested_2.exp.json b/testdata/d2oracle/TestDelete/nested_2.exp.json index 79da6066b..d473f7e02 100644 --- a/testdata/d2oracle/TestDelete/nested_2.exp.json +++ b/testdata/d2oracle/TestDelete/nested_2.exp.json @@ -71,9 +71,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -142,9 +140,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -211,9 +207,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -280,9 +274,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json b/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json index 062e981ea..084c5aba9 100644 --- a/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json +++ b/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json @@ -101,9 +101,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -134,9 +132,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -183,9 +179,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -230,9 +224,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -277,9 +269,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/nested_flat_style.exp.json b/testdata/d2oracle/TestDelete/nested_flat_style.exp.json index 48543dc61..6536e0ab9 100644 --- a/testdata/d2oracle/TestDelete/nested_flat_style.exp.json +++ b/testdata/d2oracle/TestDelete/nested_flat_style.exp.json @@ -49,9 +49,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -98,9 +96,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/nested_reserved.exp.json b/testdata/d2oracle/TestDelete/nested_reserved.exp.json index bd59d8373..38b307002 100644 --- a/testdata/d2oracle/TestDelete/nested_reserved.exp.json +++ b/testdata/d2oracle/TestDelete/nested_reserved.exp.json @@ -105,9 +105,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -207,9 +205,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -307,9 +303,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -376,9 +370,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/nested_underscore_update.exp.json b/testdata/d2oracle/TestDelete/nested_underscore_update.exp.json index d8dbc5afb..73b193b3f 100644 --- a/testdata/d2oracle/TestDelete/nested_underscore_update.exp.json +++ b/testdata/d2oracle/TestDelete/nested_underscore_update.exp.json @@ -89,9 +89,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -138,9 +136,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -196,9 +192,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/node_in_edge.exp.json b/testdata/d2oracle/TestDelete/node_in_edge.exp.json index 458a27804..dc3c6c44f 100644 --- a/testdata/d2oracle/TestDelete/node_in_edge.exp.json +++ b/testdata/d2oracle/TestDelete/node_in_edge.exp.json @@ -170,9 +170,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -203,9 +201,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -235,9 +231,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -284,9 +278,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -331,9 +323,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -378,9 +368,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -425,9 +413,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -472,9 +458,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -519,9 +503,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json b/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json index e2cd47fca..117af5395 100644 --- a/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json +++ b/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json @@ -209,9 +209,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -242,9 +240,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -274,9 +270,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -306,9 +300,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -355,9 +347,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -422,9 +412,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -489,9 +477,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -536,9 +522,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -594,9 +578,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -652,9 +634,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -699,9 +679,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/only-underscore-nested.exp.json b/testdata/d2oracle/TestDelete/only-underscore-nested.exp.json index 802a3df40..b5c7ccdae 100644 --- a/testdata/d2oracle/TestDelete/only-underscore-nested.exp.json +++ b/testdata/d2oracle/TestDelete/only-underscore-nested.exp.json @@ -101,9 +101,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -150,9 +148,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -197,9 +193,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -244,9 +238,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/only-underscore.exp.json b/testdata/d2oracle/TestDelete/only-underscore.exp.json index f60a537a8..2309c924e 100644 --- a/testdata/d2oracle/TestDelete/only-underscore.exp.json +++ b/testdata/d2oracle/TestDelete/only-underscore.exp.json @@ -78,9 +78,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -127,9 +125,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -174,9 +170,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json b/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json index 86f2701d8..b93c9f0c6 100644 --- a/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json +++ b/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json @@ -168,9 +168,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -201,9 +199,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -274,9 +270,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -341,9 +335,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json b/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json index ea742ec25..35f4eac8b 100644 --- a/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json +++ b/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json @@ -168,9 +168,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -205,9 +203,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -274,9 +270,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -341,9 +335,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/order_1.exp.json b/testdata/d2oracle/TestDelete/order_1.exp.json index 88dbcf13d..81c1a7f63 100644 --- a/testdata/d2oracle/TestDelete/order_1.exp.json +++ b/testdata/d2oracle/TestDelete/order_1.exp.json @@ -95,9 +95,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -128,9 +126,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -177,9 +173,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -224,9 +218,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -271,9 +263,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/order_2.exp.json b/testdata/d2oracle/TestDelete/order_2.exp.json index 03170d8fa..fb792b501 100644 --- a/testdata/d2oracle/TestDelete/order_2.exp.json +++ b/testdata/d2oracle/TestDelete/order_2.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -121,9 +119,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -168,9 +164,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/order_3.exp.json b/testdata/d2oracle/TestDelete/order_3.exp.json index 70949b8f9..3d12f9941 100644 --- a/testdata/d2oracle/TestDelete/order_3.exp.json +++ b/testdata/d2oracle/TestDelete/order_3.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -121,9 +119,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -168,9 +164,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/order_4.exp.json b/testdata/d2oracle/TestDelete/order_4.exp.json index 6a678dd41..b742e3635 100644 --- a/testdata/d2oracle/TestDelete/order_4.exp.json +++ b/testdata/d2oracle/TestDelete/order_4.exp.json @@ -49,9 +49,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -98,9 +96,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/order_5.exp.json b/testdata/d2oracle/TestDelete/order_5.exp.json index bab54bbe0..340e97382 100644 --- a/testdata/d2oracle/TestDelete/order_5.exp.json +++ b/testdata/d2oracle/TestDelete/order_5.exp.json @@ -147,9 +147,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -180,9 +178,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -212,9 +208,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -261,9 +255,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -308,9 +300,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -355,9 +345,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -402,9 +390,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -449,9 +435,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/order_6.exp.json b/testdata/d2oracle/TestDelete/order_6.exp.json index a94b1e761..010f688df 100644 --- a/testdata/d2oracle/TestDelete/order_6.exp.json +++ b/testdata/d2oracle/TestDelete/order_6.exp.json @@ -123,9 +123,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -214,9 +212,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -261,9 +257,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -330,9 +324,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -399,9 +391,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/order_7.exp.json b/testdata/d2oracle/TestDelete/order_7.exp.json index 883029a40..d85b7b0cc 100644 --- a/testdata/d2oracle/TestDelete/order_7.exp.json +++ b/testdata/d2oracle/TestDelete/order_7.exp.json @@ -134,9 +134,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -236,9 +234,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -283,9 +279,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -363,9 +357,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -443,9 +435,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -523,9 +513,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/order_8.exp.json b/testdata/d2oracle/TestDelete/order_8.exp.json index 670615295..962ecad45 100644 --- a/testdata/d2oracle/TestDelete/order_8.exp.json +++ b/testdata/d2oracle/TestDelete/order_8.exp.json @@ -141,9 +141,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -190,9 +188,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -237,9 +233,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -284,9 +278,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -331,9 +323,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -378,9 +368,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/save_map.exp.json b/testdata/d2oracle/TestDelete/save_map.exp.json index 0a0840513..f9a437bd2 100644 --- a/testdata/d2oracle/TestDelete/save_map.exp.json +++ b/testdata/d2oracle/TestDelete/save_map.exp.json @@ -88,9 +88,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -137,9 +135,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/save_map_with_primary.exp.json b/testdata/d2oracle/TestDelete/save_map_with_primary.exp.json index 038242130..9135e9999 100644 --- a/testdata/d2oracle/TestDelete/save_map_with_primary.exp.json +++ b/testdata/d2oracle/TestDelete/save_map_with_primary.exp.json @@ -98,9 +98,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -147,9 +145,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/shape_class.exp.json b/testdata/d2oracle/TestDelete/shape_class.exp.json index 30a5cbbf9..e5f1f7ea9 100644 --- a/testdata/d2oracle/TestDelete/shape_class.exp.json +++ b/testdata/d2oracle/TestDelete/shape_class.exp.json @@ -49,9 +49,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -98,9 +96,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/shape_sql_table.exp.json b/testdata/d2oracle/TestDelete/shape_sql_table.exp.json index 0913869b9..279fee006 100644 --- a/testdata/d2oracle/TestDelete/shape_sql_table.exp.json +++ b/testdata/d2oracle/TestDelete/shape_sql_table.exp.json @@ -269,9 +269,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -302,9 +300,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -351,9 +347,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -460,7 +454,9 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" } ] @@ -481,9 +477,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -528,9 +522,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/singular_flat_style.exp.json b/testdata/d2oracle/TestDelete/singular_flat_style.exp.json index ceb705b2d..4468c2179 100644 --- a/testdata/d2oracle/TestDelete/singular_flat_style.exp.json +++ b/testdata/d2oracle/TestDelete/singular_flat_style.exp.json @@ -49,9 +49,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -98,9 +96,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/singular_map_style.exp.json b/testdata/d2oracle/TestDelete/singular_map_style.exp.json index 8c846d60e..341dfb3c4 100644 --- a/testdata/d2oracle/TestDelete/singular_map_style.exp.json +++ b/testdata/d2oracle/TestDelete/singular_map_style.exp.json @@ -49,9 +49,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -98,9 +96,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/table_refs.exp.json b/testdata/d2oracle/TestDelete/table_refs.exp.json index 2ab147458..8dddf30b2 100644 --- a/testdata/d2oracle/TestDelete/table_refs.exp.json +++ b/testdata/d2oracle/TestDelete/table_refs.exp.json @@ -145,9 +145,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -236,7 +234,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "", + "constraint": null, "reference": "" } ] @@ -257,9 +255,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/underscore_no_conflict.exp.json b/testdata/d2oracle/TestDelete/underscore_no_conflict.exp.json index 9a0ab8b2e..95ef38dd6 100644 --- a/testdata/d2oracle/TestDelete/underscore_no_conflict.exp.json +++ b/testdata/d2oracle/TestDelete/underscore_no_conflict.exp.json @@ -112,9 +112,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -161,9 +159,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -219,9 +215,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -266,9 +260,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/underscore_remove.exp.json b/testdata/d2oracle/TestDelete/underscore_remove.exp.json index 942865d1e..17f728b9d 100644 --- a/testdata/d2oracle/TestDelete/underscore_remove.exp.json +++ b/testdata/d2oracle/TestDelete/underscore_remove.exp.json @@ -141,9 +141,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -174,9 +172,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -206,9 +202,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -255,9 +249,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -302,9 +294,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -349,9 +339,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -396,9 +384,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -443,9 +429,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestDelete/width.exp.json b/testdata/d2oracle/TestDelete/width.exp.json index 9f0aea140..9b46cd396 100644 --- a/testdata/d2oracle/TestDelete/width.exp.json +++ b/testdata/d2oracle/TestDelete/width.exp.json @@ -49,9 +49,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -98,9 +96,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/append_multiple_styles.exp.json b/testdata/d2oracle/TestMove/append_multiple_styles.exp.json index bec332a1a..f35e81c9d 100644 --- a/testdata/d2oracle/TestMove/append_multiple_styles.exp.json +++ b/testdata/d2oracle/TestMove/append_multiple_styles.exp.json @@ -233,9 +233,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -282,9 +280,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -356,9 +352,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/basic.exp.json b/testdata/d2oracle/TestMove/basic.exp.json index 395accc11..cf783246e 100644 --- a/testdata/d2oracle/TestMove/basic.exp.json +++ b/testdata/d2oracle/TestMove/basic.exp.json @@ -49,9 +49,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -98,9 +96,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/basic_nested.exp.json b/testdata/d2oracle/TestMove/basic_nested.exp.json index da56ee65f..16fc91031 100644 --- a/testdata/d2oracle/TestMove/basic_nested.exp.json +++ b/testdata/d2oracle/TestMove/basic_nested.exp.json @@ -78,9 +78,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -127,9 +125,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -174,9 +170,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/basic_out_of_container.exp.json b/testdata/d2oracle/TestMove/basic_out_of_container.exp.json index 72d30748b..fbe57ba9f 100644 --- a/testdata/d2oracle/TestMove/basic_out_of_container.exp.json +++ b/testdata/d2oracle/TestMove/basic_out_of_container.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -121,9 +119,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -168,9 +164,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/between_containers.exp.json b/testdata/d2oracle/TestMove/between_containers.exp.json index a0d837dd2..8e4ec8375 100644 --- a/testdata/d2oracle/TestMove/between_containers.exp.json +++ b/testdata/d2oracle/TestMove/between_containers.exp.json @@ -101,9 +101,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -150,9 +148,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -197,9 +193,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -244,9 +238,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/chain_connected_nested.exp.json b/testdata/d2oracle/TestMove/chain_connected_nested.exp.json index b9f6efb5c..587de4889 100644 --- a/testdata/d2oracle/TestMove/chain_connected_nested.exp.json +++ b/testdata/d2oracle/TestMove/chain_connected_nested.exp.json @@ -132,9 +132,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -165,9 +163,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -197,9 +193,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -266,9 +260,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -333,9 +325,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -380,9 +370,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } 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 7cc0e336c..d4d287d9b 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 @@ -120,9 +120,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -153,9 +151,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -185,9 +181,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -245,9 +239,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -303,9 +295,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -370,9 +360,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -417,9 +405,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/connected_nested.exp.json b/testdata/d2oracle/TestMove/connected_nested.exp.json index 586175cd4..895608ae8 100644 --- a/testdata/d2oracle/TestMove/connected_nested.exp.json +++ b/testdata/d2oracle/TestMove/connected_nested.exp.json @@ -95,9 +95,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -128,9 +126,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -177,9 +173,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -224,9 +218,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -271,9 +263,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/container_conflicts_generated.exp.json b/testdata/d2oracle/TestMove/container_conflicts_generated.exp.json index 87cd919ec..2bb20536a 100644 --- a/testdata/d2oracle/TestMove/container_conflicts_generated.exp.json +++ b/testdata/d2oracle/TestMove/container_conflicts_generated.exp.json @@ -139,9 +139,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -188,9 +186,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -235,9 +231,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -282,9 +276,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -329,9 +321,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } 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 4258f1564..cab5389a5 100644 --- a/testdata/d2oracle/TestMove/container_multiple_refs_with_underscore.exp.json +++ b/testdata/d2oracle/TestMove/container_multiple_refs_with_underscore.exp.json @@ -78,9 +78,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -127,9 +125,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -174,9 +170,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/container_near.exp.json b/testdata/d2oracle/TestMove/container_near.exp.json index 7613c98ed..95d0a5982 100644 --- a/testdata/d2oracle/TestMove/container_near.exp.json +++ b/testdata/d2oracle/TestMove/container_near.exp.json @@ -203,9 +203,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -252,9 +250,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -336,9 +332,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -394,9 +388,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -452,9 +444,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -499,9 +489,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -546,9 +534,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/duplicate.exp.json b/testdata/d2oracle/TestMove/duplicate.exp.json index a73442617..322268428 100644 --- a/testdata/d2oracle/TestMove/duplicate.exp.json +++ b/testdata/d2oracle/TestMove/duplicate.exp.json @@ -134,9 +134,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -203,9 +201,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -250,9 +246,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/duplicate_generated.exp.json b/testdata/d2oracle/TestMove/duplicate_generated.exp.json index a3f462509..0b27a1251 100644 --- a/testdata/d2oracle/TestMove/duplicate_generated.exp.json +++ b/testdata/d2oracle/TestMove/duplicate_generated.exp.json @@ -193,9 +193,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -242,9 +240,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -289,9 +285,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -336,9 +330,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -383,9 +375,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -430,9 +420,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -477,9 +465,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -524,9 +510,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/edge_across_containers.exp.json b/testdata/d2oracle/TestMove/edge_across_containers.exp.json index d6695865d..a796860ef 100644 --- a/testdata/d2oracle/TestMove/edge_across_containers.exp.json +++ b/testdata/d2oracle/TestMove/edge_across_containers.exp.json @@ -146,9 +146,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -179,9 +177,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -228,9 +224,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -317,9 +311,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -386,9 +378,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -433,9 +423,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/edge_basic.exp.json b/testdata/d2oracle/TestMove/edge_basic.exp.json index 03f9339cf..fc1f00057 100644 --- a/testdata/d2oracle/TestMove/edge_basic.exp.json +++ b/testdata/d2oracle/TestMove/edge_basic.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -105,9 +103,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -154,9 +150,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -201,9 +195,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/edge_chain_basic.exp.json b/testdata/d2oracle/TestMove/edge_chain_basic.exp.json index dcc512ba0..1a72ed1fe 100644 --- a/testdata/d2oracle/TestMove/edge_chain_basic.exp.json +++ b/testdata/d2oracle/TestMove/edge_chain_basic.exp.json @@ -109,9 +109,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -142,9 +140,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -174,9 +170,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -223,9 +217,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -290,9 +282,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -337,9 +327,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/edge_chain_circular.exp.json b/testdata/d2oracle/TestMove/edge_chain_circular.exp.json index 74ca2b686..0fdadf058 100644 --- a/testdata/d2oracle/TestMove/edge_chain_circular.exp.json +++ b/testdata/d2oracle/TestMove/edge_chain_circular.exp.json @@ -160,9 +160,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -193,9 +191,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -225,9 +221,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -274,9 +268,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -363,9 +355,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -430,9 +420,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json b/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json index 2cae2052f..c8c7aee24 100644 --- a/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json +++ b/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json @@ -143,9 +143,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -176,9 +174,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -208,9 +204,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -288,9 +282,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -346,9 +338,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -413,9 +403,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -460,9 +448,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json b/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json index cf140af7a..71c90c3cf 100644 --- a/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json +++ b/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json @@ -160,9 +160,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -193,9 +191,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -225,9 +221,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -274,9 +268,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -321,9 +313,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -410,9 +400,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -457,9 +445,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/edge_conflict.exp.json b/testdata/d2oracle/TestMove/edge_conflict.exp.json index fcbb68491..208bbc7c6 100644 --- a/testdata/d2oracle/TestMove/edge_conflict.exp.json +++ b/testdata/d2oracle/TestMove/edge_conflict.exp.json @@ -146,9 +146,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -179,9 +177,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -270,9 +266,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -328,9 +322,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -386,9 +378,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -433,9 +423,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -480,9 +468,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/edge_into_container.exp.json b/testdata/d2oracle/TestMove/edge_into_container.exp.json index 16d6030af..8ea6e91c5 100644 --- a/testdata/d2oracle/TestMove/edge_into_container.exp.json +++ b/testdata/d2oracle/TestMove/edge_into_container.exp.json @@ -135,9 +135,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -168,9 +166,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -248,9 +244,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -295,9 +289,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -353,9 +345,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -400,9 +390,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/edge_nested_basic.exp.json b/testdata/d2oracle/TestMove/edge_nested_basic.exp.json index 5490597dc..34eb8ef15 100644 --- a/testdata/d2oracle/TestMove/edge_nested_basic.exp.json +++ b/testdata/d2oracle/TestMove/edge_nested_basic.exp.json @@ -101,9 +101,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -134,9 +132,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -183,9 +179,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -230,9 +224,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -277,9 +269,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/edge_out_of_container.exp.json b/testdata/d2oracle/TestMove/edge_out_of_container.exp.json index 1f810981f..f5b230e67 100644 --- a/testdata/d2oracle/TestMove/edge_out_of_container.exp.json +++ b/testdata/d2oracle/TestMove/edge_out_of_container.exp.json @@ -112,9 +112,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -145,9 +143,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -194,9 +190,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -252,9 +246,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -299,9 +291,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/extend_map.exp.json b/testdata/d2oracle/TestMove/extend_map.exp.json index 6838bbff1..65216fcde 100644 --- a/testdata/d2oracle/TestMove/extend_map.exp.json +++ b/testdata/d2oracle/TestMove/extend_map.exp.json @@ -159,9 +159,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -228,9 +226,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -275,9 +271,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -322,9 +316,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -369,9 +361,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/extend_stationary_path.exp.json b/testdata/d2oracle/TestMove/extend_stationary_path.exp.json index 4cb83f215..c727e8304 100644 --- a/testdata/d2oracle/TestMove/extend_stationary_path.exp.json +++ b/testdata/d2oracle/TestMove/extend_stationary_path.exp.json @@ -152,9 +152,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -243,9 +241,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -332,9 +328,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -421,9 +415,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/flat_between_containers.exp.json b/testdata/d2oracle/TestMove/flat_between_containers.exp.json index 955ae642f..dfe4b4932 100644 --- a/testdata/d2oracle/TestMove/flat_between_containers.exp.json +++ b/testdata/d2oracle/TestMove/flat_between_containers.exp.json @@ -101,9 +101,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -150,9 +148,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -197,9 +193,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -244,9 +238,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/flat_merge.exp.json b/testdata/d2oracle/TestMove/flat_merge.exp.json index 8e581eafb..735394e90 100644 --- a/testdata/d2oracle/TestMove/flat_merge.exp.json +++ b/testdata/d2oracle/TestMove/flat_merge.exp.json @@ -134,9 +134,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -183,9 +181,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -230,9 +226,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -277,9 +271,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -324,9 +316,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/flat_middle_container.exp.json b/testdata/d2oracle/TestMove/flat_middle_container.exp.json index af577eb7e..249f6e625 100644 --- a/testdata/d2oracle/TestMove/flat_middle_container.exp.json +++ b/testdata/d2oracle/TestMove/flat_middle_container.exp.json @@ -112,9 +112,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -172,9 +170,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -230,9 +226,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -277,9 +271,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -324,9 +316,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/flat_near.exp.json b/testdata/d2oracle/TestMove/flat_near.exp.json index 66456858b..88af9eb39 100644 --- a/testdata/d2oracle/TestMove/flat_near.exp.json +++ b/testdata/d2oracle/TestMove/flat_near.exp.json @@ -122,9 +122,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -208,9 +206,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -255,9 +251,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -302,9 +296,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/flat_nested_merge.exp.json b/testdata/d2oracle/TestMove/flat_nested_merge.exp.json index 98a156b77..5e057fe71 100644 --- a/testdata/d2oracle/TestMove/flat_nested_merge.exp.json +++ b/testdata/d2oracle/TestMove/flat_nested_merge.exp.json @@ -190,9 +190,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -272,9 +270,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -352,9 +348,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -432,9 +426,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -512,9 +504,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -570,9 +560,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -628,9 +616,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -697,9 +683,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -766,9 +750,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -835,9 +817,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -882,9 +862,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } 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 b301398b2..a1abcb3b1 100644 --- a/testdata/d2oracle/TestMove/flat_nested_merge_multiple_refs.exp.json +++ b/testdata/d2oracle/TestMove/flat_nested_merge_multiple_refs.exp.json @@ -288,9 +288,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -432,9 +430,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -585,9 +581,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -738,9 +732,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -785,9 +777,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -832,9 +822,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -879,9 +867,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -926,9 +912,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1006,9 +990,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } 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 9f81e6241..28401eb18 100644 --- a/testdata/d2oracle/TestMove/flat_reparent_with_map_value.exp.json +++ b/testdata/d2oracle/TestMove/flat_reparent_with_map_value.exp.json @@ -111,9 +111,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -160,9 +158,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -207,9 +203,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } 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 7511a4c58..5ca987152 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 @@ -152,9 +152,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -201,9 +199,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -248,9 +244,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -295,9 +289,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/flat_reparent_with_value.exp.json b/testdata/d2oracle/TestMove/flat_reparent_with_value.exp.json index f17aff8a0..936069718 100644 --- a/testdata/d2oracle/TestMove/flat_reparent_with_value.exp.json +++ b/testdata/d2oracle/TestMove/flat_reparent_with_value.exp.json @@ -82,9 +82,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -131,9 +129,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -178,9 +174,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/flat_style.exp.json b/testdata/d2oracle/TestMove/flat_style.exp.json index ee9c53c65..ac3ee7326 100644 --- a/testdata/d2oracle/TestMove/flat_style.exp.json +++ b/testdata/d2oracle/TestMove/flat_style.exp.json @@ -161,9 +161,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -210,9 +208,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -328,9 +324,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/full_edge_slice.exp.json b/testdata/d2oracle/TestMove/full_edge_slice.exp.json index e81da954d..fa669a32d 100644 --- a/testdata/d2oracle/TestMove/full_edge_slice.exp.json +++ b/testdata/d2oracle/TestMove/full_edge_slice.exp.json @@ -215,9 +215,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -248,9 +246,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -280,9 +276,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -360,9 +354,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -407,9 +399,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -505,9 +495,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -583,9 +571,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/full_slice.exp.json b/testdata/d2oracle/TestMove/full_slice.exp.json index 7f197757e..7ac3ed662 100644 --- a/testdata/d2oracle/TestMove/full_slice.exp.json +++ b/testdata/d2oracle/TestMove/full_slice.exp.json @@ -101,9 +101,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -150,9 +148,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -197,9 +193,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -244,9 +238,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/gnarly_1.exp.json b/testdata/d2oracle/TestMove/gnarly_1.exp.json index bb020cbe6..d4fdf0016 100644 --- a/testdata/d2oracle/TestMove/gnarly_1.exp.json +++ b/testdata/d2oracle/TestMove/gnarly_1.exp.json @@ -359,9 +359,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -392,9 +390,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -424,9 +420,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -456,9 +450,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -527,9 +519,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -596,9 +586,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -665,9 +653,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -774,9 +760,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -843,9 +827,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -912,9 +894,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -959,9 +939,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1068,9 +1046,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1146,9 +1122,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1204,9 +1178,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1262,9 +1234,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1320,9 +1290,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/hoist_container_children.exp.json b/testdata/d2oracle/TestMove/hoist_container_children.exp.json index 169d90c1a..e1175fec1 100644 --- a/testdata/d2oracle/TestMove/hoist_container_children.exp.json +++ b/testdata/d2oracle/TestMove/hoist_container_children.exp.json @@ -124,9 +124,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -173,9 +171,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -220,9 +216,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -267,9 +261,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -314,9 +306,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/include_descendants_conflict.exp.json b/testdata/d2oracle/TestMove/include_descendants_conflict.exp.json index 76e7ed4ba..891d371f0 100644 --- a/testdata/d2oracle/TestMove/include_descendants_conflict.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_conflict.exp.json @@ -112,9 +112,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -161,9 +159,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -208,9 +204,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -266,9 +260,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -324,9 +316,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/include_descendants_edge_child.exp.json b/testdata/d2oracle/TestMove/include_descendants_edge_child.exp.json index 7d0a79a50..ae2d5dbd4 100644 --- a/testdata/d2oracle/TestMove/include_descendants_edge_child.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_edge_child.exp.json @@ -130,9 +130,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -163,9 +161,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -212,9 +208,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -259,9 +253,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -306,9 +298,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -353,9 +343,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } 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 b24f0320c..e2cdeca29 100644 --- a/testdata/d2oracle/TestMove/include_descendants_edge_ref_1.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_edge_ref_1.exp.json @@ -168,9 +168,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -201,9 +199,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -334,9 +330,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -465,9 +459,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -534,9 +526,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -603,9 +593,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } 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 019333be7..6398bdbee 100644 --- a/testdata/d2oracle/TestMove/include_descendants_edge_ref_2.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_edge_ref_2.exp.json @@ -95,9 +95,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -128,9 +126,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -177,9 +173,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -224,9 +218,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -271,9 +263,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } 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 9cdadea96..49eeceb6a 100644 --- a/testdata/d2oracle/TestMove/include_descendants_edge_ref_3.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_edge_ref_3.exp.json @@ -106,9 +106,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -139,9 +137,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -188,9 +184,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -246,9 +240,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -304,9 +296,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -351,9 +341,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } 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 1a4a2ff4d..a0401b010 100644 --- a/testdata/d2oracle/TestMove/include_descendants_edge_ref_4.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_edge_ref_4.exp.json @@ -140,9 +140,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -173,9 +171,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -222,9 +218,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -311,9 +305,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -380,9 +372,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -449,9 +439,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -496,9 +484,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } 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 0d07b6146..588c19dc5 100644 --- a/testdata/d2oracle/TestMove/include_descendants_edge_ref_5.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_edge_ref_5.exp.json @@ -169,9 +169,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -202,9 +200,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -251,9 +247,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -298,9 +292,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -387,9 +379,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -456,9 +446,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -525,9 +513,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -572,9 +558,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } 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 ce7935bc1..6e965a5c1 100644 --- a/testdata/d2oracle/TestMove/include_descendants_edge_ref_6.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_edge_ref_6.exp.json @@ -106,9 +106,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -139,9 +137,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -188,9 +184,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -266,9 +260,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -324,9 +316,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } 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 24d8d6767..e4786e442 100644 --- a/testdata/d2oracle/TestMove/include_descendants_edge_ref_7.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_edge_ref_7.exp.json @@ -128,9 +128,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -161,9 +159,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -283,9 +279,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -341,9 +335,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -399,9 +391,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -457,9 +447,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } 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 9fb9ad366..b3266b6ad 100644 --- a/testdata/d2oracle/TestMove/include_descendants_edge_ref_underscore.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_edge_ref_underscore.exp.json @@ -309,9 +309,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -342,9 +340,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -374,9 +370,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -613,9 +607,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -850,9 +842,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -972,9 +962,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1094,9 +1082,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1141,9 +1127,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/include_descendants_flat_1.exp.json b/testdata/d2oracle/TestMove/include_descendants_flat_1.exp.json index 76abaf2bd..abfb18ae5 100644 --- a/testdata/d2oracle/TestMove/include_descendants_flat_1.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_flat_1.exp.json @@ -89,9 +89,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -138,9 +136,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -196,9 +192,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -254,9 +248,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/include_descendants_flat_2.exp.json b/testdata/d2oracle/TestMove/include_descendants_flat_2.exp.json index ea273e78f..bbb9dbc8f 100644 --- a/testdata/d2oracle/TestMove/include_descendants_flat_2.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_flat_2.exp.json @@ -123,9 +123,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -203,9 +201,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -261,9 +257,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -319,9 +313,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -377,9 +369,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/include_descendants_flat_3.exp.json b/testdata/d2oracle/TestMove/include_descendants_flat_3.exp.json index c808f2c1d..53a6d1c9a 100644 --- a/testdata/d2oracle/TestMove/include_descendants_flat_3.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_flat_3.exp.json @@ -117,9 +117,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -197,9 +195,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -255,9 +251,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -313,9 +307,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -371,9 +363,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/include_descendants_flat_4.exp.json b/testdata/d2oracle/TestMove/include_descendants_flat_4.exp.json index 278b3de45..2f602a41c 100644 --- a/testdata/d2oracle/TestMove/include_descendants_flat_4.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_flat_4.exp.json @@ -117,9 +117,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -208,9 +206,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -266,9 +262,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -324,9 +318,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -371,9 +363,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/include_descendants_grandchild.exp.json b/testdata/d2oracle/TestMove/include_descendants_grandchild.exp.json index 35b66fea9..bc210a92d 100644 --- a/testdata/d2oracle/TestMove/include_descendants_grandchild.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_grandchild.exp.json @@ -170,9 +170,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -219,9 +217,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -266,9 +262,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -344,9 +338,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -402,9 +394,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -449,9 +439,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/include_descendants_map_1.exp.json b/testdata/d2oracle/TestMove/include_descendants_map_1.exp.json index 255de90db..22437cde7 100644 --- a/testdata/d2oracle/TestMove/include_descendants_map_1.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_map_1.exp.json @@ -107,9 +107,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -156,9 +154,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -203,9 +199,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -250,9 +244,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/include_descendants_map_2.exp.json b/testdata/d2oracle/TestMove/include_descendants_map_2.exp.json index 6e826d818..c87d5f62d 100644 --- a/testdata/d2oracle/TestMove/include_descendants_map_2.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_map_2.exp.json @@ -181,9 +181,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -250,9 +248,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -297,9 +293,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -375,9 +369,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -422,9 +414,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -480,9 +470,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/include_descendants_move_out.exp.json b/testdata/d2oracle/TestMove/include_descendants_move_out.exp.json index a1aeef336..c80f7b086 100644 --- a/testdata/d2oracle/TestMove/include_descendants_move_out.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_move_out.exp.json @@ -130,9 +130,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -179,9 +177,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -226,9 +222,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -273,9 +267,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -320,9 +312,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/include_descendants_near.exp.json b/testdata/d2oracle/TestMove/include_descendants_near.exp.json index 1c42cbfcc..fe66e976f 100644 --- a/testdata/d2oracle/TestMove/include_descendants_near.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_near.exp.json @@ -133,9 +133,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -182,9 +180,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -240,9 +236,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -298,9 +292,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -393,9 +385,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/include_descendants_nested_1.exp.json b/testdata/d2oracle/TestMove/include_descendants_nested_1.exp.json index 99d635e08..e3892169e 100644 --- a/testdata/d2oracle/TestMove/include_descendants_nested_1.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_nested_1.exp.json @@ -101,9 +101,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -150,9 +148,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -197,9 +193,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -244,9 +238,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/include_descendants_nested_2.exp.json b/testdata/d2oracle/TestMove/include_descendants_nested_2.exp.json index 206d9c205..ca86b08a0 100644 --- a/testdata/d2oracle/TestMove/include_descendants_nested_2.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_nested_2.exp.json @@ -112,9 +112,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -192,9 +190,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -250,9 +246,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -297,9 +291,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } 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 77a8ac776..16780889e 100644 --- a/testdata/d2oracle/TestMove/include_descendants_nested_reserved_2.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_nested_reserved_2.exp.json @@ -104,9 +104,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -164,9 +162,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -222,9 +218,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -280,9 +274,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } 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 7eadb5fc4..354853776 100644 --- a/testdata/d2oracle/TestMove/include_descendants_nested_reserved_3.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_nested_reserved_3.exp.json @@ -104,9 +104,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -153,9 +151,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -222,9 +218,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -291,9 +285,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/include_descendants_non_conflict.exp.json b/testdata/d2oracle/TestMove/include_descendants_non_conflict.exp.json index 24982ff1c..ea03a4bf6 100644 --- a/testdata/d2oracle/TestMove/include_descendants_non_conflict.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_non_conflict.exp.json @@ -135,9 +135,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -184,9 +182,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -231,9 +227,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -289,9 +283,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -347,9 +339,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -394,9 +384,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/include_descendants_sql.exp.json b/testdata/d2oracle/TestMove/include_descendants_sql.exp.json index ecb570832..990495062 100644 --- a/testdata/d2oracle/TestMove/include_descendants_sql.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_sql.exp.json @@ -150,9 +150,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -199,9 +197,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -257,7 +253,7 @@ "labelWidth": 0, "labelHeight": 0 }, - "constraint": "", + "constraint": null, "reference": "" } ] @@ -278,9 +274,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/include_descendants_underscore.exp.json b/testdata/d2oracle/TestMove/include_descendants_underscore.exp.json index 68e5be879..7c897ae05 100644 --- a/testdata/d2oracle/TestMove/include_descendants_underscore.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_underscore.exp.json @@ -248,9 +248,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -281,9 +279,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -313,9 +309,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -393,9 +387,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -451,9 +443,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -551,9 +541,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -651,9 +639,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -718,9 +704,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -776,9 +760,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/include_descendants_underscore_2.exp.json b/testdata/d2oracle/TestMove/include_descendants_underscore_2.exp.json index ce22948e7..6b24d0ce9 100644 --- a/testdata/d2oracle/TestMove/include_descendants_underscore_2.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_underscore_2.exp.json @@ -123,9 +123,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -214,9 +212,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -261,9 +257,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -330,9 +324,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/include_descendants_underscore_3.exp.json b/testdata/d2oracle/TestMove/include_descendants_underscore_3.exp.json index cd5a24478..e9279e02e 100644 --- a/testdata/d2oracle/TestMove/include_descendants_underscore_3.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_underscore_3.exp.json @@ -236,9 +236,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -269,9 +267,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -301,9 +297,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -476,9 +470,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -523,9 +515,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -634,9 +624,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -681,9 +669,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -750,9 +736,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/include_descendants_underscore_regression.exp.json b/testdata/d2oracle/TestMove/include_descendants_underscore_regression.exp.json index 6765f7e7a..44caff5d9 100644 --- a/testdata/d2oracle/TestMove/include_descendants_underscore_regression.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_underscore_regression.exp.json @@ -78,9 +78,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -127,9 +125,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -174,9 +170,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } 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 5ffd2006f..14b463daf 100644 --- a/testdata/d2oracle/TestMove/include_descendants_underscore_regression_2.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_underscore_regression_2.exp.json @@ -89,9 +89,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -138,9 +136,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -196,9 +192,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -254,9 +248,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/into_container_existing_map.exp.json b/testdata/d2oracle/TestMove/into_container_existing_map.exp.json index 4a2cd94e7..2d4b8dd57 100644 --- a/testdata/d2oracle/TestMove/into_container_existing_map.exp.json +++ b/testdata/d2oracle/TestMove/into_container_existing_map.exp.json @@ -101,9 +101,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -150,9 +148,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -197,9 +193,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -244,9 +238,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/into_container_nonexisting_map.exp.json b/testdata/d2oracle/TestMove/into_container_nonexisting_map.exp.json index ec521130f..8f07eb54c 100644 --- a/testdata/d2oracle/TestMove/into_container_nonexisting_map.exp.json +++ b/testdata/d2oracle/TestMove/into_container_nonexisting_map.exp.json @@ -78,9 +78,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -127,9 +125,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -174,9 +170,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } 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 c391111bd..409433d81 100644 --- a/testdata/d2oracle/TestMove/into_container_with_flat_keys.exp.json +++ b/testdata/d2oracle/TestMove/into_container_with_flat_keys.exp.json @@ -212,9 +212,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -261,9 +259,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -318,9 +314,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } 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 167ef2933..1d1344607 100644 --- a/testdata/d2oracle/TestMove/into_container_with_flat_style.exp.json +++ b/testdata/d2oracle/TestMove/into_container_with_flat_style.exp.json @@ -118,9 +118,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -171,9 +169,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -218,9 +214,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/map_transplant.exp.json b/testdata/d2oracle/TestMove/map_transplant.exp.json index e17865fcb..e5eb38532 100644 --- a/testdata/d2oracle/TestMove/map_transplant.exp.json +++ b/testdata/d2oracle/TestMove/map_transplant.exp.json @@ -221,9 +221,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -270,9 +268,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -317,9 +313,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -364,9 +358,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -415,9 +407,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/map_with_label.exp.json b/testdata/d2oracle/TestMove/map_with_label.exp.json index 697eae05f..fd11c8959 100644 --- a/testdata/d2oracle/TestMove/map_with_label.exp.json +++ b/testdata/d2oracle/TestMove/map_with_label.exp.json @@ -111,9 +111,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -160,9 +158,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -207,9 +203,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -254,9 +248,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/merge_nested_maps.exp.json b/testdata/d2oracle/TestMove/merge_nested_maps.exp.json index 53cbe88de..7d9fbadc8 100644 --- a/testdata/d2oracle/TestMove/merge_nested_maps.exp.json +++ b/testdata/d2oracle/TestMove/merge_nested_maps.exp.json @@ -272,9 +272,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -321,9 +319,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -472,9 +468,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -530,9 +524,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -608,9 +600,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -677,9 +667,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -746,9 +734,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -793,9 +779,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -840,9 +824,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/merge_reserved.exp.json b/testdata/d2oracle/TestMove/merge_reserved.exp.json index 7933a829a..26d98f1c7 100644 --- a/testdata/d2oracle/TestMove/merge_reserved.exp.json +++ b/testdata/d2oracle/TestMove/merge_reserved.exp.json @@ -263,9 +263,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -312,9 +310,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -452,9 +448,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -510,9 +504,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -568,9 +560,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -626,9 +616,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -673,9 +661,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/middle_container.exp.json b/testdata/d2oracle/TestMove/middle_container.exp.json index b73c2be58..c987f6b4e 100644 --- a/testdata/d2oracle/TestMove/middle_container.exp.json +++ b/testdata/d2oracle/TestMove/middle_container.exp.json @@ -101,9 +101,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -150,9 +148,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -197,9 +193,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -244,9 +238,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/middle_container_generated_conflict.exp.json b/testdata/d2oracle/TestMove/middle_container_generated_conflict.exp.json index 5ced0651d..68f5d2343 100644 --- a/testdata/d2oracle/TestMove/middle_container_generated_conflict.exp.json +++ b/testdata/d2oracle/TestMove/middle_container_generated_conflict.exp.json @@ -295,9 +295,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -328,9 +326,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -360,9 +356,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -502,9 +496,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -580,9 +572,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -658,9 +648,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -725,9 +713,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -803,9 +789,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -850,9 +834,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/move_container_children.exp.json b/testdata/d2oracle/TestMove/move_container_children.exp.json index cc1c9eeff..25c452213 100644 --- a/testdata/d2oracle/TestMove/move_container_children.exp.json +++ b/testdata/d2oracle/TestMove/move_container_children.exp.json @@ -147,9 +147,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -196,9 +194,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -243,9 +239,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -290,9 +284,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -337,9 +329,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -384,9 +374,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/move_container_conflict_children.exp.json b/testdata/d2oracle/TestMove/move_container_conflict_children.exp.json index b718a78c2..aad213c61 100644 --- a/testdata/d2oracle/TestMove/move_container_conflict_children.exp.json +++ b/testdata/d2oracle/TestMove/move_container_conflict_children.exp.json @@ -147,9 +147,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -196,9 +194,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -243,9 +239,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -290,9 +284,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -337,9 +329,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -384,9 +374,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } 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 4ed37d3ef..f50f54085 100644 --- a/testdata/d2oracle/TestMove/move_into_key_with_value.exp.json +++ b/testdata/d2oracle/TestMove/move_into_key_with_value.exp.json @@ -88,9 +88,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -137,9 +135,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -184,9 +180,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/move_out_of_edge.exp.json b/testdata/d2oracle/TestMove/move_out_of_edge.exp.json index c0bc0b3a8..6805aaf32 100644 --- a/testdata/d2oracle/TestMove/move_out_of_edge.exp.json +++ b/testdata/d2oracle/TestMove/move_out_of_edge.exp.json @@ -128,9 +128,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -161,9 +159,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -221,9 +217,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -279,9 +273,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -348,9 +340,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -417,9 +407,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -486,9 +474,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -533,9 +519,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } 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 919775b3b..c92dbe439 100644 --- a/testdata/d2oracle/TestMove/move_out_of_nested_edge.exp.json +++ b/testdata/d2oracle/TestMove/move_out_of_nested_edge.exp.json @@ -168,9 +168,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -201,9 +199,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -261,9 +257,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -319,9 +313,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -419,9 +411,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -519,9 +509,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -588,9 +576,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -635,9 +621,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/multiple_nesting_levels.exp.json b/testdata/d2oracle/TestMove/multiple_nesting_levels.exp.json index ccd390919..7d2be161a 100644 --- a/testdata/d2oracle/TestMove/multiple_nesting_levels.exp.json +++ b/testdata/d2oracle/TestMove/multiple_nesting_levels.exp.json @@ -283,9 +283,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -385,9 +383,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -527,9 +523,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -689,9 +683,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -736,9 +728,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -783,9 +773,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -852,9 +840,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -932,9 +918,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/near.exp.json b/testdata/d2oracle/TestMove/near.exp.json index b90fe8621..bb04cafce 100644 --- a/testdata/d2oracle/TestMove/near.exp.json +++ b/testdata/d2oracle/TestMove/near.exp.json @@ -140,9 +140,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -215,9 +213,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -262,9 +258,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -309,9 +303,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/nested-underscore-move-out.exp.json b/testdata/d2oracle/TestMove/nested-underscore-move-out.exp.json index 6cb5b9ed4..062b7e87b 100644 --- a/testdata/d2oracle/TestMove/nested-underscore-move-out.exp.json +++ b/testdata/d2oracle/TestMove/nested-underscore-move-out.exp.json @@ -101,9 +101,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -150,9 +148,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -197,9 +193,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -244,9 +238,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/nested_reserved_2.exp.json b/testdata/d2oracle/TestMove/nested_reserved_2.exp.json index 8af4f55ee..178643bd1 100644 --- a/testdata/d2oracle/TestMove/nested_reserved_2.exp.json +++ b/testdata/d2oracle/TestMove/nested_reserved_2.exp.json @@ -104,9 +104,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -164,9 +162,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -222,9 +218,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -280,9 +274,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/nested_reserved_3.exp.json b/testdata/d2oracle/TestMove/nested_reserved_3.exp.json index 8cf3a05af..6e727d799 100644 --- a/testdata/d2oracle/TestMove/nested_reserved_3.exp.json +++ b/testdata/d2oracle/TestMove/nested_reserved_3.exp.json @@ -196,9 +196,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -287,9 +285,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -376,9 +372,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -423,9 +417,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -501,9 +493,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/nhooyr_one.exp.json b/testdata/d2oracle/TestMove/nhooyr_one.exp.json index 2826789ba..10b00ea68 100644 --- a/testdata/d2oracle/TestMove/nhooyr_one.exp.json +++ b/testdata/d2oracle/TestMove/nhooyr_one.exp.json @@ -130,9 +130,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -179,9 +177,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -226,9 +222,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -273,9 +267,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -320,9 +312,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/nhooyr_two.exp.json b/testdata/d2oracle/TestMove/nhooyr_two.exp.json index b244e6cec..c6d2f7e36 100644 --- a/testdata/d2oracle/TestMove/nhooyr_two.exp.json +++ b/testdata/d2oracle/TestMove/nhooyr_two.exp.json @@ -176,9 +176,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -209,9 +207,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -258,9 +254,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -305,9 +299,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -352,9 +344,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -399,9 +389,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -446,9 +434,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -493,9 +479,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/out_of_newline_container.exp.json b/testdata/d2oracle/TestMove/out_of_newline_container.exp.json index b4979b03d..406266d42 100644 --- a/testdata/d2oracle/TestMove/out_of_newline_container.exp.json +++ b/testdata/d2oracle/TestMove/out_of_newline_container.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -121,9 +119,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -168,9 +164,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/parentheses.exp.json b/testdata/d2oracle/TestMove/parentheses.exp.json index f24b66fa8..8550114db 100644 --- a/testdata/d2oracle/TestMove/parentheses.exp.json +++ b/testdata/d2oracle/TestMove/parentheses.exp.json @@ -111,9 +111,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -144,9 +142,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -193,9 +189,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -271,9 +265,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -329,9 +321,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/partial_edge_slice.exp.json b/testdata/d2oracle/TestMove/partial_edge_slice.exp.json index 581b66537..25c508d64 100644 --- a/testdata/d2oracle/TestMove/partial_edge_slice.exp.json +++ b/testdata/d2oracle/TestMove/partial_edge_slice.exp.json @@ -118,9 +118,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -151,9 +149,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -200,9 +196,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -267,9 +261,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -314,9 +306,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/partial_slice.exp.json b/testdata/d2oracle/TestMove/partial_slice.exp.json index b2ff45583..adc1a450c 100644 --- a/testdata/d2oracle/TestMove/partial_slice.exp.json +++ b/testdata/d2oracle/TestMove/partial_slice.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -121,9 +119,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -168,9 +164,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/rename_2.exp.json b/testdata/d2oracle/TestMove/rename_2.exp.json index 5fbc66d25..91bc7ec8e 100644 --- a/testdata/d2oracle/TestMove/rename_2.exp.json +++ b/testdata/d2oracle/TestMove/rename_2.exp.json @@ -147,9 +147,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -196,9 +194,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -243,9 +239,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -290,9 +284,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -337,9 +329,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -384,9 +374,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/reuse_map.exp.json b/testdata/d2oracle/TestMove/reuse_map.exp.json index cddfddaae..a630a7c6a 100644 --- a/testdata/d2oracle/TestMove/reuse_map.exp.json +++ b/testdata/d2oracle/TestMove/reuse_map.exp.json @@ -164,9 +164,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -213,9 +211,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -291,9 +287,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -338,9 +332,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -385,9 +377,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -443,9 +433,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/slice_style.exp.json b/testdata/d2oracle/TestMove/slice_style.exp.json index 143be025c..ab093f083 100644 --- a/testdata/d2oracle/TestMove/slice_style.exp.json +++ b/testdata/d2oracle/TestMove/slice_style.exp.json @@ -139,9 +139,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -208,9 +206,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -299,9 +295,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/underscore-connection.exp.json b/testdata/d2oracle/TestMove/underscore-connection.exp.json index 90ffbf114..364083c4e 100644 --- a/testdata/d2oracle/TestMove/underscore-connection.exp.json +++ b/testdata/d2oracle/TestMove/underscore-connection.exp.json @@ -220,9 +220,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -253,9 +251,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -302,9 +298,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -433,9 +427,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -522,9 +514,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -611,9 +601,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/underscore_children.exp.json b/testdata/d2oracle/TestMove/underscore_children.exp.json index f269053d2..3076328ff 100644 --- a/testdata/d2oracle/TestMove/underscore_children.exp.json +++ b/testdata/d2oracle/TestMove/underscore_children.exp.json @@ -112,9 +112,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -161,9 +159,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -239,9 +235,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/underscore_edge_children.exp.json b/testdata/d2oracle/TestMove/underscore_edge_children.exp.json index 3bf160d9a..060e1bb9c 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_children.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_children.exp.json @@ -135,9 +135,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -168,9 +166,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -217,9 +213,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -295,9 +289,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -342,9 +334,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json index 36518954f..adcab65e8 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json @@ -101,9 +101,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -134,9 +132,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -183,9 +179,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -230,9 +224,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -277,9 +269,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json index 4dad226b6..0c8db60f3 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json @@ -112,9 +112,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -145,9 +143,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -194,9 +190,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -272,9 +266,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -330,9 +322,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json index 0ea41b209..7036b433c 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json @@ -112,9 +112,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -145,9 +143,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -194,9 +190,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -252,9 +246,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -299,9 +291,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json index 9d20231ea..0fc0392c9 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json @@ -101,9 +101,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -134,9 +132,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -183,9 +179,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -230,9 +224,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -277,9 +269,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json index 600aaa622..50271e49f 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json @@ -134,9 +134,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -167,9 +165,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -216,9 +212,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -316,9 +310,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -385,9 +377,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_6.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_6.exp.json index cd5cfdcc1..906801970 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_6.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_6.exp.json @@ -123,9 +123,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -156,9 +154,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -205,9 +201,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -294,9 +288,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -352,9 +344,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -410,9 +400,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/underscore_edge_split.exp.json b/testdata/d2oracle/TestMove/underscore_edge_split.exp.json index ce13ffa5a..7dd497bd3 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_split.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_split.exp.json @@ -164,9 +164,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -197,9 +195,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -246,9 +242,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -293,9 +287,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -351,9 +343,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -398,9 +388,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -445,9 +433,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/underscore_merge.exp.json b/testdata/d2oracle/TestMove/underscore_merge.exp.json index fec44e76c..914e4dc1b 100644 --- a/testdata/d2oracle/TestMove/underscore_merge.exp.json +++ b/testdata/d2oracle/TestMove/underscore_merge.exp.json @@ -144,9 +144,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -193,9 +191,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -240,9 +236,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -307,9 +301,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/underscore_split.exp.json b/testdata/d2oracle/TestMove/underscore_split.exp.json index 9ccbcafda..a78f65a45 100644 --- a/testdata/d2oracle/TestMove/underscore_split.exp.json +++ b/testdata/d2oracle/TestMove/underscore_split.exp.json @@ -141,9 +141,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -190,9 +188,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -237,9 +233,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -295,9 +289,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -342,9 +334,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/underscore_split_out.exp.json b/testdata/d2oracle/TestMove/underscore_split_out.exp.json index 525dacac9..f50e03ce7 100644 --- a/testdata/d2oracle/TestMove/underscore_split_out.exp.json +++ b/testdata/d2oracle/TestMove/underscore_split_out.exp.json @@ -199,9 +199,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -248,9 +246,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -295,9 +291,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -373,9 +367,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -420,9 +412,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -467,9 +457,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/underscore_transplant.exp.json b/testdata/d2oracle/TestMove/underscore_transplant.exp.json index ae0b189c4..f0d5a7646 100644 --- a/testdata/d2oracle/TestMove/underscore_transplant.exp.json +++ b/testdata/d2oracle/TestMove/underscore_transplant.exp.json @@ -101,9 +101,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -150,9 +148,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -197,9 +193,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -244,9 +238,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/unique_name.exp.json b/testdata/d2oracle/TestMove/unique_name.exp.json index 8be9c1042..bde09595f 100644 --- a/testdata/d2oracle/TestMove/unique_name.exp.json +++ b/testdata/d2oracle/TestMove/unique_name.exp.json @@ -158,9 +158,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -238,9 +236,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -316,9 +312,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -363,9 +357,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -410,9 +402,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestMove/unique_name_with_references.exp.json b/testdata/d2oracle/TestMove/unique_name_with_references.exp.json index 6e1f866af..d71534069 100644 --- a/testdata/d2oracle/TestMove/unique_name_with_references.exp.json +++ b/testdata/d2oracle/TestMove/unique_name_with_references.exp.json @@ -181,9 +181,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -214,9 +212,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -294,9 +290,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -341,9 +335,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -419,9 +411,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -466,9 +456,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -513,9 +501,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestReconnectEdge/basic.exp.json b/testdata/d2oracle/TestReconnectEdge/basic.exp.json index de1448f24..8d1d03e08 100644 --- a/testdata/d2oracle/TestReconnectEdge/basic.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/basic.exp.json @@ -141,9 +141,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -174,9 +172,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -243,9 +239,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -290,9 +284,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -357,9 +349,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestReconnectEdge/both.exp.json b/testdata/d2oracle/TestReconnectEdge/both.exp.json index a0576bd06..8350d974a 100644 --- a/testdata/d2oracle/TestReconnectEdge/both.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/both.exp.json @@ -141,9 +141,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -174,9 +172,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -243,9 +239,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -310,9 +304,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -357,9 +349,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestReconnectEdge/contained.exp.json b/testdata/d2oracle/TestReconnectEdge/contained.exp.json index e8dc7cb8c..96fc260b0 100644 --- a/testdata/d2oracle/TestReconnectEdge/contained.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/contained.exp.json @@ -162,9 +162,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -195,9 +193,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -348,9 +344,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -406,9 +400,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -495,9 +487,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -553,9 +543,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestReconnectEdge/in_chain_3.exp.json b/testdata/d2oracle/TestReconnectEdge/in_chain_3.exp.json index 4ce97de19..bf08c88b8 100644 --- a/testdata/d2oracle/TestReconnectEdge/in_chain_3.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/in_chain_3.exp.json @@ -155,9 +155,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -188,9 +186,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -220,9 +216,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -252,9 +246,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -301,9 +293,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -388,9 +378,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -455,9 +443,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestReconnectEdge/in_chain_4.exp.json b/testdata/d2oracle/TestReconnectEdge/in_chain_4.exp.json index 95dca10fa..4d3111d03 100644 --- a/testdata/d2oracle/TestReconnectEdge/in_chain_4.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/in_chain_4.exp.json @@ -178,9 +178,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -211,9 +209,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -243,9 +239,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -275,9 +269,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -344,9 +336,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -431,9 +421,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -498,9 +486,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestReconnectEdge/indexed_ref.exp.json b/testdata/d2oracle/TestReconnectEdge/indexed_ref.exp.json index c0a19b4e2..02ecdaa4f 100644 --- a/testdata/d2oracle/TestReconnectEdge/indexed_ref.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/indexed_ref.exp.json @@ -206,9 +206,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -246,9 +244,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -315,9 +311,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -402,9 +396,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -449,9 +441,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestReconnectEdge/loop.exp.json b/testdata/d2oracle/TestReconnectEdge/loop.exp.json index ade8dc21c..e7470d3fd 100644 --- a/testdata/d2oracle/TestReconnectEdge/loop.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/loop.exp.json @@ -95,9 +95,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -128,9 +126,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -177,9 +173,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -244,9 +238,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestReconnectEdge/middle_chain.exp.json b/testdata/d2oracle/TestReconnectEdge/middle_chain.exp.json index cdf52c2c7..e43b962c7 100644 --- a/testdata/d2oracle/TestReconnectEdge/middle_chain.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/middle_chain.exp.json @@ -141,9 +141,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -174,9 +172,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -206,9 +202,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -255,9 +249,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -302,9 +294,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -349,9 +339,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -416,9 +404,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestReconnectEdge/middle_chain_both.exp.json b/testdata/d2oracle/TestReconnectEdge/middle_chain_both.exp.json index d7ae830db..72a5b6d19 100644 --- a/testdata/d2oracle/TestReconnectEdge/middle_chain_both.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/middle_chain_both.exp.json @@ -187,9 +187,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -220,9 +218,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -252,9 +248,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -284,9 +278,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -333,9 +325,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -380,9 +370,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -427,9 +415,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -474,9 +460,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -561,9 +545,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestReconnectEdge/middle_chain_first.exp.json b/testdata/d2oracle/TestReconnectEdge/middle_chain_first.exp.json index 98730392c..2ed26f0b5 100644 --- a/testdata/d2oracle/TestReconnectEdge/middle_chain_first.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/middle_chain_first.exp.json @@ -192,9 +192,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -225,9 +223,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -257,9 +253,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -289,9 +283,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -338,9 +330,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -405,9 +395,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -472,9 +460,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -539,9 +525,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -586,9 +570,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestReconnectEdge/middle_chain_last.exp.json b/testdata/d2oracle/TestReconnectEdge/middle_chain_last.exp.json index 4eeebb991..da052e0f4 100644 --- a/testdata/d2oracle/TestReconnectEdge/middle_chain_last.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/middle_chain_last.exp.json @@ -192,9 +192,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -225,9 +223,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -257,9 +253,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -289,9 +283,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -338,9 +330,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -405,9 +395,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -472,9 +460,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -539,9 +525,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -586,9 +570,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestReconnectEdge/middle_chain_src.exp.json b/testdata/d2oracle/TestReconnectEdge/middle_chain_src.exp.json index f34d227e4..23eec563f 100644 --- a/testdata/d2oracle/TestReconnectEdge/middle_chain_src.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/middle_chain_src.exp.json @@ -141,9 +141,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -174,9 +172,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -206,9 +202,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -255,9 +249,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -302,9 +294,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -369,9 +359,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -416,9 +404,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestReconnectEdge/preserve_old_obj.exp.json b/testdata/d2oracle/TestReconnectEdge/preserve_old_obj.exp.json index f8bff7817..aef393151 100644 --- a/testdata/d2oracle/TestReconnectEdge/preserve_old_obj.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/preserve_old_obj.exp.json @@ -206,9 +206,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -246,9 +244,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -315,9 +311,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -402,9 +396,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -449,9 +441,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestReconnectEdge/reverse.exp.json b/testdata/d2oracle/TestReconnectEdge/reverse.exp.json index 75faa2ad7..601d36ca8 100644 --- a/testdata/d2oracle/TestReconnectEdge/reverse.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/reverse.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -105,9 +103,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -154,9 +150,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -201,9 +195,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestReconnectEdge/scope_inner.exp.json b/testdata/d2oracle/TestReconnectEdge/scope_inner.exp.json index 7143dca93..00644f955 100644 --- a/testdata/d2oracle/TestReconnectEdge/scope_inner.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/scope_inner.exp.json @@ -187,9 +187,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -220,9 +218,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -269,9 +265,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -316,9 +310,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -394,9 +386,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -472,9 +462,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -519,9 +507,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestReconnectEdge/scope_outer.exp.json b/testdata/d2oracle/TestReconnectEdge/scope_outer.exp.json index 308ff56f2..7d974c12b 100644 --- a/testdata/d2oracle/TestReconnectEdge/scope_outer.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/scope_outer.exp.json @@ -158,9 +158,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -191,9 +189,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -240,9 +236,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -287,9 +281,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -365,9 +357,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -412,9 +402,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestReconnectEdge/second_index.exp.json b/testdata/d2oracle/TestReconnectEdge/second_index.exp.json index 01d28d1a1..5f52b761f 100644 --- a/testdata/d2oracle/TestReconnectEdge/second_index.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/second_index.exp.json @@ -241,9 +241,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -278,9 +276,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -314,9 +310,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -383,9 +377,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -430,9 +422,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -497,9 +487,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestReconnectEdge/src.exp.json b/testdata/d2oracle/TestReconnectEdge/src.exp.json index c7177e566..9dfbcdefe 100644 --- a/testdata/d2oracle/TestReconnectEdge/src.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/src.exp.json @@ -141,9 +141,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -174,9 +172,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -223,9 +219,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -290,9 +284,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -357,9 +349,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestRename/arrows.exp.json b/testdata/d2oracle/TestRename/arrows.exp.json index 067a3c7c0..a21353e07 100644 --- a/testdata/d2oracle/TestRename/arrows.exp.json +++ b/testdata/d2oracle/TestRename/arrows.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -105,9 +103,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -154,9 +150,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -201,9 +195,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestRename/arrows_chain.exp.json b/testdata/d2oracle/TestRename/arrows_chain.exp.json index 379f15249..f3ccd7a27 100644 --- a/testdata/d2oracle/TestRename/arrows_chain.exp.json +++ b/testdata/d2oracle/TestRename/arrows_chain.exp.json @@ -146,9 +146,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -179,9 +177,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -211,9 +207,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -243,9 +237,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -292,9 +284,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -359,9 +349,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -426,9 +414,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -473,9 +459,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestRename/arrows_complex.exp.json b/testdata/d2oracle/TestRename/arrows_complex.exp.json index 6cca60a8d..9d5616878 100644 --- a/testdata/d2oracle/TestRename/arrows_complex.exp.json +++ b/testdata/d2oracle/TestRename/arrows_complex.exp.json @@ -126,9 +126,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -159,9 +157,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -219,9 +215,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -277,9 +271,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -324,9 +316,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -371,9 +361,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestRename/arrows_trim_common.exp.json b/testdata/d2oracle/TestRename/arrows_trim_common.exp.json index 29de1a2e5..eb75e2e55 100644 --- a/testdata/d2oracle/TestRename/arrows_trim_common.exp.json +++ b/testdata/d2oracle/TestRename/arrows_trim_common.exp.json @@ -162,9 +162,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -195,9 +193,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -227,9 +223,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -259,9 +253,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -308,9 +300,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -355,9 +345,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -422,9 +410,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -489,9 +475,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -536,9 +520,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json b/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json index 66322ba2c..ab086e248 100644 --- a/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json +++ b/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json @@ -212,9 +212,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -245,9 +243,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -277,9 +273,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -309,9 +303,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -524,9 +516,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -582,9 +572,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -671,9 +659,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -760,9 +746,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -818,9 +802,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestRename/complex_edge_1.exp.json b/testdata/d2oracle/TestRename/complex_edge_1.exp.json index d86bd9aa6..3446d9da4 100644 --- a/testdata/d2oracle/TestRename/complex_edge_1.exp.json +++ b/testdata/d2oracle/TestRename/complex_edge_1.exp.json @@ -126,9 +126,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -159,9 +157,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -219,9 +215,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -277,9 +271,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -324,9 +316,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -371,9 +361,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestRename/complex_edge_2.exp.json b/testdata/d2oracle/TestRename/complex_edge_2.exp.json index 214be7198..43ca3dd0d 100644 --- a/testdata/d2oracle/TestRename/complex_edge_2.exp.json +++ b/testdata/d2oracle/TestRename/complex_edge_2.exp.json @@ -126,9 +126,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -159,9 +157,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -219,9 +215,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -277,9 +271,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -324,9 +316,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -371,9 +361,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestRename/conflict.exp.json b/testdata/d2oracle/TestRename/conflict.exp.json index bda1da047..c882e1f56 100644 --- a/testdata/d2oracle/TestRename/conflict.exp.json +++ b/testdata/d2oracle/TestRename/conflict.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -121,9 +119,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -168,9 +164,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestRename/conflict_2.exp.json b/testdata/d2oracle/TestRename/conflict_2.exp.json index 9c96a107d..598ec3077 100644 --- a/testdata/d2oracle/TestRename/conflict_2.exp.json +++ b/testdata/d2oracle/TestRename/conflict_2.exp.json @@ -123,9 +123,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -194,9 +192,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -263,9 +259,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -332,9 +326,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -379,9 +371,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -426,9 +416,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestRename/conflict_with_dots.exp.json b/testdata/d2oracle/TestRename/conflict_with_dots.exp.json index 09834764a..229aff72e 100644 --- a/testdata/d2oracle/TestRename/conflict_with_dots.exp.json +++ b/testdata/d2oracle/TestRename/conflict_with_dots.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -121,9 +119,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -168,9 +164,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestRename/conflict_with_numbers.exp.json b/testdata/d2oracle/TestRename/conflict_with_numbers.exp.json index 73c080df8..85b87e0db 100644 --- a/testdata/d2oracle/TestRename/conflict_with_numbers.exp.json +++ b/testdata/d2oracle/TestRename/conflict_with_numbers.exp.json @@ -72,9 +72,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -121,9 +119,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -168,9 +164,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestRename/container.exp.json b/testdata/d2oracle/TestRename/container.exp.json index 36bdd6aa4..1d4593223 100644 --- a/testdata/d2oracle/TestRename/container.exp.json +++ b/testdata/d2oracle/TestRename/container.exp.json @@ -751,9 +751,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -787,9 +785,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -819,9 +815,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -851,9 +845,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -883,9 +875,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -915,9 +905,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -947,9 +935,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -979,9 +965,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -1269,9 +1253,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1557,9 +1539,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1834,9 +1814,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1954,9 +1932,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -2074,9 +2050,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -2163,9 +2137,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -2252,9 +2224,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -2299,9 +2269,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -2366,9 +2334,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -2413,9 +2379,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -2460,9 +2424,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -2529,9 +2491,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -2598,9 +2558,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -2667,9 +2625,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -2725,9 +2681,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -2783,9 +2737,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestRename/edges.exp.json b/testdata/d2oracle/TestRename/edges.exp.json index 477c5dad0..6e5ab0650 100644 --- a/testdata/d2oracle/TestRename/edges.exp.json +++ b/testdata/d2oracle/TestRename/edges.exp.json @@ -416,9 +416,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -449,9 +447,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -481,9 +477,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -513,9 +507,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -545,9 +537,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -577,9 +567,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -609,9 +597,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -782,9 +768,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -973,9 +957,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1062,9 +1044,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1151,9 +1131,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1240,9 +1218,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1329,9 +1305,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1376,9 +1350,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -1443,9 +1415,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestRename/flat.exp.json b/testdata/d2oracle/TestRename/flat.exp.json index f8921a5c2..028991927 100644 --- a/testdata/d2oracle/TestRename/flat.exp.json +++ b/testdata/d2oracle/TestRename/flat.exp.json @@ -49,9 +49,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -98,9 +96,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestRename/generated-conflict.exp.json b/testdata/d2oracle/TestRename/generated-conflict.exp.json new file mode 100644 index 000000000..c47aae643 --- /dev/null +++ b/testdata/d2oracle/TestRename/generated-conflict.exp.json @@ -0,0 +1,174 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2oracle/TestRename/generated-conflict.d2,0:0:0-2:0:16", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2oracle/TestRename/generated-conflict.d2,0:0:0-0:6:6", + "key": { + "range": "d2/testdata/d2oracle/TestRename/generated-conflict.d2,0:0:0-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestRename/generated-conflict.d2,0:0:0-0:6:6", + "value": [ + { + "string": "Square", + "raw_string": "Square" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": "d2/testdata/d2oracle/TestRename/generated-conflict.d2,1:0:7-1:8:15", + "key": { + "range": "d2/testdata/d2oracle/TestRename/generated-conflict.d2,1:0:7-1:8:15", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestRename/generated-conflict.d2,1:0:7-1:8:15", + "value": [ + { + "string": "Square 2", + "raw_string": "Square 2" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "Square", + "id_val": "Square", + "references": [ + { + "key": { + "range": "d2/testdata/d2oracle/TestRename/generated-conflict.d2,0:0:0-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestRename/generated-conflict.d2,0:0:0-0:6:6", + "value": [ + { + "string": "Square", + "raw_string": "Square" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "Square" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "Square 2", + "id_val": "Square 2", + "references": [ + { + "key": { + "range": "d2/testdata/d2oracle/TestRename/generated-conflict.d2,1:0:7-1:8:15", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestRename/generated-conflict.d2,1:0:7-1:8:15", + "value": [ + { + "string": "Square 2", + "raw_string": "Square 2" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "Square 2" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "err": "" +} diff --git a/testdata/d2oracle/TestRename/generated.exp.json b/testdata/d2oracle/TestRename/generated.exp.json index 443c2a35e..7d2554939 100644 --- a/testdata/d2oracle/TestRename/generated.exp.json +++ b/testdata/d2oracle/TestRename/generated.exp.json @@ -49,9 +49,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -98,9 +96,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestRename/near.exp.json b/testdata/d2oracle/TestRename/near.exp.json index ad56cf423..7c7ddf563 100644 --- a/testdata/d2oracle/TestRename/near.exp.json +++ b/testdata/d2oracle/TestRename/near.exp.json @@ -111,9 +111,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -175,9 +173,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -222,9 +218,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestRename/nested.exp.json b/testdata/d2oracle/TestRename/nested.exp.json index 6f86026d7..9c0a5f917 100644 --- a/testdata/d2oracle/TestRename/nested.exp.json +++ b/testdata/d2oracle/TestRename/nested.exp.json @@ -178,9 +178,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -324,9 +322,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -468,9 +464,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -612,9 +606,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -756,9 +748,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -867,9 +857,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/base.exp.json b/testdata/d2oracle/TestSet/base.exp.json index f7f02cc90..18dbe52f0 100644 --- a/testdata/d2oracle/TestSet/base.exp.json +++ b/testdata/d2oracle/TestSet/base.exp.json @@ -49,9 +49,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -98,9 +96,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/block_string_multiline.exp.json b/testdata/d2oracle/TestSet/block_string_multiline.exp.json index 700fc13d6..b42981de5 100644 --- a/testdata/d2oracle/TestSet/block_string_multiline.exp.json +++ b/testdata/d2oracle/TestSet/block_string_multiline.exp.json @@ -56,9 +56,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -106,9 +104,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/block_string_oneline.exp.json b/testdata/d2oracle/TestSet/block_string_oneline.exp.json index 4e6c158d4..2324b55be 100644 --- a/testdata/d2oracle/TestSet/block_string_oneline.exp.json +++ b/testdata/d2oracle/TestSet/block_string_oneline.exp.json @@ -56,9 +56,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -106,9 +104,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/classes-style.exp.json b/testdata/d2oracle/TestSet/classes-style.exp.json index 071158f8b..a99073d1f 100644 --- a/testdata/d2oracle/TestSet/classes-style.exp.json +++ b/testdata/d2oracle/TestSet/classes-style.exp.json @@ -227,9 +227,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -333,9 +331,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - }, + "constraint": null, "classes": [ "a" ] diff --git a/testdata/d2oracle/TestSet/dupe-classes-style.exp.json b/testdata/d2oracle/TestSet/dupe-classes-style.exp.json index ff1f7db7c..9c74249a8 100644 --- a/testdata/d2oracle/TestSet/dupe-classes-style.exp.json +++ b/testdata/d2oracle/TestSet/dupe-classes-style.exp.json @@ -227,9 +227,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -333,9 +331,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - }, + "constraint": null, "classes": [ "a" ] diff --git a/testdata/d2oracle/TestSet/edge.exp.json b/testdata/d2oracle/TestSet/edge.exp.json index 8df095e63..f9568af91 100644 --- a/testdata/d2oracle/TestSet/edge.exp.json +++ b/testdata/d2oracle/TestSet/edge.exp.json @@ -82,9 +82,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -115,9 +113,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -164,9 +160,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -211,9 +205,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/edge_append_style.exp.json b/testdata/d2oracle/TestSet/edge_append_style.exp.json index c324ca764..a215df715 100644 --- a/testdata/d2oracle/TestSet/edge_append_style.exp.json +++ b/testdata/d2oracle/TestSet/edge_append_style.exp.json @@ -117,9 +117,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -154,9 +152,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -203,9 +199,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -250,9 +244,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/edge_chain.exp.json b/testdata/d2oracle/TestSet/edge_chain.exp.json index 3f362e132..e36df946d 100644 --- a/testdata/d2oracle/TestSet/edge_chain.exp.json +++ b/testdata/d2oracle/TestSet/edge_chain.exp.json @@ -209,9 +209,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -245,9 +243,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -277,9 +273,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -326,9 +320,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -393,9 +385,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -480,9 +470,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -527,9 +515,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json b/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json index c4288de67..193d30de7 100644 --- a/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json +++ b/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json @@ -192,9 +192,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -232,9 +230,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -264,9 +260,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -333,9 +327,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -420,9 +412,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -467,9 +457,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json b/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json index a4ddf5104..e688fa412 100644 --- a/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json +++ b/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json @@ -276,9 +276,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -309,9 +307,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -354,9 +350,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -403,9 +397,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -510,9 +502,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -597,9 +587,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json b/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json index 3b0df7ec8..3bd0f42a8 100644 --- a/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json +++ b/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json @@ -232,9 +232,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -272,9 +270,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -304,9 +300,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -353,9 +347,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -420,9 +412,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -507,9 +497,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -554,9 +542,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.exp.json b/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.exp.json index 982c8f52f..fe8208050 100644 --- a/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.exp.json +++ b/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.exp.json @@ -197,9 +197,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -225,9 +223,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "references": [ { @@ -253,9 +249,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -285,9 +279,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -354,9 +346,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -441,9 +431,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -488,9 +476,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/edge_index_case.exp.json b/testdata/d2oracle/TestSet/edge_index_case.exp.json index 434ccaca1..d1eb8f9c3 100644 --- a/testdata/d2oracle/TestSet/edge_index_case.exp.json +++ b/testdata/d2oracle/TestSet/edge_index_case.exp.json @@ -186,9 +186,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -219,9 +217,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -251,9 +247,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -300,9 +294,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -347,9 +339,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -394,9 +384,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -441,9 +429,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -488,9 +474,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -535,9 +519,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/edge_index_merge_style.exp.json b/testdata/d2oracle/TestSet/edge_index_merge_style.exp.json index 1cb85fb45..c9a5de043 100644 --- a/testdata/d2oracle/TestSet/edge_index_merge_style.exp.json +++ b/testdata/d2oracle/TestSet/edge_index_merge_style.exp.json @@ -193,9 +193,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -233,9 +231,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -265,9 +261,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -334,9 +328,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -421,9 +413,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -468,9 +458,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/edge_index_nested.exp.json b/testdata/d2oracle/TestSet/edge_index_nested.exp.json index 6088fdc6c..1abf22a57 100644 --- a/testdata/d2oracle/TestSet/edge_index_nested.exp.json +++ b/testdata/d2oracle/TestSet/edge_index_nested.exp.json @@ -111,9 +111,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -144,9 +142,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -193,9 +189,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -240,9 +234,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -287,9 +279,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/edge_key_and_key.exp.json b/testdata/d2oracle/TestSet/edge_key_and_key.exp.json index e3ea5aa72..b2b5df2bc 100644 --- a/testdata/d2oracle/TestSet/edge_key_and_key.exp.json +++ b/testdata/d2oracle/TestSet/edge_key_and_key.exp.json @@ -162,9 +162,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -199,9 +197,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -310,9 +306,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -368,9 +362,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -426,9 +418,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/edge_label.exp.json b/testdata/d2oracle/TestSet/edge_label.exp.json index 5a2dd33c7..bc87c278f 100644 --- a/testdata/d2oracle/TestSet/edge_label.exp.json +++ b/testdata/d2oracle/TestSet/edge_label.exp.json @@ -127,9 +127,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -164,9 +162,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -213,9 +209,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -260,9 +254,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/edge_merge_arrowhead.exp.json b/testdata/d2oracle/TestSet/edge_merge_arrowhead.exp.json index d6ad15df4..e647ebf85 100644 --- a/testdata/d2oracle/TestSet/edge_merge_arrowhead.exp.json +++ b/testdata/d2oracle/TestSet/edge_merge_arrowhead.exp.json @@ -169,9 +169,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -197,9 +195,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "references": [ { @@ -222,9 +218,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -271,9 +265,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -318,9 +310,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/edge_merge_style.exp.json b/testdata/d2oracle/TestSet/edge_merge_style.exp.json index 2aecd568d..dd6f28c99 100644 --- a/testdata/d2oracle/TestSet/edge_merge_style.exp.json +++ b/testdata/d2oracle/TestSet/edge_merge_style.exp.json @@ -164,9 +164,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -204,9 +202,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -253,9 +249,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -300,9 +294,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json b/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json index e874b047b..64f975592 100644 --- a/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json +++ b/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json @@ -111,9 +111,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -144,9 +142,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -193,9 +189,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -240,9 +234,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -287,9 +279,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json b/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json index 83bf4d56a..cddd2cccb 100644 --- a/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json +++ b/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json @@ -157,9 +157,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -194,9 +192,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -243,9 +239,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -290,9 +284,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -337,9 +329,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/edge_replace_arrowhead.exp.json b/testdata/d2oracle/TestSet/edge_replace_arrowhead.exp.json index 3c28a1fc9..88538296c 100644 --- a/testdata/d2oracle/TestSet/edge_replace_arrowhead.exp.json +++ b/testdata/d2oracle/TestSet/edge_replace_arrowhead.exp.json @@ -122,9 +122,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -150,9 +148,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "references": [ { @@ -175,9 +171,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -224,9 +218,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -271,9 +263,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.exp.json b/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.exp.json index b08a28eb2..7b3b4168a 100644 --- a/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.exp.json +++ b/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.exp.json @@ -160,9 +160,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -188,9 +186,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "references": [ { @@ -216,9 +212,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -285,9 +279,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -352,9 +344,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/edge_set_arrowhead.exp.json b/testdata/d2oracle/TestSet/edge_set_arrowhead.exp.json index 8226eb193..4a3477968 100644 --- a/testdata/d2oracle/TestSet/edge_set_arrowhead.exp.json +++ b/testdata/d2oracle/TestSet/edge_set_arrowhead.exp.json @@ -122,9 +122,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -150,9 +148,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "references": [ { @@ -175,9 +171,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -224,9 +218,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -271,9 +263,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/expanded_map_style.exp.json b/testdata/d2oracle/TestSet/expanded_map_style.exp.json index b8718f550..cd0111b35 100644 --- a/testdata/d2oracle/TestSet/expanded_map_style.exp.json +++ b/testdata/d2oracle/TestSet/expanded_map_style.exp.json @@ -113,9 +113,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -166,9 +164,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/icon.exp.json b/testdata/d2oracle/TestSet/icon.exp.json index 27313b236..ab79c0a72 100644 --- a/testdata/d2oracle/TestSet/icon.exp.json +++ b/testdata/d2oracle/TestSet/icon.exp.json @@ -88,9 +88,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -150,9 +148,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/inline_style.exp.json b/testdata/d2oracle/TestSet/inline_style.exp.json index a64c0d449..032b0654e 100644 --- a/testdata/d2oracle/TestSet/inline_style.exp.json +++ b/testdata/d2oracle/TestSet/inline_style.exp.json @@ -139,9 +139,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -195,9 +193,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/label.exp.json b/testdata/d2oracle/TestSet/label.exp.json index c6f1534ec..b091d0d7e 100644 --- a/testdata/d2oracle/TestSet/label.exp.json +++ b/testdata/d2oracle/TestSet/label.exp.json @@ -59,9 +59,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -108,9 +106,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/label_primary.exp.json b/testdata/d2oracle/TestSet/label_primary.exp.json index 0bbe3fd12..612f2cff8 100644 --- a/testdata/d2oracle/TestSet/label_primary.exp.json +++ b/testdata/d2oracle/TestSet/label_primary.exp.json @@ -107,9 +107,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -140,9 +138,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -189,9 +185,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -236,9 +230,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -283,9 +275,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/label_replace.exp.json b/testdata/d2oracle/TestSet/label_replace.exp.json index 81e138012..976aa222f 100644 --- a/testdata/d2oracle/TestSet/label_replace.exp.json +++ b/testdata/d2oracle/TestSet/label_replace.exp.json @@ -59,9 +59,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -108,9 +106,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/label_unset.exp.json b/testdata/d2oracle/TestSet/label_unset.exp.json index dc2d78f06..c1cd12102 100644 --- a/testdata/d2oracle/TestSet/label_unset.exp.json +++ b/testdata/d2oracle/TestSet/label_unset.exp.json @@ -49,9 +49,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -98,9 +96,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/map_key_missing.exp.json b/testdata/d2oracle/TestSet/map_key_missing.exp.json index 99d831ce6..e26a74490 100644 --- a/testdata/d2oracle/TestSet/map_key_missing.exp.json +++ b/testdata/d2oracle/TestSet/map_key_missing.exp.json @@ -105,9 +105,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -138,9 +136,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -207,9 +203,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -254,9 +248,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/nested_alex.exp.json b/testdata/d2oracle/TestSet/nested_alex.exp.json index d3915f665..97bb445e0 100644 --- a/testdata/d2oracle/TestSet/nested_alex.exp.json +++ b/testdata/d2oracle/TestSet/nested_alex.exp.json @@ -177,9 +177,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -210,9 +208,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -259,9 +255,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -306,9 +300,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -373,9 +365,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/new_style.exp.json b/testdata/d2oracle/TestSet/new_style.exp.json index e9bc5e329..4a8400833 100644 --- a/testdata/d2oracle/TestSet/new_style.exp.json +++ b/testdata/d2oracle/TestSet/new_style.exp.json @@ -95,9 +95,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -148,9 +146,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/replace_arrowhead.exp.json b/testdata/d2oracle/TestSet/replace_arrowhead.exp.json index 281b69376..9870e4e34 100644 --- a/testdata/d2oracle/TestSet/replace_arrowhead.exp.json +++ b/testdata/d2oracle/TestSet/replace_arrowhead.exp.json @@ -122,9 +122,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -150,9 +148,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "references": [ { @@ -175,9 +171,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -224,9 +218,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -271,9 +263,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/replace_arrowhead_map.exp.json b/testdata/d2oracle/TestSet/replace_arrowhead_map.exp.json index 95bf7af10..2c26e580a 100644 --- a/testdata/d2oracle/TestSet/replace_arrowhead_map.exp.json +++ b/testdata/d2oracle/TestSet/replace_arrowhead_map.exp.json @@ -140,9 +140,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -168,9 +166,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "references": [ { @@ -193,9 +189,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -242,9 +236,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -289,9 +281,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/replace_dimensions.exp.json b/testdata/d2oracle/TestSet/replace_dimensions.exp.json index 6a0be1d47..892cd96b3 100644 --- a/testdata/d2oracle/TestSet/replace_dimensions.exp.json +++ b/testdata/d2oracle/TestSet/replace_dimensions.exp.json @@ -84,9 +84,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -136,9 +134,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/replace_edge_style.exp.json b/testdata/d2oracle/TestSet/replace_edge_style.exp.json index 564ae1188..6704cc4f9 100644 --- a/testdata/d2oracle/TestSet/replace_edge_style.exp.json +++ b/testdata/d2oracle/TestSet/replace_edge_style.exp.json @@ -158,9 +158,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -198,9 +196,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -247,9 +243,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -294,9 +288,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/replace_edge_style_map.exp.json b/testdata/d2oracle/TestSet/replace_edge_style_map.exp.json index de3a4e806..97d772826 100644 --- a/testdata/d2oracle/TestSet/replace_edge_style_map.exp.json +++ b/testdata/d2oracle/TestSet/replace_edge_style_map.exp.json @@ -136,9 +136,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -173,9 +171,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } @@ -222,9 +218,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -269,9 +263,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/replace_fill_pattern.exp.json b/testdata/d2oracle/TestSet/replace_fill_pattern.exp.json index d2d83494e..e85fb417b 100644 --- a/testdata/d2oracle/TestSet/replace_fill_pattern.exp.json +++ b/testdata/d2oracle/TestSet/replace_fill_pattern.exp.json @@ -99,9 +99,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -152,9 +150,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/replace_link.exp.json b/testdata/d2oracle/TestSet/replace_link.exp.json index 3667dd92e..e6ac31625 100644 --- a/testdata/d2oracle/TestSet/replace_link.exp.json +++ b/testdata/d2oracle/TestSet/replace_link.exp.json @@ -88,9 +88,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -140,9 +138,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/replace_position.exp.json b/testdata/d2oracle/TestSet/replace_position.exp.json index e68e99b04..464357f3e 100644 --- a/testdata/d2oracle/TestSet/replace_position.exp.json +++ b/testdata/d2oracle/TestSet/replace_position.exp.json @@ -142,9 +142,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -200,9 +198,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/replace_shape.exp.json b/testdata/d2oracle/TestSet/replace_shape.exp.json index 93089429f..9fa391b04 100644 --- a/testdata/d2oracle/TestSet/replace_shape.exp.json +++ b/testdata/d2oracle/TestSet/replace_shape.exp.json @@ -70,9 +70,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -130,9 +128,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/replace_style.exp.json b/testdata/d2oracle/TestSet/replace_style.exp.json index 424697d3c..47a623194 100644 --- a/testdata/d2oracle/TestSet/replace_style.exp.json +++ b/testdata/d2oracle/TestSet/replace_style.exp.json @@ -77,9 +77,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -152,9 +150,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/replace_style_edgecase.exp.json b/testdata/d2oracle/TestSet/replace_style_edgecase.exp.json index 346ff1af8..197c9461b 100644 --- a/testdata/d2oracle/TestSet/replace_style_edgecase.exp.json +++ b/testdata/d2oracle/TestSet/replace_style_edgecase.exp.json @@ -132,9 +132,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -252,9 +250,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/replace_tooltip.exp.json b/testdata/d2oracle/TestSet/replace_tooltip.exp.json index 8d47cd42c..c1490dc89 100644 --- a/testdata/d2oracle/TestSet/replace_tooltip.exp.json +++ b/testdata/d2oracle/TestSet/replace_tooltip.exp.json @@ -88,9 +88,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -140,9 +138,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/set_dimensions.exp.json b/testdata/d2oracle/TestSet/set_dimensions.exp.json index db12c96e6..548d0f7b7 100644 --- a/testdata/d2oracle/TestSet/set_dimensions.exp.json +++ b/testdata/d2oracle/TestSet/set_dimensions.exp.json @@ -84,9 +84,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -136,9 +134,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/set_fill_pattern.exp.json b/testdata/d2oracle/TestSet/set_fill_pattern.exp.json index 9ff9cb5a7..476a81bc1 100644 --- a/testdata/d2oracle/TestSet/set_fill_pattern.exp.json +++ b/testdata/d2oracle/TestSet/set_fill_pattern.exp.json @@ -99,9 +99,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -152,9 +150,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/set_position.exp.json b/testdata/d2oracle/TestSet/set_position.exp.json index 8775bfb56..699f78ae8 100644 --- a/testdata/d2oracle/TestSet/set_position.exp.json +++ b/testdata/d2oracle/TestSet/set_position.exp.json @@ -84,9 +84,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -136,9 +134,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/set_tooltip.exp.json b/testdata/d2oracle/TestSet/set_tooltip.exp.json index 2f31cdc22..a832f994d 100644 --- a/testdata/d2oracle/TestSet/set_tooltip.exp.json +++ b/testdata/d2oracle/TestSet/set_tooltip.exp.json @@ -88,9 +88,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -140,9 +138,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/shape.exp.json b/testdata/d2oracle/TestSet/shape.exp.json index 885841e55..bd4bedb40 100644 --- a/testdata/d2oracle/TestSet/shape.exp.json +++ b/testdata/d2oracle/TestSet/shape.exp.json @@ -88,9 +88,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -137,9 +135,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/shape_nested_style_set.exp.json b/testdata/d2oracle/TestSet/shape_nested_style_set.exp.json index 8700cd586..25e8aeedb 100644 --- a/testdata/d2oracle/TestSet/shape_nested_style_set.exp.json +++ b/testdata/d2oracle/TestSet/shape_nested_style_set.exp.json @@ -95,9 +95,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -148,9 +146,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/unapplied-classes-style-2.exp.json b/testdata/d2oracle/TestSet/unapplied-classes-style-2.exp.json index b60ab7a67..fce9058ea 100644 --- a/testdata/d2oracle/TestSet/unapplied-classes-style-2.exp.json +++ b/testdata/d2oracle/TestSet/unapplied-classes-style-2.exp.json @@ -201,9 +201,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -254,9 +252,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2oracle/TestSet/unapplied-classes-style.exp.json b/testdata/d2oracle/TestSet/unapplied-classes-style.exp.json index bc1700429..b7ac7a166 100644 --- a/testdata/d2oracle/TestSet/unapplied-classes-style.exp.json +++ b/testdata/d2oracle/TestSet/unapplied-classes-style.exp.json @@ -183,9 +183,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -258,9 +256,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }