diff --git a/ci/release/changelogs/next.md b/ci/release/changelogs/next.md index d38d71c61..d328fe420 100644 --- a/ci/release/changelogs/next.md +++ b/ci/release/changelogs/next.md @@ -8,6 +8,7 @@ - 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. [#1245](https://github.com/terrastruct/d2/pull/1245) #### Bugfixes ⛑️ diff --git a/d2compiler/compile.go b/d2compiler/compile.go index 2e85a27be..661f697f0 100644 --- a/d2compiler/compile.go +++ b/d2compiler/compile.go @@ -310,8 +310,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 } @@ -412,8 +431,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 { @@ -480,17 +498,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": } @@ -784,11 +792,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 3a73a9b08..985050a83 100644 --- a/d2compiler/compile_test.go +++ b/d2compiler/compile_test.go @@ -2170,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", diff --git a/d2graph/d2graph.go b/d2graph/d2graph.go index 57f135d57..5cccdaf07 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"` @@ -1037,9 +1037,11 @@ func (obj *Object) GetDefaultSize(mtexts []*d2target.MText, ruler *textmeasure.R } maxTypeWidth = go2.Max(maxTypeWidth, typeDims.Width) - if c.Constraint != "" { - // covers UNQ constraint with padding - constraintWidth = 60 + if l := len(c.Constraint); l > 0 { + // 60 covers UNQ constraint with padding, 40 for further constraints covers UNQ + comma + space + if newWidth := 60 + 40*(l-1); newWidth > constraintWidth { + constraintWidth = newWidth + } } } diff --git a/d2renderers/d2sketch/testdata/class_and_sqlTable_border_radius/sketch.exp.svg b/d2renderers/d2sketch/testdata/class_and_sqlTable_border_radius/sketch.exp.svg index 39ac09ab7..d7640b75f 100644 --- a/d2renderers/d2sketch/testdata/class_and_sqlTable_border_radius/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/class_and_sqlTable_border_radius/sketch.exp.svg @@ -1,16 +1,16 @@ - + .d2-3181790551 .fill-N1{fill:#0A0F25;} + .d2-3181790551 .fill-N2{fill:#676C7E;} + .d2-3181790551 .fill-N3{fill:#9499AB;} + .d2-3181790551 .fill-N4{fill:#CFD2DD;} + .d2-3181790551 .fill-N5{fill:#DEE1EB;} + .d2-3181790551 .fill-N6{fill:#EEF1F8;} + .d2-3181790551 .fill-N7{fill:#FFFFFF;} + .d2-3181790551 .fill-B1{fill:#0D32B2;} + .d2-3181790551 .fill-B2{fill:#0D32B2;} + .d2-3181790551 .fill-B3{fill:#E3E9FD;} + .d2-3181790551 .fill-B4{fill:#E3E9FD;} + .d2-3181790551 .fill-B5{fill:#EDF0FD;} + .d2-3181790551 .fill-B6{fill:#F7F8FE;} + .d2-3181790551 .fill-AA2{fill:#4A6FF3;} + .d2-3181790551 .fill-AA4{fill:#EDF0FD;} + .d2-3181790551 .fill-AA5{fill:#F7F8FE;} + .d2-3181790551 .fill-AB4{fill:#EDF0FD;} + .d2-3181790551 .fill-AB5{fill:#F7F8FE;} + .d2-3181790551 .stroke-N1{stroke:#0A0F25;} + .d2-3181790551 .stroke-N2{stroke:#676C7E;} + .d2-3181790551 .stroke-N3{stroke:#9499AB;} + .d2-3181790551 .stroke-N4{stroke:#CFD2DD;} + .d2-3181790551 .stroke-N5{stroke:#DEE1EB;} + .d2-3181790551 .stroke-N6{stroke:#EEF1F8;} + .d2-3181790551 .stroke-N7{stroke:#FFFFFF;} + .d2-3181790551 .stroke-B1{stroke:#0D32B2;} + .d2-3181790551 .stroke-B2{stroke:#0D32B2;} + .d2-3181790551 .stroke-B3{stroke:#E3E9FD;} + .d2-3181790551 .stroke-B4{stroke:#E3E9FD;} + .d2-3181790551 .stroke-B5{stroke:#EDF0FD;} + .d2-3181790551 .stroke-B6{stroke:#F7F8FE;} + .d2-3181790551 .stroke-AA2{stroke:#4A6FF3;} + .d2-3181790551 .stroke-AA4{stroke:#EDF0FD;} + .d2-3181790551 .stroke-AA5{stroke:#F7F8FE;} + .d2-3181790551 .stroke-AB4{stroke:#EDF0FD;} + .d2-3181790551 .stroke-AB5{stroke:#F7F8FE;} + .d2-3181790551 .background-color-N1{background-color:#0A0F25;} + .d2-3181790551 .background-color-N2{background-color:#676C7E;} + .d2-3181790551 .background-color-N3{background-color:#9499AB;} + .d2-3181790551 .background-color-N4{background-color:#CFD2DD;} + .d2-3181790551 .background-color-N5{background-color:#DEE1EB;} + .d2-3181790551 .background-color-N6{background-color:#EEF1F8;} + .d2-3181790551 .background-color-N7{background-color:#FFFFFF;} + .d2-3181790551 .background-color-B1{background-color:#0D32B2;} + .d2-3181790551 .background-color-B2{background-color:#0D32B2;} + .d2-3181790551 .background-color-B3{background-color:#E3E9FD;} + .d2-3181790551 .background-color-B4{background-color:#E3E9FD;} + .d2-3181790551 .background-color-B5{background-color:#EDF0FD;} + .d2-3181790551 .background-color-B6{background-color:#F7F8FE;} + .d2-3181790551 .background-color-AA2{background-color:#4A6FF3;} + .d2-3181790551 .background-color-AA4{background-color:#EDF0FD;} + .d2-3181790551 .background-color-AA5{background-color:#F7F8FE;} + .d2-3181790551 .background-color-AB4{background-color:#EDF0FD;} + .d2-3181790551 .background-color-AB5{background-color:#F7F8FE;} + .d2-3181790551 .color-N1{color:#0A0F25;} + .d2-3181790551 .color-N2{color:#676C7E;} + .d2-3181790551 .color-N3{color:#9499AB;} + .d2-3181790551 .color-N4{color:#CFD2DD;} + .d2-3181790551 .color-N5{color:#DEE1EB;} + .d2-3181790551 .color-N6{color:#EEF1F8;} + .d2-3181790551 .color-N7{color:#FFFFFF;} + .d2-3181790551 .color-B1{color:#0D32B2;} + .d2-3181790551 .color-B2{color:#0D32B2;} + .d2-3181790551 .color-B3{color:#E3E9FD;} + .d2-3181790551 .color-B4{color:#E3E9FD;} + .d2-3181790551 .color-B5{color:#EDF0FD;} + .d2-3181790551 .color-B6{color:#F7F8FE;} + .d2-3181790551 .color-AA2{color:#4A6FF3;} + .d2-3181790551 .color-AA4{color:#EDF0FD;} + .d2-3181790551 .color-AA5{color:#F7F8FE;} + .d2-3181790551 .color-AB4{color:#EDF0FD;} + .d2-3181790551 .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/opacity/sketch.exp.svg b/d2renderers/d2sketch/testdata/opacity/sketch.exp.svg index d7bdd1a13..0bd69edd7 100644 --- a/d2renderers/d2sketch/testdata/opacity/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/opacity/sketch.exp.svg @@ -1,27 +1,27 @@ - @@ -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 96345685e..75cdd729b 100644 --- a/d2renderers/d2sketch/testdata/opacity_dark/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/opacity_dark/sketch.exp.svg @@ -1,27 +1,27 @@ - @@ -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/sql_tables/sketch.exp.svg b/d2renderers/d2sketch/testdata/sql_tables/sketch.exp.svg index 9f5f94909..56ec37a37 100644 --- a/d2renderers/d2sketch/testdata/sql_tables/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/sql_tables/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-456305260 .fill-N1{fill:#0A0F25;} + .d2-456305260 .fill-N2{fill:#676C7E;} + .d2-456305260 .fill-N3{fill:#9499AB;} + .d2-456305260 .fill-N4{fill:#CFD2DD;} + .d2-456305260 .fill-N5{fill:#DEE1EB;} + .d2-456305260 .fill-N6{fill:#EEF1F8;} + .d2-456305260 .fill-N7{fill:#FFFFFF;} + .d2-456305260 .fill-B1{fill:#0D32B2;} + .d2-456305260 .fill-B2{fill:#0D32B2;} + .d2-456305260 .fill-B3{fill:#E3E9FD;} + .d2-456305260 .fill-B4{fill:#E3E9FD;} + .d2-456305260 .fill-B5{fill:#EDF0FD;} + .d2-456305260 .fill-B6{fill:#F7F8FE;} + .d2-456305260 .fill-AA2{fill:#4A6FF3;} + .d2-456305260 .fill-AA4{fill:#EDF0FD;} + .d2-456305260 .fill-AA5{fill:#F7F8FE;} + .d2-456305260 .fill-AB4{fill:#EDF0FD;} + .d2-456305260 .fill-AB5{fill:#F7F8FE;} + .d2-456305260 .stroke-N1{stroke:#0A0F25;} + .d2-456305260 .stroke-N2{stroke:#676C7E;} + .d2-456305260 .stroke-N3{stroke:#9499AB;} + .d2-456305260 .stroke-N4{stroke:#CFD2DD;} + .d2-456305260 .stroke-N5{stroke:#DEE1EB;} + .d2-456305260 .stroke-N6{stroke:#EEF1F8;} + .d2-456305260 .stroke-N7{stroke:#FFFFFF;} + .d2-456305260 .stroke-B1{stroke:#0D32B2;} + .d2-456305260 .stroke-B2{stroke:#0D32B2;} + .d2-456305260 .stroke-B3{stroke:#E3E9FD;} + .d2-456305260 .stroke-B4{stroke:#E3E9FD;} + .d2-456305260 .stroke-B5{stroke:#EDF0FD;} + .d2-456305260 .stroke-B6{stroke:#F7F8FE;} + .d2-456305260 .stroke-AA2{stroke:#4A6FF3;} + .d2-456305260 .stroke-AA4{stroke:#EDF0FD;} + .d2-456305260 .stroke-AA5{stroke:#F7F8FE;} + .d2-456305260 .stroke-AB4{stroke:#EDF0FD;} + .d2-456305260 .stroke-AB5{stroke:#F7F8FE;} + .d2-456305260 .background-color-N1{background-color:#0A0F25;} + .d2-456305260 .background-color-N2{background-color:#676C7E;} + .d2-456305260 .background-color-N3{background-color:#9499AB;} + .d2-456305260 .background-color-N4{background-color:#CFD2DD;} + .d2-456305260 .background-color-N5{background-color:#DEE1EB;} + .d2-456305260 .background-color-N6{background-color:#EEF1F8;} + .d2-456305260 .background-color-N7{background-color:#FFFFFF;} + .d2-456305260 .background-color-B1{background-color:#0D32B2;} + .d2-456305260 .background-color-B2{background-color:#0D32B2;} + .d2-456305260 .background-color-B3{background-color:#E3E9FD;} + .d2-456305260 .background-color-B4{background-color:#E3E9FD;} + .d2-456305260 .background-color-B5{background-color:#EDF0FD;} + .d2-456305260 .background-color-B6{background-color:#F7F8FE;} + .d2-456305260 .background-color-AA2{background-color:#4A6FF3;} + .d2-456305260 .background-color-AA4{background-color:#EDF0FD;} + .d2-456305260 .background-color-AA5{background-color:#F7F8FE;} + .d2-456305260 .background-color-AB4{background-color:#EDF0FD;} + .d2-456305260 .background-color-AB5{background-color:#F7F8FE;} + .d2-456305260 .color-N1{color:#0A0F25;} + .d2-456305260 .color-N2{color:#676C7E;} + .d2-456305260 .color-N3{color:#9499AB;} + .d2-456305260 .color-N4{color:#CFD2DD;} + .d2-456305260 .color-N5{color:#DEE1EB;} + .d2-456305260 .color-N6{color:#EEF1F8;} + .d2-456305260 .color-N7{color:#FFFFFF;} + .d2-456305260 .color-B1{color:#0D32B2;} + .d2-456305260 .color-B2{color:#0D32B2;} + .d2-456305260 .color-B3{color:#E3E9FD;} + .d2-456305260 .color-B4{color:#E3E9FD;} + .d2-456305260 .color-B5{color:#EDF0FD;} + .d2-456305260 .color-B6{color:#F7F8FE;} + .d2-456305260 .color-AA2{color:#4A6FF3;} + .d2-456305260 .color-AA4{color:#EDF0FD;} + .d2-456305260 .color-AA5{color:#F7F8FE;} + .d2-456305260 .color-AB4{color:#EDF0FD;} + .d2-456305260 .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 641f51c9e..5bcf0a0cf 100644 --- a/d2renderers/d2sketch/testdata/sql_tables_dark/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/sql_tables_dark/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-456305260 .fill-N1{fill:#CDD6F4;} + .d2-456305260 .fill-N2{fill:#BAC2DE;} + .d2-456305260 .fill-N3{fill:#A6ADC8;} + .d2-456305260 .fill-N4{fill:#585B70;} + .d2-456305260 .fill-N5{fill:#45475A;} + .d2-456305260 .fill-N6{fill:#313244;} + .d2-456305260 .fill-N7{fill:#1E1E2E;} + .d2-456305260 .fill-B1{fill:#CBA6f7;} + .d2-456305260 .fill-B2{fill:#CBA6f7;} + .d2-456305260 .fill-B3{fill:#6C7086;} + .d2-456305260 .fill-B4{fill:#585B70;} + .d2-456305260 .fill-B5{fill:#45475A;} + .d2-456305260 .fill-B6{fill:#313244;} + .d2-456305260 .fill-AA2{fill:#f38BA8;} + .d2-456305260 .fill-AA4{fill:#45475A;} + .d2-456305260 .fill-AA5{fill:#313244;} + .d2-456305260 .fill-AB4{fill:#45475A;} + .d2-456305260 .fill-AB5{fill:#313244;} + .d2-456305260 .stroke-N1{stroke:#CDD6F4;} + .d2-456305260 .stroke-N2{stroke:#BAC2DE;} + .d2-456305260 .stroke-N3{stroke:#A6ADC8;} + .d2-456305260 .stroke-N4{stroke:#585B70;} + .d2-456305260 .stroke-N5{stroke:#45475A;} + .d2-456305260 .stroke-N6{stroke:#313244;} + .d2-456305260 .stroke-N7{stroke:#1E1E2E;} + .d2-456305260 .stroke-B1{stroke:#CBA6f7;} + .d2-456305260 .stroke-B2{stroke:#CBA6f7;} + .d2-456305260 .stroke-B3{stroke:#6C7086;} + .d2-456305260 .stroke-B4{stroke:#585B70;} + .d2-456305260 .stroke-B5{stroke:#45475A;} + .d2-456305260 .stroke-B6{stroke:#313244;} + .d2-456305260 .stroke-AA2{stroke:#f38BA8;} + .d2-456305260 .stroke-AA4{stroke:#45475A;} + .d2-456305260 .stroke-AA5{stroke:#313244;} + .d2-456305260 .stroke-AB4{stroke:#45475A;} + .d2-456305260 .stroke-AB5{stroke:#313244;} + .d2-456305260 .background-color-N1{background-color:#CDD6F4;} + .d2-456305260 .background-color-N2{background-color:#BAC2DE;} + .d2-456305260 .background-color-N3{background-color:#A6ADC8;} + .d2-456305260 .background-color-N4{background-color:#585B70;} + .d2-456305260 .background-color-N5{background-color:#45475A;} + .d2-456305260 .background-color-N6{background-color:#313244;} + .d2-456305260 .background-color-N7{background-color:#1E1E2E;} + .d2-456305260 .background-color-B1{background-color:#CBA6f7;} + .d2-456305260 .background-color-B2{background-color:#CBA6f7;} + .d2-456305260 .background-color-B3{background-color:#6C7086;} + .d2-456305260 .background-color-B4{background-color:#585B70;} + .d2-456305260 .background-color-B5{background-color:#45475A;} + .d2-456305260 .background-color-B6{background-color:#313244;} + .d2-456305260 .background-color-AA2{background-color:#f38BA8;} + .d2-456305260 .background-color-AA4{background-color:#45475A;} + .d2-456305260 .background-color-AA5{background-color:#313244;} + .d2-456305260 .background-color-AB4{background-color:#45475A;} + .d2-456305260 .background-color-AB5{background-color:#313244;} + .d2-456305260 .color-N1{color:#CDD6F4;} + .d2-456305260 .color-N2{color:#BAC2DE;} + .d2-456305260 .color-N3{color:#A6ADC8;} + .d2-456305260 .color-N4{color:#585B70;} + .d2-456305260 .color-N5{color:#45475A;} + .d2-456305260 .color-N6{color:#313244;} + .d2-456305260 .color-N7{color:#1E1E2E;} + .d2-456305260 .color-B1{color:#CBA6f7;} + .d2-456305260 .color-B2{color:#CBA6f7;} + .d2-456305260 .color-B3{color:#6C7086;} + .d2-456305260 .color-B4{color:#585B70;} + .d2-456305260 .color-B5{color:#45475A;} + .d2-456305260 .color-B6{color:#313244;} + .d2-456305260 .color-AA2{color:#f38BA8;} + .d2-456305260 .color-AA4{color:#45475A;} + .d2-456305260 .color-AA5{color:#313244;} + .d2-456305260 .color-AB4{color:#45475A;} + .d2-456305260 .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/d2svg/dark_theme/testdata/opacity/dark_theme.exp.svg b/d2renderers/d2svg/dark_theme/testdata/opacity/dark_theme.exp.svg index 6e5e9a169..1a8b468be 100644 --- a/d2renderers/d2svg/dark_theme/testdata/opacity/dark_theme.exp.svg +++ b/d2renderers/d2svg/dark_theme/testdata/opacity/dark_theme.exp.svg @@ -1,27 +1,27 @@ -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/sql_tables/dark_theme.exp.svg b/d2renderers/d2svg/dark_theme/testdata/sql_tables/dark_theme.exp.svg index 4113e95fe..8348b75ca 100644 --- a/d2renderers/d2svg/dark_theme/testdata/sql_tables/dark_theme.exp.svg +++ b/d2renderers/d2svg/dark_theme/testdata/sql_tables/dark_theme.exp.svg @@ -1,9 +1,9 @@ -usersidintnamestringemailstringpasswordstringlast_logindatetimeproductsidintpricedecimalskustringnamestringordersidintuser_idintproduct_idintshipmentsidintorder_idinttracking_numberstringPKstatusstring + .d2-456305260 .fill-N1{fill:#CDD6F4;} + .d2-456305260 .fill-N2{fill:#BAC2DE;} + .d2-456305260 .fill-N3{fill:#A6ADC8;} + .d2-456305260 .fill-N4{fill:#585B70;} + .d2-456305260 .fill-N5{fill:#45475A;} + .d2-456305260 .fill-N6{fill:#313244;} + .d2-456305260 .fill-N7{fill:#1E1E2E;} + .d2-456305260 .fill-B1{fill:#CBA6f7;} + .d2-456305260 .fill-B2{fill:#CBA6f7;} + .d2-456305260 .fill-B3{fill:#6C7086;} + .d2-456305260 .fill-B4{fill:#585B70;} + .d2-456305260 .fill-B5{fill:#45475A;} + .d2-456305260 .fill-B6{fill:#313244;} + .d2-456305260 .fill-AA2{fill:#f38BA8;} + .d2-456305260 .fill-AA4{fill:#45475A;} + .d2-456305260 .fill-AA5{fill:#313244;} + .d2-456305260 .fill-AB4{fill:#45475A;} + .d2-456305260 .fill-AB5{fill:#313244;} + .d2-456305260 .stroke-N1{stroke:#CDD6F4;} + .d2-456305260 .stroke-N2{stroke:#BAC2DE;} + .d2-456305260 .stroke-N3{stroke:#A6ADC8;} + .d2-456305260 .stroke-N4{stroke:#585B70;} + .d2-456305260 .stroke-N5{stroke:#45475A;} + .d2-456305260 .stroke-N6{stroke:#313244;} + .d2-456305260 .stroke-N7{stroke:#1E1E2E;} + .d2-456305260 .stroke-B1{stroke:#CBA6f7;} + .d2-456305260 .stroke-B2{stroke:#CBA6f7;} + .d2-456305260 .stroke-B3{stroke:#6C7086;} + .d2-456305260 .stroke-B4{stroke:#585B70;} + .d2-456305260 .stroke-B5{stroke:#45475A;} + .d2-456305260 .stroke-B6{stroke:#313244;} + .d2-456305260 .stroke-AA2{stroke:#f38BA8;} + .d2-456305260 .stroke-AA4{stroke:#45475A;} + .d2-456305260 .stroke-AA5{stroke:#313244;} + .d2-456305260 .stroke-AB4{stroke:#45475A;} + .d2-456305260 .stroke-AB5{stroke:#313244;} + .d2-456305260 .background-color-N1{background-color:#CDD6F4;} + .d2-456305260 .background-color-N2{background-color:#BAC2DE;} + .d2-456305260 .background-color-N3{background-color:#A6ADC8;} + .d2-456305260 .background-color-N4{background-color:#585B70;} + .d2-456305260 .background-color-N5{background-color:#45475A;} + .d2-456305260 .background-color-N6{background-color:#313244;} + .d2-456305260 .background-color-N7{background-color:#1E1E2E;} + .d2-456305260 .background-color-B1{background-color:#CBA6f7;} + .d2-456305260 .background-color-B2{background-color:#CBA6f7;} + .d2-456305260 .background-color-B3{background-color:#6C7086;} + .d2-456305260 .background-color-B4{background-color:#585B70;} + .d2-456305260 .background-color-B5{background-color:#45475A;} + .d2-456305260 .background-color-B6{background-color:#313244;} + .d2-456305260 .background-color-AA2{background-color:#f38BA8;} + .d2-456305260 .background-color-AA4{background-color:#45475A;} + .d2-456305260 .background-color-AA5{background-color:#313244;} + .d2-456305260 .background-color-AB4{background-color:#45475A;} + .d2-456305260 .background-color-AB5{background-color:#313244;} + .d2-456305260 .color-N1{color:#CDD6F4;} + .d2-456305260 .color-N2{color:#BAC2DE;} + .d2-456305260 .color-N3{color:#A6ADC8;} + .d2-456305260 .color-N4{color:#585B70;} + .d2-456305260 .color-N5{color:#45475A;} + .d2-456305260 .color-N6{color:#313244;} + .d2-456305260 .color-N7{color:#1E1E2E;} + .d2-456305260 .color-B1{color:#CBA6f7;} + .d2-456305260 .color-B2{color:#CBA6f7;} + .d2-456305260 .color-B3{color:#6C7086;} + .d2-456305260 .color-B4{color:#585B70;} + .d2-456305260 .color-B5{color:#45475A;} + .d2-456305260 .color-B6{color:#313244;} + .d2-456305260 .color-AA2{color:#f38BA8;} + .d2-456305260 .color-AA4{color:#45475A;} + .d2-456305260 .color-AA5{color:#313244;} + .d2-456305260 .color-AB4{color:#45475A;} + .d2-456305260 .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/d2target/sqltable.go b/d2target/sqltable.go index 6ffbddf05..bfb1e45d9 100644 --- a/d2target/sqltable.go +++ b/d2target/sqltable.go @@ -1,5 +1,7 @@ package d2target +import "strings" + const ( NamePadding = 10 TypePadding = 20 @@ -15,10 +17,10 @@ type SQLTable struct { } type SQLColumn struct { - Name Text `json:"name"` - Type Text `json:"type"` - Constraint string `json:"constraint"` - Reference string `json:"reference"` + Name Text `json:"name"` + Type Text `json:"type"` + Constraint []string `json:"constraint"` + Reference string `json:"reference"` } func (c SQLColumn) Texts(fontSize int) []*MText { @@ -41,14 +43,22 @@ func (c SQLColumn) Texts(fontSize int) []*MText { } func (c SQLColumn) ConstraintAbbr() string { - switch c.Constraint { - case "primary_key": - return "PK" - case "foreign_key": - return "FK" - case "unique": - return "UNQ" - default: - return "" + var abbrs []string + + for _, constraint := range c.Constraint { + var abbr string + + switch constraint { + case "primary_key": + abbr = "PK" + case "foreign_key": + abbr = "FK" + case "unique": + abbr = "UNQ" + } + + abbrs = append(abbrs, abbr) } + + return strings.Join(abbrs, ", ") } diff --git a/e2etests-cli/testdata/TestCLI_E2E/internal_linked_pdf.exp.pdf b/e2etests-cli/testdata/TestCLI_E2E/internal_linked_pdf.exp.pdf index f329d7c85..30d233b92 100644 Binary files a/e2etests-cli/testdata/TestCLI_E2E/internal_linked_pdf.exp.pdf and b/e2etests-cli/testdata/TestCLI_E2E/internal_linked_pdf.exp.pdf differ diff --git a/e2etests/stable_test.go b/e2etests/stable_test.go index 7adfa8072..977eaba8f 100644 --- a/e2etests/stable_test.go +++ b/e2etests/stable_test.go @@ -2385,6 +2385,30 @@ manager2: BatchManager { +getJobs(): "Job[]" +setTimeout(seconds int) } +`, + }, + { + name: "sql_table_constraints_width", + script: ` +a: { + shape: sql_table + x: INT {constraint: unique} +} + +b: { + shape: sql_table + x: INT {constraint: [primary_key; foreign_key]} +} + +c: { + shape: sql_table + x: INT {constraint: [foreign_key; unique]} +} + +d: { + shape: sql_table + x: INT {constraint: [primary_key; foreign_key; unique]} +} `, }, { diff --git a/e2etests/testdata/patterns/real-lines/dagre/board.exp.json b/e2etests/testdata/patterns/real-lines/dagre/board.exp.json index 4d6823694..50ee233e6 100644 --- a/e2etests/testdata/patterns/real-lines/dagre/board.exp.json +++ b/e2etests/testdata/patterns/real-lines/dagre/board.exp.json @@ -222,7 +222,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -250,7 +252,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -278,7 +280,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -306,7 +308,7 @@ "labelWidth": 91, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], @@ -379,7 +381,9 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "primary_key", + "constraint": [ + "primary_key" + ], "reference": "" }, { @@ -407,7 +411,7 @@ "labelWidth": 48, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -435,7 +439,7 @@ "labelWidth": 23, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -463,7 +467,7 @@ "labelWidth": 91, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], diff --git a/e2etests/testdata/patterns/real-lines/dagre/sketch.exp.svg b/e2etests/testdata/patterns/real-lines/dagre/sketch.exp.svg index 6559dcfd9..fa533964a 100644 --- a/e2etests/testdata/patterns/real-lines/dagre/sketch.exp.svg +++ b/e2etests/testdata/patterns/real-lines/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ -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 fa9b04273..6fc820c58 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,16 +1,16 @@ -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/sql_table_overflow/dagre/board.exp.json b/e2etests/testdata/regression/sql_table_overflow/dagre/board.exp.json index 4433d76ae..937116c15 100644 --- a/e2etests/testdata/regression/sql_table_overflow/dagre/board.exp.json +++ b/e2etests/testdata/regression/sql_table_overflow/dagre/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": "" } ], @@ -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/dagre/sketch.exp.svg b/e2etests/testdata/regression/sql_table_overflow/dagre/sketch.exp.svg index b7d17612a..144f930fe 100644 --- a/e2etests/testdata/regression/sql_table_overflow/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/sql_table_overflow/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -sql_table_overflowshortloooooooooooooooooooongloooooooooooooooooooongshortsql_table_constrained_overflowshortloooooooooooooooooooongUNQloooooooooooooooooooongshortFK + .d2-2606580960 .fill-N1{fill:#0A0F25;} + .d2-2606580960 .fill-N2{fill:#676C7E;} + .d2-2606580960 .fill-N3{fill:#9499AB;} + .d2-2606580960 .fill-N4{fill:#CFD2DD;} + .d2-2606580960 .fill-N5{fill:#DEE1EB;} + .d2-2606580960 .fill-N6{fill:#EEF1F8;} + .d2-2606580960 .fill-N7{fill:#FFFFFF;} + .d2-2606580960 .fill-B1{fill:#0D32B2;} + .d2-2606580960 .fill-B2{fill:#0D32B2;} + .d2-2606580960 .fill-B3{fill:#E3E9FD;} + .d2-2606580960 .fill-B4{fill:#E3E9FD;} + .d2-2606580960 .fill-B5{fill:#EDF0FD;} + .d2-2606580960 .fill-B6{fill:#F7F8FE;} + .d2-2606580960 .fill-AA2{fill:#4A6FF3;} + .d2-2606580960 .fill-AA4{fill:#EDF0FD;} + .d2-2606580960 .fill-AA5{fill:#F7F8FE;} + .d2-2606580960 .fill-AB4{fill:#EDF0FD;} + .d2-2606580960 .fill-AB5{fill:#F7F8FE;} + .d2-2606580960 .stroke-N1{stroke:#0A0F25;} + .d2-2606580960 .stroke-N2{stroke:#676C7E;} + .d2-2606580960 .stroke-N3{stroke:#9499AB;} + .d2-2606580960 .stroke-N4{stroke:#CFD2DD;} + .d2-2606580960 .stroke-N5{stroke:#DEE1EB;} + .d2-2606580960 .stroke-N6{stroke:#EEF1F8;} + .d2-2606580960 .stroke-N7{stroke:#FFFFFF;} + .d2-2606580960 .stroke-B1{stroke:#0D32B2;} + .d2-2606580960 .stroke-B2{stroke:#0D32B2;} + .d2-2606580960 .stroke-B3{stroke:#E3E9FD;} + .d2-2606580960 .stroke-B4{stroke:#E3E9FD;} + .d2-2606580960 .stroke-B5{stroke:#EDF0FD;} + .d2-2606580960 .stroke-B6{stroke:#F7F8FE;} + .d2-2606580960 .stroke-AA2{stroke:#4A6FF3;} + .d2-2606580960 .stroke-AA4{stroke:#EDF0FD;} + .d2-2606580960 .stroke-AA5{stroke:#F7F8FE;} + .d2-2606580960 .stroke-AB4{stroke:#EDF0FD;} + .d2-2606580960 .stroke-AB5{stroke:#F7F8FE;} + .d2-2606580960 .background-color-N1{background-color:#0A0F25;} + .d2-2606580960 .background-color-N2{background-color:#676C7E;} + .d2-2606580960 .background-color-N3{background-color:#9499AB;} + .d2-2606580960 .background-color-N4{background-color:#CFD2DD;} + .d2-2606580960 .background-color-N5{background-color:#DEE1EB;} + .d2-2606580960 .background-color-N6{background-color:#EEF1F8;} + .d2-2606580960 .background-color-N7{background-color:#FFFFFF;} + .d2-2606580960 .background-color-B1{background-color:#0D32B2;} + .d2-2606580960 .background-color-B2{background-color:#0D32B2;} + .d2-2606580960 .background-color-B3{background-color:#E3E9FD;} + .d2-2606580960 .background-color-B4{background-color:#E3E9FD;} + .d2-2606580960 .background-color-B5{background-color:#EDF0FD;} + .d2-2606580960 .background-color-B6{background-color:#F7F8FE;} + .d2-2606580960 .background-color-AA2{background-color:#4A6FF3;} + .d2-2606580960 .background-color-AA4{background-color:#EDF0FD;} + .d2-2606580960 .background-color-AA5{background-color:#F7F8FE;} + .d2-2606580960 .background-color-AB4{background-color:#EDF0FD;} + .d2-2606580960 .background-color-AB5{background-color:#F7F8FE;} + .d2-2606580960 .color-N1{color:#0A0F25;} + .d2-2606580960 .color-N2{color:#676C7E;} + .d2-2606580960 .color-N3{color:#9499AB;} + .d2-2606580960 .color-N4{color:#CFD2DD;} + .d2-2606580960 .color-N5{color:#DEE1EB;} + .d2-2606580960 .color-N6{color:#EEF1F8;} + .d2-2606580960 .color-N7{color:#FFFFFF;} + .d2-2606580960 .color-B1{color:#0D32B2;} + .d2-2606580960 .color-B2{color:#0D32B2;} + .d2-2606580960 .color-B3{color:#E3E9FD;} + .d2-2606580960 .color-B4{color:#E3E9FD;} + .d2-2606580960 .color-B5{color:#EDF0FD;} + .d2-2606580960 .color-B6{color:#F7F8FE;} + .d2-2606580960 .color-AA2{color:#4A6FF3;} + .d2-2606580960 .color-AA4{color:#EDF0FD;} + .d2-2606580960 .color-AA5{color:#F7F8FE;} + .d2-2606580960 .color-AB4{color:#EDF0FD;} + .d2-2606580960 .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..c4ddc7c1b 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": "" } ], @@ -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 e0461bb9b..194ca57cd 100644 --- a/e2etests/testdata/regression/sql_table_overflow/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/sql_table_overflow/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -sql_table_overflowshortloooooooooooooooooooongloooooooooooooooooooongshortsql_table_constrained_overflowshortloooooooooooooooooooongUNQloooooooooooooooooooongshortFK + .d2-3947134090 .fill-N1{fill:#0A0F25;} + .d2-3947134090 .fill-N2{fill:#676C7E;} + .d2-3947134090 .fill-N3{fill:#9499AB;} + .d2-3947134090 .fill-N4{fill:#CFD2DD;} + .d2-3947134090 .fill-N5{fill:#DEE1EB;} + .d2-3947134090 .fill-N6{fill:#EEF1F8;} + .d2-3947134090 .fill-N7{fill:#FFFFFF;} + .d2-3947134090 .fill-B1{fill:#0D32B2;} + .d2-3947134090 .fill-B2{fill:#0D32B2;} + .d2-3947134090 .fill-B3{fill:#E3E9FD;} + .d2-3947134090 .fill-B4{fill:#E3E9FD;} + .d2-3947134090 .fill-B5{fill:#EDF0FD;} + .d2-3947134090 .fill-B6{fill:#F7F8FE;} + .d2-3947134090 .fill-AA2{fill:#4A6FF3;} + .d2-3947134090 .fill-AA4{fill:#EDF0FD;} + .d2-3947134090 .fill-AA5{fill:#F7F8FE;} + .d2-3947134090 .fill-AB4{fill:#EDF0FD;} + .d2-3947134090 .fill-AB5{fill:#F7F8FE;} + .d2-3947134090 .stroke-N1{stroke:#0A0F25;} + .d2-3947134090 .stroke-N2{stroke:#676C7E;} + .d2-3947134090 .stroke-N3{stroke:#9499AB;} + .d2-3947134090 .stroke-N4{stroke:#CFD2DD;} + .d2-3947134090 .stroke-N5{stroke:#DEE1EB;} + .d2-3947134090 .stroke-N6{stroke:#EEF1F8;} + .d2-3947134090 .stroke-N7{stroke:#FFFFFF;} + .d2-3947134090 .stroke-B1{stroke:#0D32B2;} + .d2-3947134090 .stroke-B2{stroke:#0D32B2;} + .d2-3947134090 .stroke-B3{stroke:#E3E9FD;} + .d2-3947134090 .stroke-B4{stroke:#E3E9FD;} + .d2-3947134090 .stroke-B5{stroke:#EDF0FD;} + .d2-3947134090 .stroke-B6{stroke:#F7F8FE;} + .d2-3947134090 .stroke-AA2{stroke:#4A6FF3;} + .d2-3947134090 .stroke-AA4{stroke:#EDF0FD;} + .d2-3947134090 .stroke-AA5{stroke:#F7F8FE;} + .d2-3947134090 .stroke-AB4{stroke:#EDF0FD;} + .d2-3947134090 .stroke-AB5{stroke:#F7F8FE;} + .d2-3947134090 .background-color-N1{background-color:#0A0F25;} + .d2-3947134090 .background-color-N2{background-color:#676C7E;} + .d2-3947134090 .background-color-N3{background-color:#9499AB;} + .d2-3947134090 .background-color-N4{background-color:#CFD2DD;} + .d2-3947134090 .background-color-N5{background-color:#DEE1EB;} + .d2-3947134090 .background-color-N6{background-color:#EEF1F8;} + .d2-3947134090 .background-color-N7{background-color:#FFFFFF;} + .d2-3947134090 .background-color-B1{background-color:#0D32B2;} + .d2-3947134090 .background-color-B2{background-color:#0D32B2;} + .d2-3947134090 .background-color-B3{background-color:#E3E9FD;} + .d2-3947134090 .background-color-B4{background-color:#E3E9FD;} + .d2-3947134090 .background-color-B5{background-color:#EDF0FD;} + .d2-3947134090 .background-color-B6{background-color:#F7F8FE;} + .d2-3947134090 .background-color-AA2{background-color:#4A6FF3;} + .d2-3947134090 .background-color-AA4{background-color:#EDF0FD;} + .d2-3947134090 .background-color-AA5{background-color:#F7F8FE;} + .d2-3947134090 .background-color-AB4{background-color:#EDF0FD;} + .d2-3947134090 .background-color-AB5{background-color:#F7F8FE;} + .d2-3947134090 .color-N1{color:#0A0F25;} + .d2-3947134090 .color-N2{color:#676C7E;} + .d2-3947134090 .color-N3{color:#9499AB;} + .d2-3947134090 .color-N4{color:#CFD2DD;} + .d2-3947134090 .color-N5{color:#DEE1EB;} + .d2-3947134090 .color-N6{color:#EEF1F8;} + .d2-3947134090 .color-N7{color:#FFFFFF;} + .d2-3947134090 .color-B1{color:#0D32B2;} + .d2-3947134090 .color-B2{color:#0D32B2;} + .d2-3947134090 .color-B3{color:#E3E9FD;} + .d2-3947134090 .color-B4{color:#E3E9FD;} + .d2-3947134090 .color-B5{color:#EDF0FD;} + .d2-3947134090 .color-B6{color:#F7F8FE;} + .d2-3947134090 .color-AA2{color:#4A6FF3;} + .d2-3947134090 .color-AA4{color:#EDF0FD;} + .d2-3947134090 .color-AA5{color:#F7F8FE;} + .d2-3947134090 .color-AB4{color:#EDF0FD;} + .d2-3947134090 .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/unnamed_class_table_code/dagre/board.exp.json b/e2etests/testdata/regression/unnamed_class_table_code/dagre/board.exp.json index 74fa3cf47..1f783180d 100644 --- a/e2etests/testdata/regression/unnamed_class_table_code/dagre/board.exp.json +++ b/e2etests/testdata/regression/unnamed_class_table_code/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/regression/unnamed_class_table_code/dagre/sketch.exp.svg b/e2etests/testdata/regression/unnamed_class_table_code/dagre/sketch.exp.svg index 83c59f09c..19e8c557e 100644 --- a/e2etests/testdata/regression/unnamed_class_table_code/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/unnamed_class_table_code/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ --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 482df24a6..9aa261bd2 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,23 +1,23 @@ --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/stable/array-classes/dagre/board.exp.json b/e2etests/testdata/stable/array-classes/dagre/board.exp.json index b3149b051..ffb9d427e 100644 --- a/e2etests/testdata/stable/array-classes/dagre/board.exp.json +++ b/e2etests/testdata/stable/array-classes/dagre/board.exp.json @@ -6,6 +6,10 @@ { "id": "yay", "type": "rectangle", + "classes": [ + "button", + "success" + ], "pos": { "x": 0, "y": 0 @@ -47,6 +51,10 @@ { "id": "nay", "type": "rectangle", + "classes": [ + "button", + "error" + ], "pos": { "x": 180, "y": 0 diff --git a/e2etests/testdata/stable/array-classes/dagre/sketch.exp.svg b/e2etests/testdata/stable/array-classes/dagre/sketch.exp.svg index 650107129..51c35541a 100644 --- a/e2etests/testdata/stable/array-classes/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/array-classes/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -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 d316dc827..5d216f6b2 100644 --- a/e2etests/testdata/stable/array-classes/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/array-classes/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -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/class_and_sqlTable_border_radius/dagre/board.exp.json b/e2etests/testdata/stable/class_and_sqlTable_border_radius/dagre/board.exp.json index 0836aabed..3d9ed2ba9 100644 --- a/e2etests/testdata/stable/class_and_sqlTable_border_radius/dagre/board.exp.json +++ b/e2etests/testdata/stable/class_and_sqlTable_border_radius/dagre/board.exp.json @@ -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": "" } ], diff --git a/e2etests/testdata/stable/class_and_sqlTable_border_radius/dagre/sketch.exp.svg b/e2etests/testdata/stable/class_and_sqlTable_border_radius/dagre/sketch.exp.svg index 916f23b6e..730a87272 100644 --- a/e2etests/testdata/stable/class_and_sqlTable_border_radius/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/class_and_sqlTable_border_radius/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ - aidintPKdiskintFKjsonjsonbUNQlast_updatedtimestamp with time zone b+field[]string+method(a uint64)(x, y int) c d + .d2-3002275928 .fill-N1{fill:#0A0F25;} + .d2-3002275928 .fill-N2{fill:#676C7E;} + .d2-3002275928 .fill-N3{fill:#9499AB;} + .d2-3002275928 .fill-N4{fill:#CFD2DD;} + .d2-3002275928 .fill-N5{fill:#DEE1EB;} + .d2-3002275928 .fill-N6{fill:#EEF1F8;} + .d2-3002275928 .fill-N7{fill:#FFFFFF;} + .d2-3002275928 .fill-B1{fill:#0D32B2;} + .d2-3002275928 .fill-B2{fill:#0D32B2;} + .d2-3002275928 .fill-B3{fill:#E3E9FD;} + .d2-3002275928 .fill-B4{fill:#E3E9FD;} + .d2-3002275928 .fill-B5{fill:#EDF0FD;} + .d2-3002275928 .fill-B6{fill:#F7F8FE;} + .d2-3002275928 .fill-AA2{fill:#4A6FF3;} + .d2-3002275928 .fill-AA4{fill:#EDF0FD;} + .d2-3002275928 .fill-AA5{fill:#F7F8FE;} + .d2-3002275928 .fill-AB4{fill:#EDF0FD;} + .d2-3002275928 .fill-AB5{fill:#F7F8FE;} + .d2-3002275928 .stroke-N1{stroke:#0A0F25;} + .d2-3002275928 .stroke-N2{stroke:#676C7E;} + .d2-3002275928 .stroke-N3{stroke:#9499AB;} + .d2-3002275928 .stroke-N4{stroke:#CFD2DD;} + .d2-3002275928 .stroke-N5{stroke:#DEE1EB;} + .d2-3002275928 .stroke-N6{stroke:#EEF1F8;} + .d2-3002275928 .stroke-N7{stroke:#FFFFFF;} + .d2-3002275928 .stroke-B1{stroke:#0D32B2;} + .d2-3002275928 .stroke-B2{stroke:#0D32B2;} + .d2-3002275928 .stroke-B3{stroke:#E3E9FD;} + .d2-3002275928 .stroke-B4{stroke:#E3E9FD;} + .d2-3002275928 .stroke-B5{stroke:#EDF0FD;} + .d2-3002275928 .stroke-B6{stroke:#F7F8FE;} + .d2-3002275928 .stroke-AA2{stroke:#4A6FF3;} + .d2-3002275928 .stroke-AA4{stroke:#EDF0FD;} + .d2-3002275928 .stroke-AA5{stroke:#F7F8FE;} + .d2-3002275928 .stroke-AB4{stroke:#EDF0FD;} + .d2-3002275928 .stroke-AB5{stroke:#F7F8FE;} + .d2-3002275928 .background-color-N1{background-color:#0A0F25;} + .d2-3002275928 .background-color-N2{background-color:#676C7E;} + .d2-3002275928 .background-color-N3{background-color:#9499AB;} + .d2-3002275928 .background-color-N4{background-color:#CFD2DD;} + .d2-3002275928 .background-color-N5{background-color:#DEE1EB;} + .d2-3002275928 .background-color-N6{background-color:#EEF1F8;} + .d2-3002275928 .background-color-N7{background-color:#FFFFFF;} + .d2-3002275928 .background-color-B1{background-color:#0D32B2;} + .d2-3002275928 .background-color-B2{background-color:#0D32B2;} + .d2-3002275928 .background-color-B3{background-color:#E3E9FD;} + .d2-3002275928 .background-color-B4{background-color:#E3E9FD;} + .d2-3002275928 .background-color-B5{background-color:#EDF0FD;} + .d2-3002275928 .background-color-B6{background-color:#F7F8FE;} + .d2-3002275928 .background-color-AA2{background-color:#4A6FF3;} + .d2-3002275928 .background-color-AA4{background-color:#EDF0FD;} + .d2-3002275928 .background-color-AA5{background-color:#F7F8FE;} + .d2-3002275928 .background-color-AB4{background-color:#EDF0FD;} + .d2-3002275928 .background-color-AB5{background-color:#F7F8FE;} + .d2-3002275928 .color-N1{color:#0A0F25;} + .d2-3002275928 .color-N2{color:#676C7E;} + .d2-3002275928 .color-N3{color:#9499AB;} + .d2-3002275928 .color-N4{color:#CFD2DD;} + .d2-3002275928 .color-N5{color:#DEE1EB;} + .d2-3002275928 .color-N6{color:#EEF1F8;} + .d2-3002275928 .color-N7{color:#FFFFFF;} + .d2-3002275928 .color-B1{color:#0D32B2;} + .d2-3002275928 .color-B2{color:#0D32B2;} + .d2-3002275928 .color-B3{color:#E3E9FD;} + .d2-3002275928 .color-B4{color:#E3E9FD;} + .d2-3002275928 .color-B5{color:#EDF0FD;} + .d2-3002275928 .color-B6{color:#F7F8FE;} + .d2-3002275928 .color-AA2{color:#4A6FF3;} + .d2-3002275928 .color-AA4{color:#EDF0FD;} + .d2-3002275928 .color-AA5{color:#F7F8FE;} + .d2-3002275928 .color-AB4{color:#EDF0FD;} + .d2-3002275928 .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..1b5822a06 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 @@ -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": "" } ], 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 f8af9686a..8a41dd530 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,16 +1,16 @@ - aidintPKdiskintFKjsonjsonbUNQlast_updatedtimestamp with time zone b+field[]string+method(a uint64)(x, y int) c d + .d2-3551662305 .fill-N1{fill:#0A0F25;} + .d2-3551662305 .fill-N2{fill:#676C7E;} + .d2-3551662305 .fill-N3{fill:#9499AB;} + .d2-3551662305 .fill-N4{fill:#CFD2DD;} + .d2-3551662305 .fill-N5{fill:#DEE1EB;} + .d2-3551662305 .fill-N6{fill:#EEF1F8;} + .d2-3551662305 .fill-N7{fill:#FFFFFF;} + .d2-3551662305 .fill-B1{fill:#0D32B2;} + .d2-3551662305 .fill-B2{fill:#0D32B2;} + .d2-3551662305 .fill-B3{fill:#E3E9FD;} + .d2-3551662305 .fill-B4{fill:#E3E9FD;} + .d2-3551662305 .fill-B5{fill:#EDF0FD;} + .d2-3551662305 .fill-B6{fill:#F7F8FE;} + .d2-3551662305 .fill-AA2{fill:#4A6FF3;} + .d2-3551662305 .fill-AA4{fill:#EDF0FD;} + .d2-3551662305 .fill-AA5{fill:#F7F8FE;} + .d2-3551662305 .fill-AB4{fill:#EDF0FD;} + .d2-3551662305 .fill-AB5{fill:#F7F8FE;} + .d2-3551662305 .stroke-N1{stroke:#0A0F25;} + .d2-3551662305 .stroke-N2{stroke:#676C7E;} + .d2-3551662305 .stroke-N3{stroke:#9499AB;} + .d2-3551662305 .stroke-N4{stroke:#CFD2DD;} + .d2-3551662305 .stroke-N5{stroke:#DEE1EB;} + .d2-3551662305 .stroke-N6{stroke:#EEF1F8;} + .d2-3551662305 .stroke-N7{stroke:#FFFFFF;} + .d2-3551662305 .stroke-B1{stroke:#0D32B2;} + .d2-3551662305 .stroke-B2{stroke:#0D32B2;} + .d2-3551662305 .stroke-B3{stroke:#E3E9FD;} + .d2-3551662305 .stroke-B4{stroke:#E3E9FD;} + .d2-3551662305 .stroke-B5{stroke:#EDF0FD;} + .d2-3551662305 .stroke-B6{stroke:#F7F8FE;} + .d2-3551662305 .stroke-AA2{stroke:#4A6FF3;} + .d2-3551662305 .stroke-AA4{stroke:#EDF0FD;} + .d2-3551662305 .stroke-AA5{stroke:#F7F8FE;} + .d2-3551662305 .stroke-AB4{stroke:#EDF0FD;} + .d2-3551662305 .stroke-AB5{stroke:#F7F8FE;} + .d2-3551662305 .background-color-N1{background-color:#0A0F25;} + .d2-3551662305 .background-color-N2{background-color:#676C7E;} + .d2-3551662305 .background-color-N3{background-color:#9499AB;} + .d2-3551662305 .background-color-N4{background-color:#CFD2DD;} + .d2-3551662305 .background-color-N5{background-color:#DEE1EB;} + .d2-3551662305 .background-color-N6{background-color:#EEF1F8;} + .d2-3551662305 .background-color-N7{background-color:#FFFFFF;} + .d2-3551662305 .background-color-B1{background-color:#0D32B2;} + .d2-3551662305 .background-color-B2{background-color:#0D32B2;} + .d2-3551662305 .background-color-B3{background-color:#E3E9FD;} + .d2-3551662305 .background-color-B4{background-color:#E3E9FD;} + .d2-3551662305 .background-color-B5{background-color:#EDF0FD;} + .d2-3551662305 .background-color-B6{background-color:#F7F8FE;} + .d2-3551662305 .background-color-AA2{background-color:#4A6FF3;} + .d2-3551662305 .background-color-AA4{background-color:#EDF0FD;} + .d2-3551662305 .background-color-AA5{background-color:#F7F8FE;} + .d2-3551662305 .background-color-AB4{background-color:#EDF0FD;} + .d2-3551662305 .background-color-AB5{background-color:#F7F8FE;} + .d2-3551662305 .color-N1{color:#0A0F25;} + .d2-3551662305 .color-N2{color:#676C7E;} + .d2-3551662305 .color-N3{color:#9499AB;} + .d2-3551662305 .color-N4{color:#CFD2DD;} + .d2-3551662305 .color-N5{color:#DEE1EB;} + .d2-3551662305 .color-N6{color:#EEF1F8;} + .d2-3551662305 .color-N7{color:#FFFFFF;} + .d2-3551662305 .color-B1{color:#0D32B2;} + .d2-3551662305 .color-B2{color:#0D32B2;} + .d2-3551662305 .color-B3{color:#E3E9FD;} + .d2-3551662305 .color-B4{color:#E3E9FD;} + .d2-3551662305 .color-B5{color:#EDF0FD;} + .d2-3551662305 .color-B6{color:#F7F8FE;} + .d2-3551662305 .color-AA2{color:#4A6FF3;} + .d2-3551662305 .color-AA4{color:#EDF0FD;} + .d2-3551662305 .color-AA5{color:#F7F8FE;} + .d2-3551662305 .color-AB4{color:#EDF0FD;} + .d2-3551662305 .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/ent2d2_basic/dagre/board.exp.json b/e2etests/testdata/stable/ent2d2_basic/dagre/board.exp.json index ec32a6e81..d0f85ab2f 100644 --- a/e2etests/testdata/stable/ent2d2_basic/dagre/board.exp.json +++ b/e2etests/testdata/stable/ent2d2_basic/dagre/board.exp.json @@ -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": "" } ], @@ -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": "" } ], @@ -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": "" } ], @@ -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": "" } ], @@ -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": "" } ], @@ -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": "" } ], diff --git a/e2etests/testdata/stable/ent2d2_basic/dagre/sketch.exp.svg b/e2etests/testdata/stable/ent2d2_basic/dagre/sketch.exp.svg index 5dcea3c9b..1a1803f42 100644 --- a/e2etests/testdata/stable/ent2d2_basic/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/ent2d2_basic/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -UseridintPKparent_idintFKspouse_idintFKPetidintPKowner_idintFKCardidintPKowner_idintFKPostidintPKtextstringauthor_idintFKMetadataidintPKageintInfoidintPKcontentjson.RawMessage spouse children/parent/ancestorpets/ownercard/ownerposts/authormetadata/userinfo/user + .d2-3599590547 .fill-N1{fill:#0A0F25;} + .d2-3599590547 .fill-N2{fill:#676C7E;} + .d2-3599590547 .fill-N3{fill:#9499AB;} + .d2-3599590547 .fill-N4{fill:#CFD2DD;} + .d2-3599590547 .fill-N5{fill:#DEE1EB;} + .d2-3599590547 .fill-N6{fill:#EEF1F8;} + .d2-3599590547 .fill-N7{fill:#FFFFFF;} + .d2-3599590547 .fill-B1{fill:#0D32B2;} + .d2-3599590547 .fill-B2{fill:#0D32B2;} + .d2-3599590547 .fill-B3{fill:#E3E9FD;} + .d2-3599590547 .fill-B4{fill:#E3E9FD;} + .d2-3599590547 .fill-B5{fill:#EDF0FD;} + .d2-3599590547 .fill-B6{fill:#F7F8FE;} + .d2-3599590547 .fill-AA2{fill:#4A6FF3;} + .d2-3599590547 .fill-AA4{fill:#EDF0FD;} + .d2-3599590547 .fill-AA5{fill:#F7F8FE;} + .d2-3599590547 .fill-AB4{fill:#EDF0FD;} + .d2-3599590547 .fill-AB5{fill:#F7F8FE;} + .d2-3599590547 .stroke-N1{stroke:#0A0F25;} + .d2-3599590547 .stroke-N2{stroke:#676C7E;} + .d2-3599590547 .stroke-N3{stroke:#9499AB;} + .d2-3599590547 .stroke-N4{stroke:#CFD2DD;} + .d2-3599590547 .stroke-N5{stroke:#DEE1EB;} + .d2-3599590547 .stroke-N6{stroke:#EEF1F8;} + .d2-3599590547 .stroke-N7{stroke:#FFFFFF;} + .d2-3599590547 .stroke-B1{stroke:#0D32B2;} + .d2-3599590547 .stroke-B2{stroke:#0D32B2;} + .d2-3599590547 .stroke-B3{stroke:#E3E9FD;} + .d2-3599590547 .stroke-B4{stroke:#E3E9FD;} + .d2-3599590547 .stroke-B5{stroke:#EDF0FD;} + .d2-3599590547 .stroke-B6{stroke:#F7F8FE;} + .d2-3599590547 .stroke-AA2{stroke:#4A6FF3;} + .d2-3599590547 .stroke-AA4{stroke:#EDF0FD;} + .d2-3599590547 .stroke-AA5{stroke:#F7F8FE;} + .d2-3599590547 .stroke-AB4{stroke:#EDF0FD;} + .d2-3599590547 .stroke-AB5{stroke:#F7F8FE;} + .d2-3599590547 .background-color-N1{background-color:#0A0F25;} + .d2-3599590547 .background-color-N2{background-color:#676C7E;} + .d2-3599590547 .background-color-N3{background-color:#9499AB;} + .d2-3599590547 .background-color-N4{background-color:#CFD2DD;} + .d2-3599590547 .background-color-N5{background-color:#DEE1EB;} + .d2-3599590547 .background-color-N6{background-color:#EEF1F8;} + .d2-3599590547 .background-color-N7{background-color:#FFFFFF;} + .d2-3599590547 .background-color-B1{background-color:#0D32B2;} + .d2-3599590547 .background-color-B2{background-color:#0D32B2;} + .d2-3599590547 .background-color-B3{background-color:#E3E9FD;} + .d2-3599590547 .background-color-B4{background-color:#E3E9FD;} + .d2-3599590547 .background-color-B5{background-color:#EDF0FD;} + .d2-3599590547 .background-color-B6{background-color:#F7F8FE;} + .d2-3599590547 .background-color-AA2{background-color:#4A6FF3;} + .d2-3599590547 .background-color-AA4{background-color:#EDF0FD;} + .d2-3599590547 .background-color-AA5{background-color:#F7F8FE;} + .d2-3599590547 .background-color-AB4{background-color:#EDF0FD;} + .d2-3599590547 .background-color-AB5{background-color:#F7F8FE;} + .d2-3599590547 .color-N1{color:#0A0F25;} + .d2-3599590547 .color-N2{color:#676C7E;} + .d2-3599590547 .color-N3{color:#9499AB;} + .d2-3599590547 .color-N4{color:#CFD2DD;} + .d2-3599590547 .color-N5{color:#DEE1EB;} + .d2-3599590547 .color-N6{color:#EEF1F8;} + .d2-3599590547 .color-N7{color:#FFFFFF;} + .d2-3599590547 .color-B1{color:#0D32B2;} + .d2-3599590547 .color-B2{color:#0D32B2;} + .d2-3599590547 .color-B3{color:#E3E9FD;} + .d2-3599590547 .color-B4{color:#E3E9FD;} + .d2-3599590547 .color-B5{color:#EDF0FD;} + .d2-3599590547 .color-B6{color:#F7F8FE;} + .d2-3599590547 .color-AA2{color:#4A6FF3;} + .d2-3599590547 .color-AA4{color:#EDF0FD;} + .d2-3599590547 .color-AA5{color:#F7F8FE;} + .d2-3599590547 .color-AB4{color:#EDF0FD;} + .d2-3599590547 .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 diff --git a/e2etests/testdata/stable/ent2d2_basic/elk/board.exp.json b/e2etests/testdata/stable/ent2d2_basic/elk/board.exp.json index 17bfd3cda..71a37ae1e 100644 --- a/e2etests/testdata/stable/ent2d2_basic/elk/board.exp.json +++ b/e2etests/testdata/stable/ent2d2_basic/elk/board.exp.json @@ -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": "" } ], @@ -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": "" } ], @@ -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": "" } ], @@ -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": "" } ], @@ -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": "" } ], @@ -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": "" } ], diff --git a/e2etests/testdata/stable/ent2d2_basic/elk/sketch.exp.svg b/e2etests/testdata/stable/ent2d2_basic/elk/sketch.exp.svg index 205bb2374..0abb785da 100644 --- a/e2etests/testdata/stable/ent2d2_basic/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/ent2d2_basic/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -UseridintPKparent_idintFKspouse_idintFKPetidintPKowner_idintFKCardidintPKowner_idintFKPostidintPKtextstringauthor_idintFKMetadataidintPKageintInfoidintPKcontentjson.RawMessage spouse children/parent/ancestorpets/ownercard/ownerposts/authormetadata/userinfo/user + .d2-165492064 .fill-N1{fill:#0A0F25;} + .d2-165492064 .fill-N2{fill:#676C7E;} + .d2-165492064 .fill-N3{fill:#9499AB;} + .d2-165492064 .fill-N4{fill:#CFD2DD;} + .d2-165492064 .fill-N5{fill:#DEE1EB;} + .d2-165492064 .fill-N6{fill:#EEF1F8;} + .d2-165492064 .fill-N7{fill:#FFFFFF;} + .d2-165492064 .fill-B1{fill:#0D32B2;} + .d2-165492064 .fill-B2{fill:#0D32B2;} + .d2-165492064 .fill-B3{fill:#E3E9FD;} + .d2-165492064 .fill-B4{fill:#E3E9FD;} + .d2-165492064 .fill-B5{fill:#EDF0FD;} + .d2-165492064 .fill-B6{fill:#F7F8FE;} + .d2-165492064 .fill-AA2{fill:#4A6FF3;} + .d2-165492064 .fill-AA4{fill:#EDF0FD;} + .d2-165492064 .fill-AA5{fill:#F7F8FE;} + .d2-165492064 .fill-AB4{fill:#EDF0FD;} + .d2-165492064 .fill-AB5{fill:#F7F8FE;} + .d2-165492064 .stroke-N1{stroke:#0A0F25;} + .d2-165492064 .stroke-N2{stroke:#676C7E;} + .d2-165492064 .stroke-N3{stroke:#9499AB;} + .d2-165492064 .stroke-N4{stroke:#CFD2DD;} + .d2-165492064 .stroke-N5{stroke:#DEE1EB;} + .d2-165492064 .stroke-N6{stroke:#EEF1F8;} + .d2-165492064 .stroke-N7{stroke:#FFFFFF;} + .d2-165492064 .stroke-B1{stroke:#0D32B2;} + .d2-165492064 .stroke-B2{stroke:#0D32B2;} + .d2-165492064 .stroke-B3{stroke:#E3E9FD;} + .d2-165492064 .stroke-B4{stroke:#E3E9FD;} + .d2-165492064 .stroke-B5{stroke:#EDF0FD;} + .d2-165492064 .stroke-B6{stroke:#F7F8FE;} + .d2-165492064 .stroke-AA2{stroke:#4A6FF3;} + .d2-165492064 .stroke-AA4{stroke:#EDF0FD;} + .d2-165492064 .stroke-AA5{stroke:#F7F8FE;} + .d2-165492064 .stroke-AB4{stroke:#EDF0FD;} + .d2-165492064 .stroke-AB5{stroke:#F7F8FE;} + .d2-165492064 .background-color-N1{background-color:#0A0F25;} + .d2-165492064 .background-color-N2{background-color:#676C7E;} + .d2-165492064 .background-color-N3{background-color:#9499AB;} + .d2-165492064 .background-color-N4{background-color:#CFD2DD;} + .d2-165492064 .background-color-N5{background-color:#DEE1EB;} + .d2-165492064 .background-color-N6{background-color:#EEF1F8;} + .d2-165492064 .background-color-N7{background-color:#FFFFFF;} + .d2-165492064 .background-color-B1{background-color:#0D32B2;} + .d2-165492064 .background-color-B2{background-color:#0D32B2;} + .d2-165492064 .background-color-B3{background-color:#E3E9FD;} + .d2-165492064 .background-color-B4{background-color:#E3E9FD;} + .d2-165492064 .background-color-B5{background-color:#EDF0FD;} + .d2-165492064 .background-color-B6{background-color:#F7F8FE;} + .d2-165492064 .background-color-AA2{background-color:#4A6FF3;} + .d2-165492064 .background-color-AA4{background-color:#EDF0FD;} + .d2-165492064 .background-color-AA5{background-color:#F7F8FE;} + .d2-165492064 .background-color-AB4{background-color:#EDF0FD;} + .d2-165492064 .background-color-AB5{background-color:#F7F8FE;} + .d2-165492064 .color-N1{color:#0A0F25;} + .d2-165492064 .color-N2{color:#676C7E;} + .d2-165492064 .color-N3{color:#9499AB;} + .d2-165492064 .color-N4{color:#CFD2DD;} + .d2-165492064 .color-N5{color:#DEE1EB;} + .d2-165492064 .color-N6{color:#EEF1F8;} + .d2-165492064 .color-N7{color:#FFFFFF;} + .d2-165492064 .color-B1{color:#0D32B2;} + .d2-165492064 .color-B2{color:#0D32B2;} + .d2-165492064 .color-B3{color:#E3E9FD;} + .d2-165492064 .color-B4{color:#E3E9FD;} + .d2-165492064 .color-B5{color:#EDF0FD;} + .d2-165492064 .color-B6{color:#F7F8FE;} + .d2-165492064 .color-AA2{color:#4A6FF3;} + .d2-165492064 .color-AA4{color:#EDF0FD;} + .d2-165492064 .color-AA5{color:#F7F8FE;} + .d2-165492064 .color-AB4{color:#EDF0FD;} + .d2-165492064 .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 diff --git a/e2etests/testdata/stable/ent2d2_right/dagre/board.exp.json b/e2etests/testdata/stable/ent2d2_right/dagre/board.exp.json index 0ce03b06d..120d47a63 100644 --- a/e2etests/testdata/stable/ent2d2_right/dagre/board.exp.json +++ b/e2etests/testdata/stable/ent2d2_right/dagre/board.exp.json @@ -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": "" } ], @@ -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": "" } ], @@ -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": "" } ], @@ -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": "" } ], @@ -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": "" } ], @@ -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": "" } ], diff --git a/e2etests/testdata/stable/ent2d2_right/dagre/sketch.exp.svg b/e2etests/testdata/stable/ent2d2_right/dagre/sketch.exp.svg index b593b9671..584add315 100644 --- a/e2etests/testdata/stable/ent2d2_right/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/ent2d2_right/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -UseridintPKparent_idintFKspouse_idintFKPetidintPKowner_idintFKCardidintPKowner_idintFKPostidintPKtextstringauthor_idintFKMetadataidintPKageintInfoidintPKcontentjson.RawMessage spousespouse childrenparentyowhoaheypets/ownercard/ownerposts/authormetadata/userinfo/user + .d2-2463336698 .fill-N1{fill:#0A0F25;} + .d2-2463336698 .fill-N2{fill:#676C7E;} + .d2-2463336698 .fill-N3{fill:#9499AB;} + .d2-2463336698 .fill-N4{fill:#CFD2DD;} + .d2-2463336698 .fill-N5{fill:#DEE1EB;} + .d2-2463336698 .fill-N6{fill:#EEF1F8;} + .d2-2463336698 .fill-N7{fill:#FFFFFF;} + .d2-2463336698 .fill-B1{fill:#0D32B2;} + .d2-2463336698 .fill-B2{fill:#0D32B2;} + .d2-2463336698 .fill-B3{fill:#E3E9FD;} + .d2-2463336698 .fill-B4{fill:#E3E9FD;} + .d2-2463336698 .fill-B5{fill:#EDF0FD;} + .d2-2463336698 .fill-B6{fill:#F7F8FE;} + .d2-2463336698 .fill-AA2{fill:#4A6FF3;} + .d2-2463336698 .fill-AA4{fill:#EDF0FD;} + .d2-2463336698 .fill-AA5{fill:#F7F8FE;} + .d2-2463336698 .fill-AB4{fill:#EDF0FD;} + .d2-2463336698 .fill-AB5{fill:#F7F8FE;} + .d2-2463336698 .stroke-N1{stroke:#0A0F25;} + .d2-2463336698 .stroke-N2{stroke:#676C7E;} + .d2-2463336698 .stroke-N3{stroke:#9499AB;} + .d2-2463336698 .stroke-N4{stroke:#CFD2DD;} + .d2-2463336698 .stroke-N5{stroke:#DEE1EB;} + .d2-2463336698 .stroke-N6{stroke:#EEF1F8;} + .d2-2463336698 .stroke-N7{stroke:#FFFFFF;} + .d2-2463336698 .stroke-B1{stroke:#0D32B2;} + .d2-2463336698 .stroke-B2{stroke:#0D32B2;} + .d2-2463336698 .stroke-B3{stroke:#E3E9FD;} + .d2-2463336698 .stroke-B4{stroke:#E3E9FD;} + .d2-2463336698 .stroke-B5{stroke:#EDF0FD;} + .d2-2463336698 .stroke-B6{stroke:#F7F8FE;} + .d2-2463336698 .stroke-AA2{stroke:#4A6FF3;} + .d2-2463336698 .stroke-AA4{stroke:#EDF0FD;} + .d2-2463336698 .stroke-AA5{stroke:#F7F8FE;} + .d2-2463336698 .stroke-AB4{stroke:#EDF0FD;} + .d2-2463336698 .stroke-AB5{stroke:#F7F8FE;} + .d2-2463336698 .background-color-N1{background-color:#0A0F25;} + .d2-2463336698 .background-color-N2{background-color:#676C7E;} + .d2-2463336698 .background-color-N3{background-color:#9499AB;} + .d2-2463336698 .background-color-N4{background-color:#CFD2DD;} + .d2-2463336698 .background-color-N5{background-color:#DEE1EB;} + .d2-2463336698 .background-color-N6{background-color:#EEF1F8;} + .d2-2463336698 .background-color-N7{background-color:#FFFFFF;} + .d2-2463336698 .background-color-B1{background-color:#0D32B2;} + .d2-2463336698 .background-color-B2{background-color:#0D32B2;} + .d2-2463336698 .background-color-B3{background-color:#E3E9FD;} + .d2-2463336698 .background-color-B4{background-color:#E3E9FD;} + .d2-2463336698 .background-color-B5{background-color:#EDF0FD;} + .d2-2463336698 .background-color-B6{background-color:#F7F8FE;} + .d2-2463336698 .background-color-AA2{background-color:#4A6FF3;} + .d2-2463336698 .background-color-AA4{background-color:#EDF0FD;} + .d2-2463336698 .background-color-AA5{background-color:#F7F8FE;} + .d2-2463336698 .background-color-AB4{background-color:#EDF0FD;} + .d2-2463336698 .background-color-AB5{background-color:#F7F8FE;} + .d2-2463336698 .color-N1{color:#0A0F25;} + .d2-2463336698 .color-N2{color:#676C7E;} + .d2-2463336698 .color-N3{color:#9499AB;} + .d2-2463336698 .color-N4{color:#CFD2DD;} + .d2-2463336698 .color-N5{color:#DEE1EB;} + .d2-2463336698 .color-N6{color:#EEF1F8;} + .d2-2463336698 .color-N7{color:#FFFFFF;} + .d2-2463336698 .color-B1{color:#0D32B2;} + .d2-2463336698 .color-B2{color:#0D32B2;} + .d2-2463336698 .color-B3{color:#E3E9FD;} + .d2-2463336698 .color-B4{color:#E3E9FD;} + .d2-2463336698 .color-B5{color:#EDF0FD;} + .d2-2463336698 .color-B6{color:#F7F8FE;} + .d2-2463336698 .color-AA2{color:#4A6FF3;} + .d2-2463336698 .color-AA4{color:#EDF0FD;} + .d2-2463336698 .color-AA5{color:#F7F8FE;} + .d2-2463336698 .color-AB4{color:#EDF0FD;} + .d2-2463336698 .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 diff --git a/e2etests/testdata/stable/ent2d2_right/elk/board.exp.json b/e2etests/testdata/stable/ent2d2_right/elk/board.exp.json index c3f32eced..aea57d64d 100644 --- a/e2etests/testdata/stable/ent2d2_right/elk/board.exp.json +++ b/e2etests/testdata/stable/ent2d2_right/elk/board.exp.json @@ -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": "" } ], @@ -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": "" } ], @@ -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": "" } ], @@ -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": "" } ], @@ -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": "" } ], @@ -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": "" } ], diff --git a/e2etests/testdata/stable/ent2d2_right/elk/sketch.exp.svg b/e2etests/testdata/stable/ent2d2_right/elk/sketch.exp.svg index 8a77d825b..c4891ae55 100644 --- a/e2etests/testdata/stable/ent2d2_right/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/ent2d2_right/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -UseridintPKparent_idintFKspouse_idintFKPetidintPKowner_idintFKCardidintPKowner_idintFKPostidintPKtextstringauthor_idintFKMetadataidintPKageintInfoidintPKcontentjson.RawMessage spousespouse childrenparentyowhoaheypets/ownercard/ownerposts/authormetadata/userinfo/user + .d2-3472882822 .fill-N1{fill:#0A0F25;} + .d2-3472882822 .fill-N2{fill:#676C7E;} + .d2-3472882822 .fill-N3{fill:#9499AB;} + .d2-3472882822 .fill-N4{fill:#CFD2DD;} + .d2-3472882822 .fill-N5{fill:#DEE1EB;} + .d2-3472882822 .fill-N6{fill:#EEF1F8;} + .d2-3472882822 .fill-N7{fill:#FFFFFF;} + .d2-3472882822 .fill-B1{fill:#0D32B2;} + .d2-3472882822 .fill-B2{fill:#0D32B2;} + .d2-3472882822 .fill-B3{fill:#E3E9FD;} + .d2-3472882822 .fill-B4{fill:#E3E9FD;} + .d2-3472882822 .fill-B5{fill:#EDF0FD;} + .d2-3472882822 .fill-B6{fill:#F7F8FE;} + .d2-3472882822 .fill-AA2{fill:#4A6FF3;} + .d2-3472882822 .fill-AA4{fill:#EDF0FD;} + .d2-3472882822 .fill-AA5{fill:#F7F8FE;} + .d2-3472882822 .fill-AB4{fill:#EDF0FD;} + .d2-3472882822 .fill-AB5{fill:#F7F8FE;} + .d2-3472882822 .stroke-N1{stroke:#0A0F25;} + .d2-3472882822 .stroke-N2{stroke:#676C7E;} + .d2-3472882822 .stroke-N3{stroke:#9499AB;} + .d2-3472882822 .stroke-N4{stroke:#CFD2DD;} + .d2-3472882822 .stroke-N5{stroke:#DEE1EB;} + .d2-3472882822 .stroke-N6{stroke:#EEF1F8;} + .d2-3472882822 .stroke-N7{stroke:#FFFFFF;} + .d2-3472882822 .stroke-B1{stroke:#0D32B2;} + .d2-3472882822 .stroke-B2{stroke:#0D32B2;} + .d2-3472882822 .stroke-B3{stroke:#E3E9FD;} + .d2-3472882822 .stroke-B4{stroke:#E3E9FD;} + .d2-3472882822 .stroke-B5{stroke:#EDF0FD;} + .d2-3472882822 .stroke-B6{stroke:#F7F8FE;} + .d2-3472882822 .stroke-AA2{stroke:#4A6FF3;} + .d2-3472882822 .stroke-AA4{stroke:#EDF0FD;} + .d2-3472882822 .stroke-AA5{stroke:#F7F8FE;} + .d2-3472882822 .stroke-AB4{stroke:#EDF0FD;} + .d2-3472882822 .stroke-AB5{stroke:#F7F8FE;} + .d2-3472882822 .background-color-N1{background-color:#0A0F25;} + .d2-3472882822 .background-color-N2{background-color:#676C7E;} + .d2-3472882822 .background-color-N3{background-color:#9499AB;} + .d2-3472882822 .background-color-N4{background-color:#CFD2DD;} + .d2-3472882822 .background-color-N5{background-color:#DEE1EB;} + .d2-3472882822 .background-color-N6{background-color:#EEF1F8;} + .d2-3472882822 .background-color-N7{background-color:#FFFFFF;} + .d2-3472882822 .background-color-B1{background-color:#0D32B2;} + .d2-3472882822 .background-color-B2{background-color:#0D32B2;} + .d2-3472882822 .background-color-B3{background-color:#E3E9FD;} + .d2-3472882822 .background-color-B4{background-color:#E3E9FD;} + .d2-3472882822 .background-color-B5{background-color:#EDF0FD;} + .d2-3472882822 .background-color-B6{background-color:#F7F8FE;} + .d2-3472882822 .background-color-AA2{background-color:#4A6FF3;} + .d2-3472882822 .background-color-AA4{background-color:#EDF0FD;} + .d2-3472882822 .background-color-AA5{background-color:#F7F8FE;} + .d2-3472882822 .background-color-AB4{background-color:#EDF0FD;} + .d2-3472882822 .background-color-AB5{background-color:#F7F8FE;} + .d2-3472882822 .color-N1{color:#0A0F25;} + .d2-3472882822 .color-N2{color:#676C7E;} + .d2-3472882822 .color-N3{color:#9499AB;} + .d2-3472882822 .color-N4{color:#CFD2DD;} + .d2-3472882822 .color-N5{color:#DEE1EB;} + .d2-3472882822 .color-N6{color:#EEF1F8;} + .d2-3472882822 .color-N7{color:#FFFFFF;} + .d2-3472882822 .color-B1{color:#0D32B2;} + .d2-3472882822 .color-B2{color:#0D32B2;} + .d2-3472882822 .color-B3{color:#E3E9FD;} + .d2-3472882822 .color-B4{color:#E3E9FD;} + .d2-3472882822 .color-B5{color:#EDF0FD;} + .d2-3472882822 .color-B6{color:#F7F8FE;} + .d2-3472882822 .color-AA2{color:#4A6FF3;} + .d2-3472882822 .color-AA4{color:#EDF0FD;} + .d2-3472882822 .color-AA5{color:#F7F8FE;} + .d2-3472882822 .color-AB4{color:#EDF0FD;} + .d2-3472882822 .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 diff --git a/e2etests/testdata/stable/grid_nested/dagre/board.exp.json b/e2etests/testdata/stable/grid_nested/dagre/board.exp.json index 539206801..fd1b4b77b 100644 --- a/e2etests/testdata/stable/grid_nested/dagre/board.exp.json +++ b/e2etests/testdata/stable/grid_nested/dagre/board.exp.json @@ -1125,6 +1125,10 @@ { "id": "grid w/ grid w/ grid", "type": "rectangle", + "classes": [ + "2x2", + "gap0" + ], "pos": { "x": 1736, "y": 54 @@ -1207,6 +1211,10 @@ { "id": "grid w/ grid w/ grid.b", "type": "rectangle", + "classes": [ + "2x2", + "gap0" + ], "pos": { "x": 1789, "y": 100 @@ -1330,6 +1338,10 @@ { "id": "grid w/ grid w/ grid.b.c", "type": "rectangle", + "classes": [ + "2x2", + "gap0" + ], "pos": { "x": 1789, "y": 207 @@ -1494,6 +1506,10 @@ { "id": "grid w/ grid w/ grid.b.c.d", "type": "rectangle", + "classes": [ + "2x2", + "gap0" + ], "pos": { "x": 1842, "y": 309 @@ -1535,6 +1551,10 @@ { "id": "grid w/ grid w/ grid.b.c.d.a", "type": "rectangle", + "classes": [ + "2x2", + "gap0" + ], "pos": { "x": 1842, "y": 340 diff --git a/e2etests/testdata/stable/grid_nested/dagre/sketch.exp.svg b/e2etests/testdata/stable/grid_nested/dagre/sketch.exp.svg index 86d91d2f7..9d6c62ad5 100644 --- a/e2etests/testdata/stable/grid_nested/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/grid_nested/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -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 08a18ac92..d91b1c82a 100644 --- a/e2etests/testdata/stable/grid_nested/elk/board.exp.json +++ b/e2etests/testdata/stable/grid_nested/elk/board.exp.json @@ -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 30711534e..4ba6609de 100644 --- a/e2etests/testdata/stable/grid_nested/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/grid_nested/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -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/sequence_diagram_all_shapes/dagre/board.exp.json b/e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/board.exp.json index 7b5c31322..dd6b3f0d2 100644 --- a/e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/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/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/sketch.exp.svg index 0e906b2a0..a3edaee99 100644 --- a/e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/sketch.exp.svg @@ -1,30 +1,30 @@ -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 0e906b2a0..a3edaee99 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,30 +1,30 @@ -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/sql_table_column_styles/dagre/board.exp.json b/e2etests/testdata/stable/sql_table_column_styles/dagre/board.exp.json index 55c5ecf20..24dffe9d7 100644 --- a/e2etests/testdata/stable/sql_table_column_styles/dagre/board.exp.json +++ b/e2etests/testdata/stable/sql_table_column_styles/dagre/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/dagre/sketch.exp.svg b/e2etests/testdata/stable/sql_table_column_styles/dagre/sketch.exp.svg index e14ea125f..99efadac6 100644 --- a/e2etests/testdata/stable/sql_table_column_styles/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sql_table_column_styles/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -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 e3d6072bd..bfc92d078 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,16 +1,16 @@ -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..07f1bd9f4 --- /dev/null +++ b/e2etests/testdata/stable/sql_table_constraints_width/dagre/board.exp.json @@ -0,0 +1,348 @@ +{ + "name": "", + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "a", + "type": "sql_table", + "pos": { + "x": 0, + "y": 0 + }, + "width": 148, + "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": 208, + "y": 0 + }, + "width": 188, + "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": 456, + "y": 0 + }, + "width": 188, + "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": 704, + "y": 0 + }, + "width": 228, + "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" + } + ], + "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..8c24e4b53 --- /dev/null +++ b/e2etests/testdata/stable/sql_table_constraints_width/dagre/sketch.exp.svg @@ -0,0 +1,95 @@ +axINTUNQbxINTPK, FKcxINTFK, UNQdxINTPK, FK, UNQ + + + \ 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..e30fede94 --- /dev/null +++ b/e2etests/testdata/stable/sql_table_constraints_width/elk/board.exp.json @@ -0,0 +1,348 @@ +{ + "name": "", + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "a", + "type": "sql_table", + "pos": { + "x": 12, + "y": 12 + }, + "width": 148, + "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": 180, + "y": 12 + }, + "width": 188, + "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": 388, + "y": 12 + }, + "width": 188, + "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": 596, + "y": 12 + }, + "width": 228, + "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" + } + ], + "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..37fd18125 --- /dev/null +++ b/e2etests/testdata/stable/sql_table_constraints_width/elk/sketch.exp.svg @@ -0,0 +1,95 @@ +axINTUNQbxINTPK, FKcxINTFK, UNQdxINTPK, FK, UNQ + + + \ 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 8ba3bfcec..5a22d0c87 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,9 +1,9 @@ -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 b48aaa780..f4289ad69 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,9 +1,9 @@ -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..a108d914d 100644 --- a/e2etests/testdata/stable/sql_tables/dagre/board.exp.json +++ b/e2etests/testdata/stable/sql_tables/dagre/board.exp.json @@ -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": "" } ], @@ -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": "" } ], @@ -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": "" } ], @@ -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": "" } ], diff --git a/e2etests/testdata/stable/sql_tables/dagre/sketch.exp.svg b/e2etests/testdata/stable/sql_tables/dagre/sketch.exp.svg index 49496713c..babe59c83 100644 --- a/e2etests/testdata/stable/sql_tables/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sql_tables/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -usersidintnamestringemailstringpasswordstringlast_logindatetimePKproductsidintpricedecimalskustringnamestringordersidintuser_idintproduct_idintshipmentsidintorder_idinttracking_numberstringstatusstring + .d2-3718986021 .fill-N1{fill:#0A0F25;} + .d2-3718986021 .fill-N2{fill:#676C7E;} + .d2-3718986021 .fill-N3{fill:#9499AB;} + .d2-3718986021 .fill-N4{fill:#CFD2DD;} + .d2-3718986021 .fill-N5{fill:#DEE1EB;} + .d2-3718986021 .fill-N6{fill:#EEF1F8;} + .d2-3718986021 .fill-N7{fill:#FFFFFF;} + .d2-3718986021 .fill-B1{fill:#0D32B2;} + .d2-3718986021 .fill-B2{fill:#0D32B2;} + .d2-3718986021 .fill-B3{fill:#E3E9FD;} + .d2-3718986021 .fill-B4{fill:#E3E9FD;} + .d2-3718986021 .fill-B5{fill:#EDF0FD;} + .d2-3718986021 .fill-B6{fill:#F7F8FE;} + .d2-3718986021 .fill-AA2{fill:#4A6FF3;} + .d2-3718986021 .fill-AA4{fill:#EDF0FD;} + .d2-3718986021 .fill-AA5{fill:#F7F8FE;} + .d2-3718986021 .fill-AB4{fill:#EDF0FD;} + .d2-3718986021 .fill-AB5{fill:#F7F8FE;} + .d2-3718986021 .stroke-N1{stroke:#0A0F25;} + .d2-3718986021 .stroke-N2{stroke:#676C7E;} + .d2-3718986021 .stroke-N3{stroke:#9499AB;} + .d2-3718986021 .stroke-N4{stroke:#CFD2DD;} + .d2-3718986021 .stroke-N5{stroke:#DEE1EB;} + .d2-3718986021 .stroke-N6{stroke:#EEF1F8;} + .d2-3718986021 .stroke-N7{stroke:#FFFFFF;} + .d2-3718986021 .stroke-B1{stroke:#0D32B2;} + .d2-3718986021 .stroke-B2{stroke:#0D32B2;} + .d2-3718986021 .stroke-B3{stroke:#E3E9FD;} + .d2-3718986021 .stroke-B4{stroke:#E3E9FD;} + .d2-3718986021 .stroke-B5{stroke:#EDF0FD;} + .d2-3718986021 .stroke-B6{stroke:#F7F8FE;} + .d2-3718986021 .stroke-AA2{stroke:#4A6FF3;} + .d2-3718986021 .stroke-AA4{stroke:#EDF0FD;} + .d2-3718986021 .stroke-AA5{stroke:#F7F8FE;} + .d2-3718986021 .stroke-AB4{stroke:#EDF0FD;} + .d2-3718986021 .stroke-AB5{stroke:#F7F8FE;} + .d2-3718986021 .background-color-N1{background-color:#0A0F25;} + .d2-3718986021 .background-color-N2{background-color:#676C7E;} + .d2-3718986021 .background-color-N3{background-color:#9499AB;} + .d2-3718986021 .background-color-N4{background-color:#CFD2DD;} + .d2-3718986021 .background-color-N5{background-color:#DEE1EB;} + .d2-3718986021 .background-color-N6{background-color:#EEF1F8;} + .d2-3718986021 .background-color-N7{background-color:#FFFFFF;} + .d2-3718986021 .background-color-B1{background-color:#0D32B2;} + .d2-3718986021 .background-color-B2{background-color:#0D32B2;} + .d2-3718986021 .background-color-B3{background-color:#E3E9FD;} + .d2-3718986021 .background-color-B4{background-color:#E3E9FD;} + .d2-3718986021 .background-color-B5{background-color:#EDF0FD;} + .d2-3718986021 .background-color-B6{background-color:#F7F8FE;} + .d2-3718986021 .background-color-AA2{background-color:#4A6FF3;} + .d2-3718986021 .background-color-AA4{background-color:#EDF0FD;} + .d2-3718986021 .background-color-AA5{background-color:#F7F8FE;} + .d2-3718986021 .background-color-AB4{background-color:#EDF0FD;} + .d2-3718986021 .background-color-AB5{background-color:#F7F8FE;} + .d2-3718986021 .color-N1{color:#0A0F25;} + .d2-3718986021 .color-N2{color:#676C7E;} + .d2-3718986021 .color-N3{color:#9499AB;} + .d2-3718986021 .color-N4{color:#CFD2DD;} + .d2-3718986021 .color-N5{color:#DEE1EB;} + .d2-3718986021 .color-N6{color:#EEF1F8;} + .d2-3718986021 .color-N7{color:#FFFFFF;} + .d2-3718986021 .color-B1{color:#0D32B2;} + .d2-3718986021 .color-B2{color:#0D32B2;} + .d2-3718986021 .color-B3{color:#E3E9FD;} + .d2-3718986021 .color-B4{color:#E3E9FD;} + .d2-3718986021 .color-B5{color:#EDF0FD;} + .d2-3718986021 .color-B6{color:#F7F8FE;} + .d2-3718986021 .color-AA2{color:#4A6FF3;} + .d2-3718986021 .color-AA4{color:#EDF0FD;} + .d2-3718986021 .color-AA5{color:#F7F8FE;} + .d2-3718986021 .color-AB4{color:#EDF0FD;} + .d2-3718986021 .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..2915e1b47 100644 --- a/e2etests/testdata/stable/sql_tables/elk/board.exp.json +++ b/e2etests/testdata/stable/sql_tables/elk/board.exp.json @@ -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": "" } ], @@ -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": "" } ], @@ -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": "" } ], @@ -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": "" } ], diff --git a/e2etests/testdata/stable/sql_tables/elk/sketch.exp.svg b/e2etests/testdata/stable/sql_tables/elk/sketch.exp.svg index 5a7475ea3..dd4fa46e0 100644 --- a/e2etests/testdata/stable/sql_tables/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sql_tables/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -usersidintnamestringemailstringpasswordstringlast_logindatetimePKproductsidintpricedecimalskustringnamestringordersidintuser_idintproduct_idintshipmentsidintorder_idinttracking_numberstringstatusstring + .d2-4282920767 .fill-N1{fill:#0A0F25;} + .d2-4282920767 .fill-N2{fill:#676C7E;} + .d2-4282920767 .fill-N3{fill:#9499AB;} + .d2-4282920767 .fill-N4{fill:#CFD2DD;} + .d2-4282920767 .fill-N5{fill:#DEE1EB;} + .d2-4282920767 .fill-N6{fill:#EEF1F8;} + .d2-4282920767 .fill-N7{fill:#FFFFFF;} + .d2-4282920767 .fill-B1{fill:#0D32B2;} + .d2-4282920767 .fill-B2{fill:#0D32B2;} + .d2-4282920767 .fill-B3{fill:#E3E9FD;} + .d2-4282920767 .fill-B4{fill:#E3E9FD;} + .d2-4282920767 .fill-B5{fill:#EDF0FD;} + .d2-4282920767 .fill-B6{fill:#F7F8FE;} + .d2-4282920767 .fill-AA2{fill:#4A6FF3;} + .d2-4282920767 .fill-AA4{fill:#EDF0FD;} + .d2-4282920767 .fill-AA5{fill:#F7F8FE;} + .d2-4282920767 .fill-AB4{fill:#EDF0FD;} + .d2-4282920767 .fill-AB5{fill:#F7F8FE;} + .d2-4282920767 .stroke-N1{stroke:#0A0F25;} + .d2-4282920767 .stroke-N2{stroke:#676C7E;} + .d2-4282920767 .stroke-N3{stroke:#9499AB;} + .d2-4282920767 .stroke-N4{stroke:#CFD2DD;} + .d2-4282920767 .stroke-N5{stroke:#DEE1EB;} + .d2-4282920767 .stroke-N6{stroke:#EEF1F8;} + .d2-4282920767 .stroke-N7{stroke:#FFFFFF;} + .d2-4282920767 .stroke-B1{stroke:#0D32B2;} + .d2-4282920767 .stroke-B2{stroke:#0D32B2;} + .d2-4282920767 .stroke-B3{stroke:#E3E9FD;} + .d2-4282920767 .stroke-B4{stroke:#E3E9FD;} + .d2-4282920767 .stroke-B5{stroke:#EDF0FD;} + .d2-4282920767 .stroke-B6{stroke:#F7F8FE;} + .d2-4282920767 .stroke-AA2{stroke:#4A6FF3;} + .d2-4282920767 .stroke-AA4{stroke:#EDF0FD;} + .d2-4282920767 .stroke-AA5{stroke:#F7F8FE;} + .d2-4282920767 .stroke-AB4{stroke:#EDF0FD;} + .d2-4282920767 .stroke-AB5{stroke:#F7F8FE;} + .d2-4282920767 .background-color-N1{background-color:#0A0F25;} + .d2-4282920767 .background-color-N2{background-color:#676C7E;} + .d2-4282920767 .background-color-N3{background-color:#9499AB;} + .d2-4282920767 .background-color-N4{background-color:#CFD2DD;} + .d2-4282920767 .background-color-N5{background-color:#DEE1EB;} + .d2-4282920767 .background-color-N6{background-color:#EEF1F8;} + .d2-4282920767 .background-color-N7{background-color:#FFFFFF;} + .d2-4282920767 .background-color-B1{background-color:#0D32B2;} + .d2-4282920767 .background-color-B2{background-color:#0D32B2;} + .d2-4282920767 .background-color-B3{background-color:#E3E9FD;} + .d2-4282920767 .background-color-B4{background-color:#E3E9FD;} + .d2-4282920767 .background-color-B5{background-color:#EDF0FD;} + .d2-4282920767 .background-color-B6{background-color:#F7F8FE;} + .d2-4282920767 .background-color-AA2{background-color:#4A6FF3;} + .d2-4282920767 .background-color-AA4{background-color:#EDF0FD;} + .d2-4282920767 .background-color-AA5{background-color:#F7F8FE;} + .d2-4282920767 .background-color-AB4{background-color:#EDF0FD;} + .d2-4282920767 .background-color-AB5{background-color:#F7F8FE;} + .d2-4282920767 .color-N1{color:#0A0F25;} + .d2-4282920767 .color-N2{color:#676C7E;} + .d2-4282920767 .color-N3{color:#9499AB;} + .d2-4282920767 .color-N4{color:#CFD2DD;} + .d2-4282920767 .color-N5{color:#DEE1EB;} + .d2-4282920767 .color-N6{color:#EEF1F8;} + .d2-4282920767 .color-N7{color:#FFFFFF;} + .d2-4282920767 .color-B1{color:#0D32B2;} + .d2-4282920767 .color-B2{color:#0D32B2;} + .d2-4282920767 .color-B3{color:#E3E9FD;} + .d2-4282920767 .color-B4{color:#E3E9FD;} + .d2-4282920767 .color-B5{color:#EDF0FD;} + .d2-4282920767 .color-B6{color:#F7F8FE;} + .d2-4282920767 .color-AA2{color:#4A6FF3;} + .d2-4282920767 .color-AA4{color:#EDF0FD;} + .d2-4282920767 .color-AA5{color:#F7F8FE;} + .d2-4282920767 .color-AB4{color:#EDF0FD;} + .d2-4282920767 .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/unnamed_only_height/dagre/board.exp.json b/e2etests/testdata/stable/unnamed_only_height/dagre/board.exp.json index 75d93d051..362c4f342 100644 --- a/e2etests/testdata/stable/unnamed_only_height/dagre/board.exp.json +++ b/e2etests/testdata/stable/unnamed_only_height/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_height/dagre/sketch.exp.svg b/e2etests/testdata/stable/unnamed_only_height/dagre/sketch.exp.svg index e15935f8a..d52cc2e54 100644 --- a/e2etests/testdata/stable/unnamed_only_height/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/unnamed_only_height/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ --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 bd86209b4..61a62b814 100644 --- a/e2etests/testdata/stable/unnamed_only_height/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/unnamed_only_height/elk/sketch.exp.svg @@ -1,23 +1,23 @@ --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 bd421bf1b..bb8598391 100644 --- a/e2etests/testdata/stable/unnamed_only_width/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/unnamed_only_width/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ --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 6cac9b478..38691fb59 100644 --- a/e2etests/testdata/stable/unnamed_only_width/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/unnamed_only_width/elk/sketch.exp.svg @@ -1,23 +1,23 @@ --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/themes/dark_terrastruct_flagship/dagre/board.exp.json b/e2etests/testdata/themes/dark_terrastruct_flagship/dagre/board.exp.json index d7c7fe141..8eb19cc74 100644 --- a/e2etests/testdata/themes/dark_terrastruct_flagship/dagre/board.exp.json +++ b/e2etests/testdata/themes/dark_terrastruct_flagship/dagre/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/dagre/sketch.exp.svg b/e2etests/testdata/themes/dark_terrastruct_flagship/dagre/sketch.exp.svg index ee777f0f3..3abfc595a 100644 --- a/e2etests/testdata/themes/dark_terrastruct_flagship/dagre/sketch.exp.svg +++ b/e2etests/testdata/themes/dark_terrastruct_flagship/dagre/sketch.exp.svg @@ -1,41 +1,41 @@ -networkuserapi serverlogsusersidintnamestringemailstringpasswordstringlast_logindatetimeproducts+idint+pricedecimal+skustring+namestring

A tale

@@ -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 b99756948..887020287 100644 --- a/e2etests/testdata/themes/dark_terrastruct_flagship/elk/sketch.exp.svg +++ b/e2etests/testdata/themes/dark_terrastruct_flagship/elk/sketch.exp.svg @@ -1,41 +1,41 @@ -networkuserapi serverlogsusersidintnamestringemailstringpasswordstringlast_logindatetimeproducts+idint+pricedecimal+skustring+namestring

A tale

@@ -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/terminal/dagre/board.exp.json b/e2etests/testdata/themes/terminal/dagre/board.exp.json index 2a82f1207..d43ae2585 100644 --- a/e2etests/testdata/themes/terminal/dagre/board.exp.json +++ b/e2etests/testdata/themes/terminal/dagre/board.exp.json @@ -510,7 +510,7 @@ "labelWidth": 34, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -538,7 +538,7 @@ "labelWidth": 71, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -566,7 +566,7 @@ "labelWidth": 71, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -594,7 +594,7 @@ "labelWidth": 71, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" }, { @@ -622,7 +622,7 @@ "labelWidth": 94, "labelHeight": 26 }, - "constraint": "", + "constraint": null, "reference": "" } ], diff --git a/e2etests/testdata/themes/terminal/dagre/sketch.exp.svg b/e2etests/testdata/themes/terminal/dagre/sketch.exp.svg index 7de10b4a5..1ac160d33 100644 --- a/e2etests/testdata/themes/terminal/dagre/sketch.exp.svg +++ b/e2etests/testdata/themes/terminal/dagre/sketch.exp.svg @@ -1,34 +1,34 @@ -containerscloudtall cylinderclass2-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voidusersidintnamestringemailstringpasswordstringlast_logindatetimecontainer

markdown text expanded to 800x400

@@ -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 f67cb84d9..0fedb2be9 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,34 +1,34 @@ -containerscloudtall cylinderclass2-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voidusersidintnamestringemailstringpasswordstringlast_logindatetimecontainer

markdown text expanded to 800x400

@@ -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/testdata/d2compiler/TestCompile/array-classes.exp.json b/testdata/d2compiler/TestCompile/array-classes.exp.json index 4dfed8f49..c19a3cf7a 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 bc9297187..fec8c9f44 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 115675dbb..40ecd99ad 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 d5d26fb77..74758c4b0 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 cb68c4cc1..d69341d1c 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 a787bab08..dd334affa 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 aeaf5b5d4..7d81a32af 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 d9df3a793..32a6cc903 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 a96e1034f..c0b35a802 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/constraint_label.exp.json b/testdata/d2compiler/TestCompile/constraint_label.exp.json index 9441a3351..ee1b0c201 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 ef03ae945..8ed777881 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 9cfeaf3bb..1ce908eb3 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 639d347d6..35a80069c 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 4ad934650..8c8f45d32 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 80b30f4a5..a3ccdacbc 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 d0140ae67..2a0553378 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 4d9b52f8f..9f4c9e37c 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 bd1d26af7..ffabeaa32 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 702e516fe..a65a5ac66 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 9416b5b07..f782fe9d2 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 c279ce0a2..1163c970b 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 be517f33a..297694de2 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 37936ebcd..18db2713e 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 ef5091d56..74d4645f9 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 a8a8a8b04..0e527bd33 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 893b3ec82..359bf5caf 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 07d7b8c0c..c643f9c52 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 89c09dbfb..e58694f19 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 592d3f381..028d45ed5 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 d33c5a281..7b286b266 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 861726cd5..9e892d0d1 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 b59517440..77107e3ad 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 8ae05a29c..a7cb23299 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 762bf710a..6736c7dba 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 cb3102c6c..78ce4ca82 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 6b30f7fc0..63ae0bdc0 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 6c45373de..92d184f76 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 a6a72499e..049d2a65b 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 deba163ae..37a47c513 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/link-board-key-nested.exp.json b/testdata/d2compiler/TestCompile/link-board-key-nested.exp.json index a06090d29..8158ac8ca 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 3130fecd5..346ec7dd4 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 79b61eb73..05aa0f0eb 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 77fab9ab6..5d6526c97 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 2fba9e04d..4fd1a2f08 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 index 4a65875df..9639946a2 100644 --- a/testdata/d2compiler/TestCompile/nested-array-classes.exp.json +++ b/testdata/d2compiler/TestCompile/nested-array-classes.exp.json @@ -403,9 +403,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -431,9 +429,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "references": [ { @@ -456,9 +452,11 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null, + "classes": [ + "one target", + "association" + ] }, "zIndex": 0 }, @@ -483,9 +481,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "references": [ { @@ -508,9 +504,11 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null, + "classes": [ + "association", + "one target" + ] }, "zIndex": 0 } @@ -577,9 +575,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 }, @@ -644,9 +640,7 @@ "direction": { "value": "" }, - "constraint": { - "value": "" - } + "constraint": null }, "zIndex": 0 } diff --git a/testdata/d2compiler/TestCompile/nested_sql.exp.json b/testdata/d2compiler/TestCompile/nested_sql.exp.json index 9c3d344c9..85cd7107e 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 92b041542..e2ab08f59 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/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 8d2ad1a19..69a66c765 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 f639d6d9f..877d874c3 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 556b25462..9264f93b5 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 3a21e6622..b1b0e5261 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 ec9e1b268..c476fd55a 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 7397f55e3..797208ff8 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 5a23fa225..942bac612 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 d9046aa5e..574aaf9dd 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 e539e5d0f..90110176f 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 655ebf0ae..dc8c57b5b 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 258a6a4a5..ebca6e33c 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..8a1742a81 --- /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:0:109", + "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:33:57", + "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:48:107", + "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 29516d953..539adf1c0 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 4b2e0bb0a..eba972c81 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 4d6854ed7..2c3bfdb89 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 ce190463d..ae35a6c53 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 56abfa352..57da002b7 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 9c2291acb..ec723d05d 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 19be4223d..1ebd73a2a 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 5aa625846..46e166725 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 09d2123ac..0bdb94b00 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 67ed11d4f..38d968276 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 b74d8611b..e6ed4a467 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 f164aee76..173285ea6 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 7c462ae53..608d2922e 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 4db535bae..210d82d17 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 fc6b50a55..61dfa7869 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 52086b6ae..4db434860 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 f3243d490..5281966f7 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 c81350873..ea0c6e33c 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 d5c56bdee..d494bc12b 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 6bd4fe629..ac23a6997 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 eef3087ba..414c8364a 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 8895108bd..d59351628 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 af890238e..49dcdfe6b 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 0a2c78652..4bcd01085 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 ffb88ac9e..5294489e9 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 e53b1ebc1..782eb55ea 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 6e3e364fc..779da95e3 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 313bc4453..26f8e503a 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 67de3a5ee..04420baf5 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 dd86c4758..2db853505 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 1ae389403..ef3c9060a 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 ace2f2ebe..c0294b14d 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 966bef34f..4f4d2595a 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 b7f76f285..a2e5c227f 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 8151a96d6..39d9d5b91 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 c8a266867..dfc4c5ab0 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 a3ca572b8..d66653ae1 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 736cd373f..0d04cefa4 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 ed300d55d..f33cce3d9 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 cae034940..05312cf16 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 37e9a36c1..d7f6953d6 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 f63710718..0cfaf5c8d 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 c9255013d..208847bc1 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 630970e3d..8c3331580 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 06b5c7bfb..295ba993d 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 9f216275b..62e53d145 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 fd520cb59..016b3f03f 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 72ea2342f..ff9fec5da 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 38149e7d9..f5ee8321d 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 5684d997c..38c8a4a15 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 fc8d49b06..948977db5 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 e7e88fd2e..a8fdd39cd 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 4c73064fa..270b09dfa 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 41419ac2a..2ffbd61e7 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 7b3dcc4f0..770427f9f 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 be177a849..786326a20 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 d9e60c63c..4187ee863 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 ae69040d8..075d9a1ac 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 96becc9d0..37cddb5d0 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 92bb37fcc..c870056ac 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 0a3a1ad73..f82d339c6 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 675240729..c5893a70c 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 42e4680c7..e28e01c0d 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 47aec3c7c..76eca003a 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 c9e2dbffd..cac44ab60 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 982b01acc..b34decb23 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 b4aaa8cf5..021a65f8c 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 90e716053..52ae16215 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 548eacac3..bbfef6014 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 6d1681ec5..f60f61268 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 7cd4b6e1a..3f8867f6f 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 ba51e7d5a..0d57688ed 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 4ae722c82..c85307811 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 3d50e422a..416933111 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 76f5a3554..539d1eb0f 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 5e3a6e282..0c7173d53 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 1d6a6ebc1..24692953a 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 05201a9b6..2ea7eccbb 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 aeb168979..6ea0399ea 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 22654afcc..4412a6bb0 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 beb4e5634..0c1da31dc 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 df87ea83e..f08962166 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 1b5d9b69f..306b01b2f 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 cc2aab88b..d5536c5d6 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 943587e97..a63688556 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 fbe8d3aeb..053348323 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 76f20e41e..6a69f4dd8 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 a9bc27742..5883a2402 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 c1388762e..f65c5ef79 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 f383bbd08..ed420bc52 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 1a71d4059..f9404e9b9 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 7ee1856dc..fe7060966 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 817f025d2..ccf11b820 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 455a2f981..12346aca8 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 177336e19..9eda1abc2 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 6da1ee6d5..f587d63fd 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 c5c8e6e7d..4210e6a2a 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 66f168b08..9a3353650 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 dca6fdaa0..ecd84c941 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 bd3bf0e72..5264e53dd 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 f0eeecdc3..17cf799c8 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 da7bbfa2f..828b515b7 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 5c70c063b..f6bfb0cac 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 8041bc7c9..51160c4ee 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 fcaf3d582..9476e014c 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 283221e09..ade1aa941 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 6c3f40f55..14b24fa95 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 c7fe1680b..8b51aca65 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 6f1a77e95..db68a2c68 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 3c7e78246..5e5b351fb 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 4ed6904f5..693057a01 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 f142a1f98..d956b21f3 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 db22e48e9..b01d1853c 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 95ed643c3..1d2fadc77 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 c8334c5b0..8878cedec 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 ffcdc9ec2..47d6bcde2 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 0efe58b19..fc7a75e85 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 3daa5414f..1ef1f7e70 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 32dbb24e5..e5fb57ee6 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 2e08bff1c..435c47c15 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 797e1014d..169f4bb3b 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 a4876c486..cf2f11d24 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 153524784..f89c68396 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 d693f7bd4..fdb447e25 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 406d1ef9f..787da3561 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 135a83ef7..7ed84d7a5 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 bba5f98b6..22709097f 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 586e8b616..223c5c8d3 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 7a1c7fd9f..45253ad5f 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 b6c858933..54b97c569 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 59eadcb67..15bad681f 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 12bae318b..1b3c7ee23 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 518469ce4..6a854d6f7 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 3a76c1c31..4df2648ca 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 1f7889425..513f59915 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 2feb2e4b4..4f3b67fa0 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 42428a39a..68a971858 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 3bfdd13a4..a954f0406 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 31cde246f..852a73b54 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 1dc1b90c3..b0c57105a 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 3d1722af3..ff80eff44 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 59cd0e06b..d66f6960c 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 4cb5a41cc..63cde5566 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 c998f5188..4d9afd231 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 4913ec646..d50ff4940 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 2fb89411a..f81f9c5ed 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 34035e86c..e12a60427 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 eaa941d03..46e2770bf 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 2deaee517..6bba37216 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 502a6ae7f..dee3bfa4f 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 c9d972e26..bb22351f3 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 c90c19765..136ceb6ed 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 14a1fee58..ccbc2ac18 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 d8fc3cf89..a21e3fdcd 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 99b9b1abe..340a9f227 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 6c3414052..853d19030 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 e190dfd0e..46394f97a 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 2656b7b49..502f2ad3b 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 1c92d49c1..3f94db4a3 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 7f676ea29..db79c3a90 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 37085ae05..49a87a9a0 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 ecc1c84f4..ad4056545 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 a80bd4e6a..3d9a2adf5 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 0e31d4886..325e30cd8 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 dd888cf03..3fbd503aa 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 9b29a3155..4ec0b8557 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 40be42dcf..cb92db67d 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 index 9e3866c39..c47aae643 100644 --- a/testdata/d2oracle/TestRename/generated-conflict.exp.json +++ b/testdata/d2oracle/TestRename/generated-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/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 13468f6f7..50bf9b91d 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 710fc49b7..9fde64d16 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 7606c8653..bd8c593c8 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 50a62f7bf..04d724c19 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 9c0be60cd..7d1cd5940 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 106987b19..1ab50e97c 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 77f29a89f..e2bcb827e 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 0ac79eff4..f7f5e5dbe 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 f1aa1ad6c..a26d823aa 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 dcc248bb9..a3a7b1cac 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 e7649247a..1d4e28f4d 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 0fbdc6921..c99a09b74 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 d74f7c436..c0877a17c 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 19305fea6..db265b1bc 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 848b41a6b..031574600 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 07bc4b429..e0c481e61 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 628da4b0d..3ef4a43cb 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 0ce80a7cf..eab037808 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 529342cc8..1ccc50dfe 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 25d9c3795..2d9c5fe49 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 a43045369..46e3130b2 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 a022a2076..4b51a18e3 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 ca0879f88..79c6afd5d 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 eba63f5ee..51cc89c13 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 466375933..600f2ae4b 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 b999b3e57..958b2baa9 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 a4de62e89..a8988ce51 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 aefa1e8f2..09dc780b2 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 c783b3862..876fd7eac 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 24e0ad009..028881270 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 eb08e4668..e41ab8f9a 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 a5d18437f..323a44945 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 adfb943b6..ee588adbb 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 6984ebd04..3f1377fda 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 5b0379637..7ae4b113f 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 ac8684a61..c8bc0b3b1 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 b972a20aa..96f6dc008 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 301e3e04b..1b73a82ac 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 9821f6bd4..cc1895eef 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 003a21036..e8fb954b9 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 }